Skip to content

Commit 33f89d1

Browse files
dprincedprince
committed
Cert fixes
1 parent ae4850d commit 33f89d1

10 files changed

Lines changed: 26 additions & 14 deletions

File tree

‎PROJECT‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,7 @@ resources:
9494
kind: OpenStackControlPlane
9595
path: github.com/openstack-k8s-operators/openstack-operator/apis/core/v1beta2
9696
version: v1beta2
97+
webhooks:
98+
conversion: true
99+
webhookVersion: v1
97100
version: "3"

‎apis/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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_n)
117117
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d //allow-merging
118118

119-
replace github.com/openstack-k8s-operators/keystone-operator/api => github.com/dprince/keystone-operator/api v0.0.0-20250724220837-cb836ff1f1a6
119+
replace github.com/openstack-k8s-operators/keystone-operator/api => github.com/dprince/keystone-operator/api v0.0.0-20250812213004-077bfb1a26d8

‎apis/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
88
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
99
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
1010
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
11-
github.com/dprince/keystone-operator/api v0.0.0-20250724220837-cb836ff1f1a6 h1:BOzQNig/ObI/afxBycZOYC2st/2zqNcyh9rUGJQhRTE=
12-
github.com/dprince/keystone-operator/api v0.0.0-20250724220837-cb836ff1f1a6/go.mod h1:0/8UQBzOyJYqHjarBfm2Rsw4xbQ8tywtKxSbTFbLbO0=
11+
github.com/dprince/keystone-operator/api v0.0.0-20250812213004-077bfb1a26d8 h1:3KXshCFjOn4RMfgaAmbNivfH/exV7dORcMAaymFlrYo=
12+
github.com/dprince/keystone-operator/api v0.0.0-20250812213004-077bfb1a26d8/go.mod h1:0/8UQBzOyJYqHjarBfm2Rsw4xbQ8tywtKxSbTFbLbO0=
1313
github.com/emicklei/go-restful/v3 v3.12.0 h1:y2DdzBAURM29NFF94q6RaY4vjIH1rtwDapwQtU84iWk=
1414
github.com/emicklei/go-restful/v3 v3.12.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
1515
github.com/evanphx/json-patch v5.7.0+incompatible h1:vgGkfT/9f8zE6tvSCe74nfpAVDQ2tG6yudJd8LBksgI=

‎bindata/crds/crds.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,20 @@ apiVersion: apiextensions.k8s.io/v1
167167
kind: CustomResourceDefinition
168168
metadata:
169169
annotations:
170+
cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
170171
controller-gen.kubebuilder.io/version: v0.14.0
171172
name: openstackcontrolplanes.core.openstack.org
172173
spec:
174+
conversion:
175+
strategy: Webhook
176+
webhook:
177+
clientConfig:
178+
service:
179+
name: webhook-service
180+
namespace: system
181+
path: /convert
182+
conversionReviewVersions:
183+
- v1
173184
group: core.openstack.org
174185
names:
175186
kind: OpenStackControlPlane

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
cert-manager.io/inject-ca-from: keystone-operator-system/keystone-operator-serving-cert
5+
cert-manager.io/inject-ca-from: openstack-operators/keystone-operator-serving-cert
66
controller-gen.kubebuilder.io/version: v0.14.0
77
creationTimestamp: null
88
name: keystoneapis.keystone.openstack.org
@@ -13,7 +13,7 @@ spec:
1313
clientConfig:
1414
service:
1515
name: keystone-operator-webhook-service
16-
namespace: keystone-operator-system
16+
namespace: openstack-operators
1717
path: /convert
1818
conversionReviewVersions:
1919
- v1

‎config/crd/kustomization.yaml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,18 @@ resources:
1414
patchesStrategicMerge:
1515
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
1616
# patches here are for enabling the conversion webhook for each CRD
17-
#- patches/webhook_in_core_openstackcontrolplanes.yaml
17+
- patches/webhook_in_core_openstackcontrolplanes.yaml
1818
#- patches/webhook_in_client_openstackclients.yaml
1919
#- patches/webhook_in_core_openstackversions.yaml
2020
#- patches/webhook_in_operator_openstacks.yaml
21-
#- patches/webhook_in_openstackcontrolplanes.yaml
2221
#+kubebuilder:scaffold:crdkustomizewebhookpatch
2322

2423
# [CERTMANAGER] To enable cert-manager, uncomment all the sections with [CERTMANAGER] prefix.
2524
# patches here are for enabling the CA injection for each CRD
26-
#- patches/cainjection_in_core_openstackcontrolplanes.yaml
25+
- patches/cainjection_in_core_openstackcontrolplanes.yaml
2726
#- patches/cainjection_in_client_openstackclients.yaml
2827
#- patches/cainjection_in_core_openstackversions.yaml
2928
#- patches/cainjection_in_operator_openstacks.yaml
30-
#- patches/cainjection_in_openstackcontrolplanes.yaml
3129
#+kubebuilder:scaffold:crdkustomizecainjectionpatch
3230

3331
# the following config is for teaching kustomize how to do kustomization for CRDs.

‎config/operator/manager_operator_images.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
- name: RELATED_IMAGE_IRONIC_OPERATOR_MANAGER_IMAGE_URL
3131
value: quay.io/openstack-k8s-operators/ironic-operator@sha256:3e4c20feb4e29a1a29966061f8b4a700bde3e646d8a1781dfb447003a23930cb
3232
- name: RELATED_IMAGE_KEYSTONE_OPERATOR_MANAGER_IMAGE_URL
33-
value: quay.io/dprince/keystone-operator@sha256:0fb05378bd695d26afb9cfb450a5cb60daee1096e60b5b30a4bde9de92210bf6
33+
value: quay.io/dprince/keystone-operator@sha256:d704c138a7911bcc82467545097fe78ac50705574c7442bbecb271baf39f75af
3434
- name: RELATED_IMAGE_MANILA_OPERATOR_MANAGER_IMAGE_URL
3535
value: quay.io/openstack-k8s-operators/manila-operator@sha256:18106f9073b9897f8f0c37e2f8b1c28e7b97e114b7900ef1352df2802dae9167
3636
- name: RELATED_IMAGE_MARIADB_OPERATOR_MANAGER_IMAGE_URL

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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_n)
129129
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d //allow-merging
130130

131-
replace github.com/openstack-k8s-operators/keystone-operator/api => github.com/dprince/keystone-operator/api v0.0.0-20250724220837-cb836ff1f1a6
131+
replace github.com/openstack-k8s-operators/keystone-operator/api => github.com/dprince/keystone-operator/api v0.0.0-20250812213004-077bfb1a26d8

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
88
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
99
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
1010
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
11-
github.com/dprince/keystone-operator/api v0.0.0-20250724220837-cb836ff1f1a6 h1:BOzQNig/ObI/afxBycZOYC2st/2zqNcyh9rUGJQhRTE=
12-
github.com/dprince/keystone-operator/api v0.0.0-20250724220837-cb836ff1f1a6/go.mod h1:0/8UQBzOyJYqHjarBfm2Rsw4xbQ8tywtKxSbTFbLbO0=
11+
github.com/dprince/keystone-operator/api v0.0.0-20250812213004-077bfb1a26d8 h1:3KXshCFjOn4RMfgaAmbNivfH/exV7dORcMAaymFlrYo=
12+
github.com/dprince/keystone-operator/api v0.0.0-20250812213004-077bfb1a26d8/go.mod h1:0/8UQBzOyJYqHjarBfm2Rsw4xbQ8tywtKxSbTFbLbO0=
1313
github.com/emicklei/go-restful/v3 v3.12.0 h1:y2DdzBAURM29NFF94q6RaY4vjIH1rtwDapwQtU84iWk=
1414
github.com/emicklei/go-restful/v3 v3.12.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
1515
github.com/evanphx/json-patch v5.7.0+incompatible h1:vgGkfT/9f8zE6tvSCe74nfpAVDQ2tG6yudJd8LBksgI=

‎hack/export_operator_related_images.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export RELATED_IMAGE_HEAT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-opera
88
export RELATED_IMAGE_HORIZON_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/horizon-operator@sha256:8a2be6c3d8f3fdf59a1d3bb0af2a1ecca14cea98a80f2cef5b8d2f880192e3b1
99
export RELATED_IMAGE_INFRA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/infra-operator@sha256:184cfbc907d6d682610fc0df36e4bdbb544e6c7cab6423b21260e3ebd3d56cf6
1010
export RELATED_IMAGE_IRONIC_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ironic-operator@sha256:3e4c20feb4e29a1a29966061f8b4a700bde3e646d8a1781dfb447003a23930cb
11-
export RELATED_IMAGE_KEYSTONE_OPERATOR_MANAGER_IMAGE_URL=quay.io/dprince/keystone-operator@sha256:0fb05378bd695d26afb9cfb450a5cb60daee1096e60b5b30a4bde9de92210bf6
11+
export RELATED_IMAGE_KEYSTONE_OPERATOR_MANAGER_IMAGE_URL=quay.io/dprince/keystone-operator@sha256:d704c138a7911bcc82467545097fe78ac50705574c7442bbecb271baf39f75af
1212
export RELATED_IMAGE_MANILA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/manila-operator@sha256:18106f9073b9897f8f0c37e2f8b1c28e7b97e114b7900ef1352df2802dae9167
1313
export RELATED_IMAGE_MARIADB_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/mariadb-operator@sha256:4d6902559b7f7854ae809fa855a05e5b7df26e7d453ac1dbde9731a67c560936
1414
export RELATED_IMAGE_NEUTRON_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/neutron-operator@sha256:f41b313f3c3731c76a28c944ceb5bfbd52ff6632c0234c722912d18afed56327

0 commit comments

Comments
 (0)