Skip to content
Closed
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
2 changes: 2 additions & 0 deletions api/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -143,3 +143,5 @@ replace k8s.io/code-generator => k8s.io/code-generator v0.31.14 //allow-merging
replace k8s.io/component-base => k8s.io/component-base v0.31.14 //allow-merging

replace github.com/cert-manager/cmctl/v2 => github.com/cert-manager/cmctl/v2 v2.1.2-0.20241127223932-88edb96860cf //allow-merging

replace github.com/openstack-k8s-operators/swift-operator/api => github.com/stuggi/swift-operator/api v0.0.0-20260109152558-4346379e0045
4 changes: 2 additions & 2 deletions api/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,6 @@ github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.2026010707460
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20260107074601-a3a9bc0039f2/go.mod h1:8vbyaXZp+g7hhH88D8CAT6rxtyyVq31k7/c+Dp7/ZLg=
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec h1:saovr368HPAKHN0aRPh8h8n9s9dn3d8Frmfua0UYRlc=
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec/go.mod h1:Nh2NEePLjovUQof2krTAg4JaAoLacqtPTZQXK6izNfg=
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260109114915-e3610af59955 h1:Ih9zMoWshUFadiskYHa/Cp9PtrEmaHkeEk2whlDi9mc=
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260109114915-e3610af59955/go.mod h1:torrWuwy6gLv5xAjhjKdJJD3HJsY8sXin98VGQHopGI=
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260109125950-7b71e711b219 h1:kJTfqT0+FOU4Pp1pcO9OXQMIAAP7tzg+jxul6r42zOQ=
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260109125950-7b71e711b219/go.mod h1:ZTNsfEk7BGBCJO/dQ4Fu8sDcs5l3fXcdEZtkXoeJuuI=
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20260109095000-08534876783d h1:vSSrwCe4QfWRMNVOd5JgLfNf2O0APAzxvBI/XJaQS94=
Expand Down Expand Up @@ -189,6 +187,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
github.com/stuggi/swift-operator/api v0.0.0-20260109152558-4346379e0045 h1:yKuxJ7aRTpWawZUHx2t0egBLpnPVW10kMNQp6me7XS0=
github.com/stuggi/swift-operator/api v0.0.0-20260109152558-4346379e0045/go.mod h1:torrWuwy6gLv5xAjhjKdJJD3HJsY8sXin98VGQHopGI=
github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
Expand Down
8 changes: 8 additions & 0 deletions bindata/crds/swift.openstack.org_swifts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,14 @@ spec:
default: 10Gi
description: Minimum size for Swift PVs
type: string
tls:
description: TLS - Parameters related to the TLS
properties:
caBundleSecretName:
description: CaBundleSecretName - holding the CA certs in
a pre-created bundle file
type: string
type: object
topologyRef:
description: |-
TopologyRef to apply the Topology defined by the associated CR referenced
Expand Down
8 changes: 8 additions & 0 deletions bindata/crds/swift.openstack.org_swiftstorages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,14 @@ spec:
default: 10Gi
description: Minimum size for Swift PVs
type: string
tls:
description: TLS - Parameters related to the TLS
properties:
caBundleSecretName:
description: CaBundleSecretName - holding the CA certs in a pre-created
bundle file
type: string
type: object
topologyRef:
description: |-
TopologyRef to apply the Topology defined by the associated CR referenced
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,13 @@ spec:
- description: TLS - overrides tls parameters for public endpoint
displayName: TLS
path: telemetry.aodhApiOverride.tls
- description: CloudKittyAPIOverride, provides the ability to override the generated
manifest of several child resources.
displayName: Cloud Kitty APIOverride
path: telemetry.cloudKittyApiOverride
- description: TLS - overrides tls parameters for public endpoint
displayName: TLS
path: telemetry.cloudKittyApiOverride.tls
- description: Enabled - Whether OpenStack Telemetry services should be deployed
and managed
displayName: Enabled
Expand Down
2 changes: 1 addition & 1 deletion config/operator/manager_operator_images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ spec:
- name: RELATED_IMAGE_RABBITMQ_CLUSTER_OPERATOR_MANAGER_IMAGE_URL
value: quay.io/openstack-k8s-operators/rabbitmq-cluster-operator@sha256:893e66303c1b0bc1d00a299a3f0380bad55c8dc813c8a1c6a4aab379f5aa12a2
- name: RELATED_IMAGE_SWIFT_OPERATOR_MANAGER_IMAGE_URL
value: quay.io/openstack-k8s-operators/swift-operator@sha256:46fb7b4a0620de5ce9ebede828e56bae0fcbbcb74a6461be0610b23aed1d67ca
value: quay.io/mschuppe/swift-operator@sha256:b16305b6d88bbd65dd707ce13fe33cb5d2843a6f81193144d1851b8d3133f440
- name: RELATED_IMAGE_TELEMETRY_OPERATOR_MANAGER_IMAGE_URL
value: quay.io/openstack-k8s-operators/telemetry-operator@sha256:fd7ade59ba5aaf96c8679a70075dba1c9bf8d76b69e29284020f7d0b98191d9f
- name: RELATED_IMAGE_TEST_OPERATOR_MANAGER_IMAGE_URL
Expand Down
2 changes: 2 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -181,3 +181,5 @@ replace k8s.io/code-generator => k8s.io/code-generator v0.31.14 //allow-merging
replace k8s.io/component-base => k8s.io/component-base v0.31.14 //allow-merging

replace github.com/cert-manager/cmctl/v2 => github.com/cert-manager/cmctl/v2 v2.1.2-0.20241127223932-88edb96860cf //allow-merging

replace github.com/openstack-k8s-operators/swift-operator/api => github.com/stuggi/swift-operator/api v0.0.0-20260109152558-4346379e0045
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,6 @@ github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.2026010707460
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20260107074601-a3a9bc0039f2/go.mod h1:8vbyaXZp+g7hhH88D8CAT6rxtyyVq31k7/c+Dp7/ZLg=
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec h1:saovr368HPAKHN0aRPh8h8n9s9dn3d8Frmfua0UYRlc=
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec/go.mod h1:Nh2NEePLjovUQof2krTAg4JaAoLacqtPTZQXK6izNfg=
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260109114915-e3610af59955 h1:Ih9zMoWshUFadiskYHa/Cp9PtrEmaHkeEk2whlDi9mc=
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260109114915-e3610af59955/go.mod h1:torrWuwy6gLv5xAjhjKdJJD3HJsY8sXin98VGQHopGI=
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260109125950-7b71e711b219 h1:kJTfqT0+FOU4Pp1pcO9OXQMIAAP7tzg+jxul6r42zOQ=
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260109125950-7b71e711b219/go.mod h1:ZTNsfEk7BGBCJO/dQ4Fu8sDcs5l3fXcdEZtkXoeJuuI=
github.com/openstack-k8s-operators/test-operator/api v0.6.1-0.20260107084236-870a366eae73 h1:nMS5E7FE+k3PQRMuiK6KTWdPPCZpb7yFr89Fg2J0BSA=
Expand Down Expand Up @@ -232,6 +230,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
github.com/stuggi/swift-operator/api v0.0.0-20260109152558-4346379e0045 h1:yKuxJ7aRTpWawZUHx2t0egBLpnPVW10kMNQp6me7XS0=
github.com/stuggi/swift-operator/api v0.0.0-20260109152558-4346379e0045/go.mod h1:torrWuwy6gLv5xAjhjKdJJD3HJsY8sXin98VGQHopGI=
github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
Expand Down
2 changes: 1 addition & 1 deletion hack/export_operator_related_images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export RELATED_IMAGE_OPENSTACK_BAREMETAL_OPERATOR_MANAGER_IMAGE_URL=quay.io/open
export RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ovn-operator@sha256:578befcb2341683d990a800124f7ba4c12fcb42a1d08f07d340f883a40527178
export RELATED_IMAGE_PLACEMENT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/placement-operator@sha256:0776154fcc999881e27158fea114e094a2ecf632c0beea0c80d1f09aab9fbb53
export RELATED_IMAGE_RABBITMQ_CLUSTER_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/rabbitmq-cluster-operator@sha256:893e66303c1b0bc1d00a299a3f0380bad55c8dc813c8a1c6a4aab379f5aa12a2
export RELATED_IMAGE_SWIFT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/swift-operator@sha256:46fb7b4a0620de5ce9ebede828e56bae0fcbbcb74a6461be0610b23aed1d67ca
export RELATED_IMAGE_SWIFT_OPERATOR_MANAGER_IMAGE_URL=quay.io/mschuppe/swift-operator@sha256:b16305b6d88bbd65dd707ce13fe33cb5d2843a6f81193144d1851b8d3133f440
export RELATED_IMAGE_TELEMETRY_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/telemetry-operator@sha256:fd7ade59ba5aaf96c8679a70075dba1c9bf8d76b69e29284020f7d0b98191d9f
export RELATED_IMAGE_TEST_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/test-operator@sha256:2bd5475df9fd2078c60f254e531d4033db74e3c486c32cf9fdd02713e65f39b2
export RELATED_IMAGE_WATCHER_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/watcher-operator@sha256:d687150a46d97eb382dcd8305a2a611943af74771debe1fa9cc13a21e51c69ad
Loading