Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ IMG ?= controller:latest
BUNDLE_IMG ?= bundle:latest
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
ENVTEST_K8S_VERSION = 1.29.0
TRIVY_VERSION = 0.49.1
TRIVY_VERSION = 0.69.3
GO_VERSION ?= 1.25.8

# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
Expand Down Expand Up @@ -311,14 +311,14 @@ GOVULNCHECK = $(LOCALBIN)/govulncheck
OPERATOR_SDK = $(LOCALBIN)/operator-sdk

## Tool Versions
KUSTOMIZE_VERSION ?= v5.6.0
CONTROLLER_TOOLS_VERSION ?= v0.17.1
ENVTEST_VERSION ?= release-0.22
GOLANGCI_LINT_VERSION ?= v2.7.2
KUSTOMIZE_VERSION ?= v5.8.1
CONTROLLER_TOOLS_VERSION ?= v0.20.1
ENVTEST_VERSION ?= release-0.23
GOLANGCI_LINT_VERSION ?= v2.11.4
MOCKGEN_VERSION ?= v0.6.0
KUTTL_VERSION ?= v0.24.0
KUTTL_VERSION ?= v0.25.0
GOVULNCHECK_VERSION ?= v1.1.4
OPERATOR_SDK_VERSION ?= v1.41.1
OPERATOR_SDK_VERSION ?= v1.42.2

.PHONY: kustomize
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/openstack.k-orc.cloud_addressscopes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.20.1
name: addressscopes.openstack.k-orc.cloud
spec:
group: openstack.k-orc.cloud
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/openstack.k-orc.cloud_domains.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.20.1
name: domains.openstack.k-orc.cloud
spec:
group: openstack.k-orc.cloud
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/openstack.k-orc.cloud_endpoints.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.20.1
name: endpoints.openstack.k-orc.cloud
spec:
group: openstack.k-orc.cloud
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/openstack.k-orc.cloud_flavors.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.20.1
name: flavors.openstack.k-orc.cloud
spec:
group: openstack.k-orc.cloud
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/openstack.k-orc.cloud_floatingips.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.20.1
name: floatingips.openstack.k-orc.cloud
spec:
group: openstack.k-orc.cloud
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/openstack.k-orc.cloud_groups.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.20.1
name: groups.openstack.k-orc.cloud
spec:
group: openstack.k-orc.cloud
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/openstack.k-orc.cloud_images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.20.1
name: images.openstack.k-orc.cloud
spec:
group: openstack.k-orc.cloud
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/openstack.k-orc.cloud_keypairs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.20.1
name: keypairs.openstack.k-orc.cloud
spec:
group: openstack.k-orc.cloud
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/openstack.k-orc.cloud_networks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.20.1
name: networks.openstack.k-orc.cloud
spec:
group: openstack.k-orc.cloud
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/openstack.k-orc.cloud_ports.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.20.1
name: ports.openstack.k-orc.cloud
spec:
group: openstack.k-orc.cloud
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/openstack.k-orc.cloud_projects.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.20.1
name: projects.openstack.k-orc.cloud
spec:
group: openstack.k-orc.cloud
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/openstack.k-orc.cloud_roles.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.20.1
name: roles.openstack.k-orc.cloud
spec:
group: openstack.k-orc.cloud
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.20.1
name: routerinterfaces.openstack.k-orc.cloud
spec:
group: openstack.k-orc.cloud
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/openstack.k-orc.cloud_routers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.20.1
name: routers.openstack.k-orc.cloud
spec:
group: openstack.k-orc.cloud
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/openstack.k-orc.cloud_securitygroups.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.20.1
name: securitygroups.openstack.k-orc.cloud
spec:
group: openstack.k-orc.cloud
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/openstack.k-orc.cloud_servergroups.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.20.1
name: servergroups.openstack.k-orc.cloud
spec:
group: openstack.k-orc.cloud
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/openstack.k-orc.cloud_servers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.20.1
name: servers.openstack.k-orc.cloud
spec:
group: openstack.k-orc.cloud
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/openstack.k-orc.cloud_services.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.20.1
name: services.openstack.k-orc.cloud
spec:
group: openstack.k-orc.cloud
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/openstack.k-orc.cloud_subnets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.20.1
name: subnets.openstack.k-orc.cloud
spec:
group: openstack.k-orc.cloud
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/openstack.k-orc.cloud_trunks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.20.1
name: trunks.openstack.k-orc.cloud
spec:
group: openstack.k-orc.cloud
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/openstack.k-orc.cloud_users.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.20.1
name: users.openstack.k-orc.cloud
spec:
group: openstack.k-orc.cloud
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/openstack.k-orc.cloud_volumes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.20.1
name: volumes.openstack.k-orc.cloud
spec:
group: openstack.k-orc.cloud
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/openstack.k-orc.cloud_volumetypes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.20.1
name: volumetypes.openstack.k-orc.cloud
spec:
group: openstack.k-orc.cloud
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/k-orc/openstack-resource-controller/v2

go 1.25.7
go 1.25.0

require (
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
Expand Down
9 changes: 5 additions & 4 deletions internal/controllers/endpoint/actuator.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,11 @@ func (actuator endpointActuator) ListOSResourcesForAdoption(ctx context.Context,
return nil, false
}

var filters []osclients.ResourceFilter[osResourceT]
filters = append(filters, func(e *endpoints.Endpoint) bool {
return e.URL == resourceSpec.URL
})
filters := []osclients.ResourceFilter[osResourceT]{
func(e *endpoints.Endpoint) bool {
return e.URL == resourceSpec.URL
},
}

listOpts := endpoints.ListOpts{
Availability: gophercloud.Availability(resourceSpec.Interface),
Expand Down
9 changes: 5 additions & 4 deletions internal/controllers/keypair/actuator.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,11 @@ func (actuator keypairActuator) ListOSResourcesForAdoption(ctx context.Context,
// Filter by the expected resource name to avoid adopting wrong keypairs.
// The OpenStack Keypairs API does not support server-side filtering by name,
// so we must use client-side filtering.
var filters []osclients.ResourceFilter[osResourceT]
filters = append(filters, func(kp *keypairs.KeyPair) bool {
return kp.Name == getResourceName(orcObject)
})
filters := []osclients.ResourceFilter[osResourceT]{
func(kp *keypairs.KeyPair) bool {
return kp.Name == getResourceName(orcObject)
},
}

return actuator.listOSResources(ctx, filters, keypairs.ListOpts{}), true
}
Expand Down
8 changes: 3 additions & 5 deletions internal/controllers/servergroup/actuator.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,13 @@ func (actuator servergroupActuator) ListOSResourcesForAdoption(ctx context.Conte
return nil, false
}

var filters []osclients.ResourceFilter[osResourceT]
listOpts := servergroups.ListOpts{}

filters = append(filters,
filters := []osclients.ResourceFilter[osResourceT]{
func(f *servergroups.ServerGroup) bool {
name := getResourceName(orcObject)
return f.Name == name
},
)
}
listOpts := servergroups.ListOpts{}

return actuator.listOSResources(ctx, filters, &listOpts), true
}
Expand Down
2 changes: 1 addition & 1 deletion tools/orc-api-linter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.24.0

require (
golang.org/x/tools v0.41.0
sigs.k8s.io/kube-api-linter v0.0.0-20260205134631-d65d24a9df89
sigs.k8s.io/kube-api-linter v0.0.0-20260320123815-c9b9b51b278a
)

require (
Expand Down
4 changes: 2 additions & 2 deletions tools/orc-api-linter/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b h1:gMplByicHV/TJBizHd9aVEsTYo
k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b/go.mod h1:CgujABENc3KuTrcsdpGmrrASjtQsWCT7R99mEV4U/fM=
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
sigs.k8s.io/kube-api-linter v0.0.0-20260205134631-d65d24a9df89 h1:QuWBEzbBkQyuwWPKDEaUBGr8QdHilkc4CdJYCeU1SIo=
sigs.k8s.io/kube-api-linter v0.0.0-20260205134631-d65d24a9df89/go.mod h1:5mP60UakkCye+eOcZ5p98VnV2O49qreW1gq9TdsUf7Q=
sigs.k8s.io/kube-api-linter v0.0.0-20260320123815-c9b9b51b278a h1:36He06lekH8jv21Z88RiGHRswh/cBoXKfSbFleF7ukM=
sigs.k8s.io/kube-api-linter v0.0.0-20260320123815-c9b9b51b278a/go.mod h1:5mP60UakkCye+eOcZ5p98VnV2O49qreW1gq9TdsUf7Q=
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
2 changes: 1 addition & 1 deletion website/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.PHONY: default
default: generated

CRD_REF_DOCS?=github.com/elastic/crd-ref-docs@v0.2.0
CRD_REF_DOCS?=github.com/elastic/crd-ref-docs@v0.3.0
GOMARKDOC?=github.com/princjef/gomarkdoc/cmd/gomarkdoc@v1.1.0

websitedir := $(dir $(lastword $(MAKEFILE_LIST)))
Expand Down
Loading
Loading