Skip to content

Commit 8e820e6

Browse files
stuggistuggi
committed
[wip] test swiftstorage CA cert
Signed-off-by: Martin Schuppert <[email protected]>
1 parent e8215c8 commit 8e820e6

File tree

9 files changed

+33
-6
lines changed

9 files changed

+33
-6
lines changed

‎api/go.mod‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,3 +143,5 @@ replace k8s.io/code-generator => k8s.io/code-generator v0.31.14 //allow-merging
143143
replace k8s.io/component-base => k8s.io/component-base v0.31.14 //allow-merging
144144

145145
replace github.com/cert-manager/cmctl/v2 => github.com/cert-manager/cmctl/v2 v2.1.2-0.20241127223932-88edb96860cf //allow-merging
146+
147+
replace github.com/openstack-k8s-operators/swift-operator/api => github.com/stuggi/swift-operator/api v0.0.0-20260109152558-4346379e0045

‎api/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,6 @@ github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.2026010707460
156156
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20260107074601-a3a9bc0039f2/go.mod h1:8vbyaXZp+g7hhH88D8CAT6rxtyyVq31k7/c+Dp7/ZLg=
157157
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec h1:saovr368HPAKHN0aRPh8h8n9s9dn3d8Frmfua0UYRlc=
158158
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec/go.mod h1:Nh2NEePLjovUQof2krTAg4JaAoLacqtPTZQXK6izNfg=
159-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260109114915-e3610af59955 h1:Ih9zMoWshUFadiskYHa/Cp9PtrEmaHkeEk2whlDi9mc=
160-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260109114915-e3610af59955/go.mod h1:torrWuwy6gLv5xAjhjKdJJD3HJsY8sXin98VGQHopGI=
161159
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260109125950-7b71e711b219 h1:kJTfqT0+FOU4Pp1pcO9OXQMIAAP7tzg+jxul6r42zOQ=
162160
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260109125950-7b71e711b219/go.mod h1:ZTNsfEk7BGBCJO/dQ4Fu8sDcs5l3fXcdEZtkXoeJuuI=
163161
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20260109095000-08534876783d h1:vSSrwCe4QfWRMNVOd5JgLfNf2O0APAzxvBI/XJaQS94=
@@ -189,6 +187,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
189187
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
190188
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
191189
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
190+
github.com/stuggi/swift-operator/api v0.0.0-20260109152558-4346379e0045 h1:yKuxJ7aRTpWawZUHx2t0egBLpnPVW10kMNQp6me7XS0=
191+
github.com/stuggi/swift-operator/api v0.0.0-20260109152558-4346379e0045/go.mod h1:torrWuwy6gLv5xAjhjKdJJD3HJsY8sXin98VGQHopGI=
192192
github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
193193
github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
194194
github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=

‎bindata/crds/swift.openstack.org_swifts.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,14 @@ spec:
506506
default: 10Gi
507507
description: Minimum size for Swift PVs
508508
type: string
509+
tls:
510+
description: TLS - Parameters related to the TLS
511+
properties:
512+
caBundleSecretName:
513+
description: CaBundleSecretName - holding the CA certs in
514+
a pre-created bundle file
515+
type: string
516+
type: object
509517
topologyRef:
510518
description: |-
511519
TopologyRef to apply the Topology defined by the associated CR referenced

‎bindata/crds/swift.openstack.org_swiftstorages.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,14 @@ spec:
112112
default: 10Gi
113113
description: Minimum size for Swift PVs
114114
type: string
115+
tls:
116+
description: TLS - Parameters related to the TLS
117+
properties:
118+
caBundleSecretName:
119+
description: CaBundleSecretName - holding the CA certs in a pre-created
120+
bundle file
121+
type: string
122+
type: object
115123
topologyRef:
116124
description: |-
117125
TopologyRef to apply the Topology defined by the associated CR referenced

‎config/manifests/bases/openstack-operator.clusterserviceversion.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,13 @@ spec:
436436
- description: TLS - overrides tls parameters for public endpoint
437437
displayName: TLS
438438
path: telemetry.aodhApiOverride.tls
439+
- description: CloudKittyAPIOverride, provides the ability to override the generated
440+
manifest of several child resources.
441+
displayName: Cloud Kitty APIOverride
442+
path: telemetry.cloudKittyApiOverride
443+
- description: TLS - overrides tls parameters for public endpoint
444+
displayName: TLS
445+
path: telemetry.cloudKittyApiOverride.tls
439446
- description: Enabled - Whether OpenStack Telemetry services should be deployed
440447
and managed
441448
displayName: Enabled

‎config/operator/manager_operator_images.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ spec:
5050
- name: RELATED_IMAGE_RABBITMQ_CLUSTER_OPERATOR_MANAGER_IMAGE_URL
5151
value: quay.io/openstack-k8s-operators/rabbitmq-cluster-operator@sha256:893e66303c1b0bc1d00a299a3f0380bad55c8dc813c8a1c6a4aab379f5aa12a2
5252
- name: RELATED_IMAGE_SWIFT_OPERATOR_MANAGER_IMAGE_URL
53-
value: quay.io/openstack-k8s-operators/swift-operator@sha256:46fb7b4a0620de5ce9ebede828e56bae0fcbbcb74a6461be0610b23aed1d67ca
53+
value: quay.io/mschuppe/swift-operator@sha256:b16305b6d88bbd65dd707ce13fe33cb5d2843a6f81193144d1851b8d3133f440
5454
- name: RELATED_IMAGE_TELEMETRY_OPERATOR_MANAGER_IMAGE_URL
5555
value: quay.io/openstack-k8s-operators/telemetry-operator@sha256:fd7ade59ba5aaf96c8679a70075dba1c9bf8d76b69e29284020f7d0b98191d9f
5656
- name: RELATED_IMAGE_TEST_OPERATOR_MANAGER_IMAGE_URL

‎go.mod‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,3 +181,5 @@ replace k8s.io/code-generator => k8s.io/code-generator v0.31.14 //allow-merging
181181
replace k8s.io/component-base => k8s.io/component-base v0.31.14 //allow-merging
182182

183183
replace github.com/cert-manager/cmctl/v2 => github.com/cert-manager/cmctl/v2 v2.1.2-0.20241127223932-88edb96860cf //allow-merging
184+
185+
replace github.com/openstack-k8s-operators/swift-operator/api => github.com/stuggi/swift-operator/api v0.0.0-20260109152558-4346379e0045

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,6 @@ github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.2026010707460
186186
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20260107074601-a3a9bc0039f2/go.mod h1:8vbyaXZp+g7hhH88D8CAT6rxtyyVq31k7/c+Dp7/ZLg=
187187
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec h1:saovr368HPAKHN0aRPh8h8n9s9dn3d8Frmfua0UYRlc=
188188
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec/go.mod h1:Nh2NEePLjovUQof2krTAg4JaAoLacqtPTZQXK6izNfg=
189-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260109114915-e3610af59955 h1:Ih9zMoWshUFadiskYHa/Cp9PtrEmaHkeEk2whlDi9mc=
190-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260109114915-e3610af59955/go.mod h1:torrWuwy6gLv5xAjhjKdJJD3HJsY8sXin98VGQHopGI=
191189
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260109125950-7b71e711b219 h1:kJTfqT0+FOU4Pp1pcO9OXQMIAAP7tzg+jxul6r42zOQ=
192190
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260109125950-7b71e711b219/go.mod h1:ZTNsfEk7BGBCJO/dQ4Fu8sDcs5l3fXcdEZtkXoeJuuI=
193191
github.com/openstack-k8s-operators/test-operator/api v0.6.1-0.20260107084236-870a366eae73 h1:nMS5E7FE+k3PQRMuiK6KTWdPPCZpb7yFr89Fg2J0BSA=
@@ -232,6 +230,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
232230
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
233231
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
234232
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
233+
github.com/stuggi/swift-operator/api v0.0.0-20260109152558-4346379e0045 h1:yKuxJ7aRTpWawZUHx2t0egBLpnPVW10kMNQp6me7XS0=
234+
github.com/stuggi/swift-operator/api v0.0.0-20260109152558-4346379e0045/go.mod h1:torrWuwy6gLv5xAjhjKdJJD3HJsY8sXin98VGQHopGI=
235235
github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
236236
github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
237237
github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=

‎hack/export_operator_related_images.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export RELATED_IMAGE_OPENSTACK_BAREMETAL_OPERATOR_MANAGER_IMAGE_URL=quay.io/open
1818
export RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ovn-operator@sha256:578befcb2341683d990a800124f7ba4c12fcb42a1d08f07d340f883a40527178
1919
export RELATED_IMAGE_PLACEMENT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/placement-operator@sha256:0776154fcc999881e27158fea114e094a2ecf632c0beea0c80d1f09aab9fbb53
2020
export RELATED_IMAGE_RABBITMQ_CLUSTER_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/rabbitmq-cluster-operator@sha256:893e66303c1b0bc1d00a299a3f0380bad55c8dc813c8a1c6a4aab379f5aa12a2
21-
export RELATED_IMAGE_SWIFT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/swift-operator@sha256:46fb7b4a0620de5ce9ebede828e56bae0fcbbcb74a6461be0610b23aed1d67ca
21+
export RELATED_IMAGE_SWIFT_OPERATOR_MANAGER_IMAGE_URL=quay.io/mschuppe/swift-operator@sha256:b16305b6d88bbd65dd707ce13fe33cb5d2843a6f81193144d1851b8d3133f440
2222
export RELATED_IMAGE_TELEMETRY_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/telemetry-operator@sha256:fd7ade59ba5aaf96c8679a70075dba1c9bf8d76b69e29284020f7d0b98191d9f
2323
export RELATED_IMAGE_TEST_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/test-operator@sha256:2bd5475df9fd2078c60f254e531d4033db74e3c486c32cf9fdd02713e65f39b2
2424
export RELATED_IMAGE_WATCHER_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/watcher-operator@sha256:d687150a46d97eb382dcd8305a2a611943af74771debe1fa9cc13a21e51c69ad

0 commit comments

Comments
 (0)