Skip to content

Commit a71ecdc

Browse files
committed
Drop kube-rbac-proxy test
1 parent 50fbf47 commit a71ecdc

9 files changed

Lines changed: 8 additions & 58 deletions

File tree

apis/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,3 +116,5 @@ replace github.com/openshift/api => github.com/openshift/api v0.0.0-202408300231
116116

117117
// custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.9.0_patches_tag_n)
118118
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d //allow-merging
119+
120+
replace github.com/openstack-k8s-operators/keystone-operator/api => github.com/dprince/keystone-operator/api v0.0.0-20250819170957-57bfc86dc986

apis/go.sum

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ 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-20250819170957-57bfc86dc986 h1:Sa79JgbfhvypTANV6oVMLpZXw6nO4mpO6mvlOWU+6ZQ=
1112
github.com/emicklei/go-restful/v3 v3.12.0 h1:y2DdzBAURM29NFF94q6RaY4vjIH1rtwDapwQtU84iWk=
1213
github.com/emicklei/go-restful/v3 v3.12.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
1314
github.com/evanphx/json-patch v5.7.0+incompatible h1:vgGkfT/9f8zE6tvSCe74nfpAVDQ2tG6yudJd8LBksgI=
@@ -110,8 +111,6 @@ github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250813063935-f
110111
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250813063935-fdc20530dcf1/go.mod h1:Dv8qpmBIQy3Jv/EyQnOyc0w61X8vyfxpjcIQONP5CwY=
111112
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250815193050-feadf3472002 h1:B00JghiduA2ItmtptItSRYhCxysT0aIkDaWQyGRpUno=
112113
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250815193050-feadf3472002/go.mod h1:B6LsM/f4MHzgoEOH2lQrEPyG5F3gmbhz4IyaUOAgj2o=
113-
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250811083324-e790d63f389f h1:Ivo4YKaH26B1lQlwKcolELCRGtEbmvbfJShBTVrCdQI=
114-
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250811083324-e790d63f389f/go.mod h1:H5iZOohoVOmZvIZPR5ep6z+jmfrpz25axOM6IXlXzNU=
115114
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250730071847-837b07f8d72f h1:DW8aNjEtDFrWiZ6vWuOXwdRB4eBD0n+bA9foQkOEx6U=
116115
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250730071847-837b07f8d72f/go.mod h1:P+7F1wiwZUxOy4myYXFyc/uBtGATDFpk3yAllXe1Vzk=
117116
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20250730071847-837b07f8d72f h1:nGYLHcpM7EjiSzN4bmiLZbxty9u0k0Qzvkqn+1s1TF0=

bindata/operator/managers.yaml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -61,26 +61,6 @@ spec:
6161
name: cert
6262
readOnly: true
6363
{{- end }}
64-
- args:
65-
- --secure-listen-address=0.0.0.0:8443
66-
- --upstream=http://127.0.0.1:8080/
67-
- --logtostderr=true
68-
- --v=0
69-
image: {{ .Deployment.KubeRbacProxy.Image }}
70-
name: kube-rbac-proxy
71-
ports:
72-
- containerPort: 8443
73-
name: https
74-
protocol: TCP
75-
resources:
76-
limits:
77-
cpu: {{ .Deployment.KubeRbacProxy.Resources.Limits.CPU }}
78-
memory: {{ .Deployment.KubeRbacProxy.Resources.Limits.Memory }}
79-
requests:
80-
cpu: {{ .Deployment.KubeRbacProxy.Resources.Requests.CPU }}
81-
memory: {{ .Deployment.KubeRbacProxy.Resources.Requests.Memory }}
82-
securityContext:
83-
allowPrivilegeEscalation: false
8464
securityContext:
8565
runAsNonRoot: true
8666
serviceAccountName: {{ .Name }}-operator-controller-manager

bindata/rbac/keystone-operator-rbac.yaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -345,18 +345,6 @@ rules:
345345
- list
346346
- update
347347
- watch
348-
- apiGroups:
349-
- authentication.k8s.io
350-
resources:
351-
- tokenreviews
352-
verbs:
353-
- create
354-
- apiGroups:
355-
- authorization.k8s.io
356-
resources:
357-
- subjectaccessreviews
358-
verbs:
359-
- create
360348
---
361349
apiVersion: rbac.authorization.k8s.io/v1
362350
kind: RoleBinding

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:747406033b6d0f33f9131730817bcbaa4f93e4f56ed98018840f0e2bb857bbbb
3232
- name: RELATED_IMAGE_KEYSTONE_OPERATOR_MANAGER_IMAGE_URL
33-
value: quay.io/openstack-k8s-operators/keystone-operator@sha256:b96007ee1ab496ffb9b6ee478b6b68c62e80a216b98a2ac1d65b09504016712d
33+
value: quay.io/dprince/keystone-operator@sha256:43997abac58f79b92bf4139ed9121d9c44fa81d13ee80142c7040fe1b7f86636
3434
- name: RELATED_IMAGE_MANILA_OPERATOR_MANAGER_IMAGE_URL
3535
value: quay.io/openstack-k8s-operators/manila-operator@sha256:72c7403d2e2bda84655d89c80528e8c06797905ccd7ef09761aaf4bae782757f
3636
- name: RELATED_IMAGE_MARIADB_OPERATOR_MANAGER_IMAGE_URL

config/operator/managers.yaml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -61,26 +61,6 @@ spec:
6161
name: cert
6262
readOnly: true
6363
{{- end }}
64-
- args:
65-
- --secure-listen-address=0.0.0.0:8443
66-
- --upstream=http://127.0.0.1:8080/
67-
- --logtostderr=true
68-
- --v=0
69-
image: {{ .Deployment.KubeRbacProxy.Image }}
70-
name: kube-rbac-proxy
71-
ports:
72-
- containerPort: 8443
73-
name: https
74-
protocol: TCP
75-
resources:
76-
limits:
77-
cpu: {{ .Deployment.KubeRbacProxy.Resources.Limits.CPU }}
78-
memory: {{ .Deployment.KubeRbacProxy.Resources.Limits.Memory }}
79-
requests:
80-
cpu: {{ .Deployment.KubeRbacProxy.Resources.Requests.CPU }}
81-
memory: {{ .Deployment.KubeRbacProxy.Resources.Requests.Memory }}
82-
securityContext:
83-
allowPrivilegeEscalation: false
8464
securityContext:
8565
runAsNonRoot: true
8666
serviceAccountName: {{ .Name }}-operator-controller-manager

go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,3 +128,5 @@ replace github.com/openshift/api => github.com/openshift/api v0.0.0-202408300231
128128

129129
// custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.9.0_patches_tag_n)
130130
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d //allow-merging
131+
132+
replace github.com/openstack-k8s-operators/keystone-operator/api => github.com/dprince/keystone-operator/api v0.0.0-20250819170957-57bfc86dc986

go.sum

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ 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-20250819170957-57bfc86dc986 h1:Sa79JgbfhvypTANV6oVMLpZXw6nO4mpO6mvlOWU+6ZQ=
1112
github.com/emicklei/go-restful/v3 v3.12.0 h1:y2DdzBAURM29NFF94q6RaY4vjIH1rtwDapwQtU84iWk=
1213
github.com/emicklei/go-restful/v3 v3.12.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
1314
github.com/evanphx/json-patch v5.7.0+incompatible h1:vgGkfT/9f8zE6tvSCe74nfpAVDQ2tG6yudJd8LBksgI=
@@ -114,8 +115,6 @@ github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250813063935-f
114115
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250813063935-fdc20530dcf1/go.mod h1:Dv8qpmBIQy3Jv/EyQnOyc0w61X8vyfxpjcIQONP5CwY=
115116
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250815193050-feadf3472002 h1:B00JghiduA2ItmtptItSRYhCxysT0aIkDaWQyGRpUno=
116117
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250815193050-feadf3472002/go.mod h1:B6LsM/f4MHzgoEOH2lQrEPyG5F3gmbhz4IyaUOAgj2o=
117-
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250811083324-e790d63f389f h1:Ivo4YKaH26B1lQlwKcolELCRGtEbmvbfJShBTVrCdQI=
118-
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250811083324-e790d63f389f/go.mod h1:H5iZOohoVOmZvIZPR5ep6z+jmfrpz25axOM6IXlXzNU=
119118
github.com/openstack-k8s-operators/lib-common/modules/ansible v0.6.1-0.20250730071847-837b07f8d72f h1:7w9WseH9LSKnLX3UW1AfWPaozN7fimdVoUtOYHnsQKY=
120119
github.com/openstack-k8s-operators/lib-common/modules/ansible v0.6.1-0.20250730071847-837b07f8d72f/go.mod h1:0bajRHochTUT6Ecfriw27l3vL0yezVrnUmt3bcIpu4w=
121120
github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.6.1-0.20250730071847-837b07f8d72f h1:1T8716FlCs3wokHLL6jo7iYuMZfEdtTghvdFIjkmJhE=

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:8a0327a5b60b92c073eecc29e7eaac9b6f96311367edbba1352a15279fbac651
99
export RELATED_IMAGE_INFRA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/infra-operator@sha256:a3919b630e49d4c1f9d496fa2a91129587729c4df8a0a643e665bba5618c3f0c
1010
export RELATED_IMAGE_IRONIC_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ironic-operator@sha256:747406033b6d0f33f9131730817bcbaa4f93e4f56ed98018840f0e2bb857bbbb
11-
export RELATED_IMAGE_KEYSTONE_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/keystone-operator@sha256:b96007ee1ab496ffb9b6ee478b6b68c62e80a216b98a2ac1d65b09504016712d
11+
export RELATED_IMAGE_KEYSTONE_OPERATOR_MANAGER_IMAGE_URL=quay.io/dprince/keystone-operator@sha256:43997abac58f79b92bf4139ed9121d9c44fa81d13ee80142c7040fe1b7f86636
1212
export RELATED_IMAGE_MANILA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/manila-operator@sha256:72c7403d2e2bda84655d89c80528e8c06797905ccd7ef09761aaf4bae782757f
1313
export RELATED_IMAGE_MARIADB_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/mariadb-operator@sha256:dbf1c9e07038ee1e6b2e4b992fa2dcf7a1aa4f269258268c805696818d9064aa
1414
export RELATED_IMAGE_NEUTRON_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/neutron-operator@sha256:4001ff44245991e72fe93324192517df0258a9e6830ea37921600d863a3957f7

0 commit comments

Comments
 (0)