Skip to content

Commit 6472083

Browse files
Deydra71Deydra71
committed
Adding passwordSelectors and secret to CR generation
Signed-off-by: Veronika Fisarova <vfisarov@redhat.com>
1 parent b7aa93b commit 6472083

File tree

9 files changed

+65
-283
lines changed

9 files changed

+65
-283
lines changed

‎apis/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10517,9 +10517,6 @@ spec:
1051710517
serviceUser:
1051810518
default: octavia
1051910519
type: string
10520-
tenantDomainName:
10521-
default: Default
10522-
type: string
1052310520
tenantName:
1052410521
default: service
1052510522
type: string
@@ -10678,9 +10675,6 @@ spec:
1067810675
serviceUser:
1067910676
default: octavia
1068010677
type: string
10681-
tenantDomainName:
10682-
default: Default
10683-
type: string
1068410678
tenantName:
1068510679
default: service
1068610680
type: string
@@ -10822,9 +10816,6 @@ spec:
1082210816
serviceUser:
1082310817
default: octavia
1082410818
type: string
10825-
tenantDomainName:
10826-
default: Default
10827-
type: string
1082810819
tenantName:
1082910820
default: service
1083010821
type: string
@@ -11070,9 +11061,6 @@ spec:
1107011061
serviceUser:
1107111062
default: octavia
1107211063
type: string
11073-
tenantDomainName:
11074-
default: Default
11075-
type: string
1107611064
tenantName:
1107711065
default: service
1107811066
type: string
@@ -11158,9 +11146,6 @@ spec:
1115811146
sshPubkey:
1115911147
default: octavia-ssh-pubkey
1116011148
type: string
11161-
tenantDomainName:
11162-
default: Default
11163-
type: string
1116411149
tenantName:
1116511150
default: service
1116611151
type: string

‎apis/go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@ require (
1313
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250403164043-4f93d5b94a45
1414
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250321230305-d8967fa13b1a
1515
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250331221740-3ca13cff47d0
16-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250416140801-46d35b7999b2
16+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250424140239-2d89c1d9f3ec
1717
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250406092522-819a842df37d
1818
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250406092234-10f5f7e5b5a9
19-
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250423055245-3cb2ae8df6f0
19+
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250505061650-7cb2f323fb35
2020
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250419062702-0acec6a591c8
2121
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250401095833-93bc034c64a9
2222
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250328081634-08026fd530d9
2323
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250401073502-1e282b4746cd
2424
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250402053313-b88da4dd7a62
2525
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250406092807-8386f9655c0b
2626
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250402113637-b66aeb654907
27-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250418131034-8c1e46e5dd08
28-
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250420191048-db23ac9a6ff9
29-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250415061104-ec26f3967b8e
30-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250420191048-a2d55f55d5da
27+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250509053924-33a097e86b88
28+
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250507105601-d9bf51effcc2
29+
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250429071246-b912d22ca9aa
30+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250509120424-5d61299fe6f5
3131
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.71.0-rhobs1 // indirect
3232
github.com/rhobs/observability-operator v0.3.1 // indirect
3333
go.uber.org/multierr v1.11.0 // indirect
@@ -116,4 +116,4 @@ replace github.com/openshift/api => github.com/openshift/api v0.0.0-202408300231
116116
// custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.9.0_patches_tag)
117117
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20241017142550-a3524acedd49 //allow-merging
118118

119-
replace github.com/openstack-k8s-operators/keystone-operator/api => github.com/Deydra71/keystone-operator/api v0.0.0-20250507073641-38cb51217a45
119+
replace github.com/openstack-k8s-operators/keystone-operator/api => github.com/Deydra71/keystone-operator/api v0.0.0-20250514070500-15fcdb912b2c

‎apis/go.sum‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
github.com/Deydra71/keystone-operator/api v0.0.0-20250507073641-38cb51217a45 h1:c13rfNoKIXAd5R/k1D5wCBWtsR31xylSaiXKmfaAI4w=
2-
github.com/Deydra71/keystone-operator/api v0.0.0-20250507073641-38cb51217a45/go.mod h1:VPkYswnrCtlSMTeYjgxTOpfNN7zvxqa+kZ8EWDJaFrg=
1+
github.com/Deydra71/keystone-operator/api v0.0.0-20250514070500-15fcdb912b2c h1:DXnHQg/+AjMsoJqvQEusjkyjOsOPGbKJ8uRVLyTkseQ=
2+
github.com/Deydra71/keystone-operator/api v0.0.0-20250514070500-15fcdb912b2c/go.mod h1:VPkYswnrCtlSMTeYjgxTOpfNN7zvxqa+kZ8EWDJaFrg=
33
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
44
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
55
github.com/cert-manager/cert-manager v1.14.7 h1:C2L59sMGMdSpd8SPx5qfPAL7ejZaNxJBRd24S7Ws5Ek=
@@ -108,12 +108,10 @@ github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250321230305-d89
108108
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250321230305-d8967fa13b1a/go.mod h1:zvYhXGs8m5TAPrlHZUldd7T9dsESV/Gr8yaHnbtbXQ0=
109109
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250331221740-3ca13cff47d0 h1:paR3nhVvhXbGhsn/az1NvREXut/5TO/G9C4MOI/ByWY=
110110
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250331221740-3ca13cff47d0/go.mod h1:XNnGvJrYjx0qGv/jx41nzwarpqzNJdzXen+pY8LPFK8=
111-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250416140801-46d35b7999b2 h1:/tICd2zS1zR4NriDFq8PHStqlvaIlX0MqxYhYYU0zKk=
112-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250416140801-46d35b7999b2/go.mod h1:+l+sclC6YCRcLcvS3UEGKBf8xya8aExMrmHeA9tMg+k=
111+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250424140239-2d89c1d9f3ec h1:Sr12fbgiUTL/a7qvKCosedKW5gn5S+53DgRJgeveTk4=
113112
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250406092522-819a842df37d h1:zzt8vvFpTULUSp/66ZJGp3qZbfsMnzcqXzXThzLsRTY=
114113
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250406092522-819a842df37d/go.mod h1:FNDCrwljazpLrw+3EFlPixAl/sEimvQicp/YivcEvME=
115-
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250423055245-3cb2ae8df6f0 h1:L2YsApIsUga1ku2siRM/kPViRNk756q+g7jrweAHkdo=
116-
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250423055245-3cb2ae8df6f0/go.mod h1:UwHXRIrMSPJD3lFqrA4oKmRXVLFQCRkLAj9x6KLEHiQ=
114+
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250505061650-7cb2f323fb35 h1:dczrtvVjeDXUR3OhnUQRhVVnN14KX52qp0KXCulo8pA=
117115
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20250423055245-3cb2ae8df6f0 h1:FAHrScvlj6w17wvcDhJ0ZnmraMrrOX1CxzvqZK595hA=
118116
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20250423055245-3cb2ae8df6f0/go.mod h1:fesgTbs2j30Fhw2hebXkPgbeAIqG0Yk2oaeOklAInZg=
119117
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250419062702-0acec6a591c8 h1:oLY6iMNPe3/L5S8EvNcjvfWd1tbCNgfQ+iSnv3UCB0U=
@@ -130,16 +128,12 @@ github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250406092807-
130128
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250406092807-8386f9655c0b/go.mod h1:0z/P1Yhk7h5nnx8bLMz3gSSoqo+dFRwJG1O14qVtsuQ=
131129
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250402113637-b66aeb654907 h1:pNUuydkvSeUFhCinCLC8KKxr/RBPcu8VqXlBDK81mDc=
132130
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250402113637-b66aeb654907/go.mod h1:RZj8UXrq5Sg6a8SP3R4kzpQbHxM1bBCYPc3ecDfuQPQ=
133-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250418131034-8c1e46e5dd08 h1:bqyBhXpZ77a1daC9mCYuP8uwqTLcVcS8xZcbIhCzzMQ=
134-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250418131034-8c1e46e5dd08/go.mod h1:wlRoylGCfu6weUrvRARU1yAKl8hza9X6LAENB7XVIkw=
135-
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250420191048-db23ac9a6ff9 h1:zdb3m91+JLLgQMxO/aEL7Tqrtx49uQm05IPS662IVHI=
136-
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250420191048-db23ac9a6ff9/go.mod h1:r2KGHWjHqpF4e3R3JiQTICgHqjcTUbzL7c3Uv/ZEndg=
131+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250509053924-33a097e86b88 h1:ssCpLmyH680EEJEIsaMIa5XCTMV+MXt7urhy1k32Ar4=
132+
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250507105601-d9bf51effcc2 h1:bOudfZtQYSPjUMCBeauMcF+L7p6nc3apZwTd51fBmEo=
137133
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20241017142550-a3524acedd49 h1:/7SnnHfGCH/dwuZFNUx54zw4cnwv2w6hjONq16aoowM=
138134
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20241017142550-a3524acedd49/go.mod h1:6Mq2N/KtNFW20L+PQC5qkeK8R8UGadmGBXL8HDY6lcg=
139-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250415061104-ec26f3967b8e h1:W4xVCUt0GL5vjIeodLyHwJnFO/z7ZO/Qr5tzSNcgnao=
140-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250415061104-ec26f3967b8e/go.mod h1:F6yh/lGjYlSDPVMUKGuKRiSSPq/+se54ciobRz4+nlg=
141-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250420191048-a2d55f55d5da h1:/Tjdeb1Y3MuLQy6p5ezNvWLNlmyUG+2i8fOCVfRfQkg=
142-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250420191048-a2d55f55d5da/go.mod h1:meN7CoBND2usExOU7D02sSyplgxS0r2NAGh1IyDPWA4=
135+
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250429071246-b912d22ca9aa h1:F1LC6mmIfCWGcJPwVOFLl1/pUjiVPjupzr1tgp8JGJ4=
136+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250509120424-5d61299fe6f5 h1:K6Oo4fwrkjJfL9NSaeTDUgFCVfeEnKWXW83zWp0qqa0=
143137
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
144138
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
145139
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

‎bindata/crds/crds.yaml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10681,9 +10681,6 @@ spec:
1068110681
serviceUser:
1068210682
default: octavia
1068310683
type: string
10684-
tenantDomainName:
10685-
default: Default
10686-
type: string
1068710684
tenantName:
1068810685
default: service
1068910686
type: string
@@ -10842,9 +10839,6 @@ spec:
1084210839
serviceUser:
1084310840
default: octavia
1084410841
type: string
10845-
tenantDomainName:
10846-
default: Default
10847-
type: string
1084810842
tenantName:
1084910843
default: service
1085010844
type: string
@@ -10986,9 +10980,6 @@ spec:
1098610980
serviceUser:
1098710981
default: octavia
1098810982
type: string
10989-
tenantDomainName:
10990-
default: Default
10991-
type: string
1099210983
tenantName:
1099310984
default: service
1099410985
type: string
@@ -11234,9 +11225,6 @@ spec:
1123411225
serviceUser:
1123511226
default: octavia
1123611227
type: string
11237-
tenantDomainName:
11238-
default: Default
11239-
type: string
1124011228
tenantName:
1124111229
default: service
1124211230
type: string
@@ -11322,9 +11310,6 @@ spec:
1132211310
sshPubkey:
1132311311
default: octavia-ssh-pubkey
1132411312
type: string
11325-
tenantDomainName:
11326-
default: Default
11327-
type: string
1132811313
tenantName:
1132911314
default: service
1133011315
type: string

‎bindata/crds/keystone.openstack.org_applicationcredentials.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,13 @@ spec:
7070
the AC should be rotated
7171
minimum: 1
7272
type: integer
73+
passwordSelector:
74+
description: PasswordSelector for extracting the service password
75+
type: string
76+
secret:
77+
default: osp-secret
78+
description: Secret containing service user password
79+
type: string
7380
userName:
7481
description: UserName - the Keystone user under which this AC is created
7582
type: string
@@ -137,10 +144,3 @@ spec:
137144
type: string
138145
secretName:
139146
description: SecretName - name of the k8s Secret storing the AC secret
140-
type: string
141-
type: object
142-
type: object
143-
served: true
144-
storage: true
145-
subresources:
146-
status: {}

‎config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10517,9 +10517,6 @@ spec:
1051710517
serviceUser:
1051810518
default: octavia
1051910519
type: string
10520-
tenantDomainName:
10521-
default: Default
10522-
type: string
1052310520
tenantName:
1052410521
default: service
1052510522
type: string
@@ -10678,9 +10675,6 @@ spec:
1067810675
serviceUser:
1067910676
default: octavia
1068010677
type: string
10681-
tenantDomainName:
10682-
default: Default
10683-
type: string
1068410678
tenantName:
1068510679
default: service
1068610680
type: string
@@ -10822,9 +10816,6 @@ spec:
1082210816
serviceUser:
1082310817
default: octavia
1082410818
type: string
10825-
tenantDomainName:
10826-
default: Default
10827-
type: string
1082810819
tenantName:
1082910820
default: service
1083010821
type: string
@@ -11070,9 +11061,6 @@ spec:
1107011061
serviceUser:
1107111062
default: octavia
1107211063
type: string
11073-
tenantDomainName:
11074-
default: Default
11075-
type: string
1107611064
tenantName:
1107711065
default: service
1107811066
type: string
@@ -11158,9 +11146,6 @@ spec:
1115811146
sshPubkey:
1115911147
default: octavia-ssh-pubkey
1116011148
type: string
11161-
tenantDomainName:
11162-
default: Default
11163-
type: string
1116411149
tenantName:
1116511150
default: service
1116611151
type: string

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ require (
1818
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250403164043-4f93d5b94a45
1919
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250321230305-d8967fa13b1a
2020
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250331221740-3ca13cff47d0
21-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250416140801-46d35b7999b2
21+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250424140239-2d89c1d9f3ec
2222
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250406092522-819a842df37d
2323
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250406092234-10f5f7e5b5a9
2424
github.com/openstack-k8s-operators/lib-common/modules/ansible v0.6.1-0.20250402133843-5a4c5f4fb4f1
2525
github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.6.1-0.20250402133843-5a4c5f4fb4f1
26-
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250423055245-3cb2ae8df6f0
26+
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250505061650-7cb2f323fb35
2727
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250419062702-0acec6a591c8
2828
github.com/openstack-k8s-operators/lib-common/modules/test v0.6.1-0.20250419062702-0acec6a591c8
2929
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250401095833-93bc034c64a9
@@ -128,4 +128,4 @@ replace github.com/openshift/api => github.com/openshift/api v0.0.0-202408300231
128128
// custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.9.0_patches_tag)
129129
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20241017142550-a3524acedd49 //allow-merging
130130

131-
replace github.com/openstack-k8s-operators/keystone-operator/api => github.com/Deydra71/keystone-operator/api v0.0.0-20250507073641-38cb51217a45
131+
replace github.com/openstack-k8s-operators/keystone-operator/api => github.com/Deydra71/keystone-operator/api v0.0.0-20250514070500-15fcdb912b2c

0 commit comments

Comments
 (0)