Skip to content

Commit aeb9162

Browse files
dprincedprince
committed
Test operator_sdk 1.41.1
1 parent 96f2ca9 commit aeb9162

36 files changed

Lines changed: 923 additions & 91 deletions

‎apis/go.mod‎

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

146146
replace github.com/cert-manager/cmctl/v2 => github.com/cert-manager/cmctl/v2 v2.1.2-0.20241127223932-88edb96860cf //allow-merging
147+
148+
replace github.com/openstack-k8s-operators/glance-operator/api => github.com/dprince/glance-operator/api v0.0.0-20251022205722-046a560f2a6b

‎apis/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
1010
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1111
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
1212
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
13+
github.com/dprince/glance-operator/api v0.0.0-20251022205722-046a560f2a6b h1:E0Ai//LqvAMJsjTeqT92x1AfBKlFFgaSlH6vQ2K3608=
14+
github.com/dprince/glance-operator/api v0.0.0-20251022205722-046a560f2a6b/go.mod h1:fK1M/vQi/TxrZmQvRxgIj998sPHo/v0zC0YUgJ25fU0=
1315
github.com/emicklei/go-restful/v3 v3.12.2 h1:DhwDP0vY3k8ZzE0RunuJy8GhNpPL6zqLkDf9B/a0/xU=
1416
github.com/emicklei/go-restful/v3 v3.12.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
1517
github.com/evanphx/json-patch v5.9.11+incompatible h1:ixHHqfcGvxhWkniF1tWxBHA0yb4Z+d1UQi45df52xW8=
@@ -120,8 +122,6 @@ github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20251014173752-e
120122
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20251014173752-ea967e56a392/go.mod h1:HIDWCoybpcyE2/wacsucEm+1dfo5d+Wr6TAQ3+vOaQc=
121123
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20251022085840-31cb063eeb8a h1:To9zRB8ilQEwkKZ8MXLe5+zaVXail+bjknMVLo3F09Y=
122124
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20251022085840-31cb063eeb8a/go.mod h1:8R9RYAjEwq+WrgKS558pvMa1Zt5WkAOQEJChloFOKzY=
123-
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20251022111742-64b4039d28a7 h1:rnR6Qq+R6V/7ZF+50fsSYcSD8SMRgQdiqdT+w2mfThM=
124-
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20251022111742-64b4039d28a7/go.mod h1:fK1M/vQi/TxrZmQvRxgIj998sPHo/v0zC0YUgJ25fU0=
125125
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20251025092254-de6e9a251638 h1:5Cj3+iee4jhV/WvrPysevisQlTIgmOdREn1mt7JHrw4=
126126
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20251025092254-de6e9a251638/go.mod h1:/o8HTAMKnnrETQvJCBXP90yb7kkm0tdfYqp6HUI8Ji0=
127127
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20251025090908-00fab1da8f24 h1:jexX3KB+ZiO8h2oF3zzTWA3epgRI6HWoizRA0G/V10g=

‎bindata/crds/glance.openstack.org_glanceapis.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
65
controller-gen.kubebuilder.io/version: v0.18.0
76
creationTimestamp: null
87
name: glanceapis.glance.openstack.org

‎bindata/crds/glance.openstack.org_glances.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
65
controller-gen.kubebuilder.io/version: v0.18.0
76
creationTimestamp: null
87
name: glances.glance.openstack.org

‎bindata/operator/infra-operator-webhooks.yaml‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
protocol: TCP
1717
targetPort: 9443
1818
selector:
19-
openstack.org/operator-name: infra
19+
openstack.org/operator-name: infra openstack.org/operator-name: infra
2020
---
2121
apiVersion: cert-manager.io/v1
2222
kind: Certificate
@@ -39,21 +39,6 @@ spec:
3939
name: infra-operator-selfsigned-issuer
4040
secretName: infra-operator-webhook-server-cert
4141
---
42-
apiVersion: cert-manager.io/v1
43-
kind: Issuer
44-
metadata:
45-
labels:
46-
app.kubernetes.io/component: certificate
47-
app.kubernetes.io/created-by: openstack-operator
48-
app.kubernetes.io/instance: selfsigned-issuer
49-
app.kubernetes.io/managed-by: kustomize
50-
app.kubernetes.io/name: issuer
51-
app.kubernetes.io/part-of: infra-operator
52-
name: infra-operator-selfsigned-issuer
53-
namespace: '{{ .OperatorNamespace }}'
54-
spec:
55-
selfSigned: {}
56-
---
5742
apiVersion: admissionregistration.k8s.io/v1
5843
kind: MutatingWebhookConfiguration
5944
metadata:

‎bindata/operator/managers.yaml‎

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,15 @@ spec:
2222
spec:
2323
containers:
2424
- args:
25+
- --leader-elect
2526
- --health-probe-bind-address=:8081
27+
{{- if isEnvVarTrue .Deployment.Manager.Env "METRICS_CERTS" }}
28+
- --metrics-bind-address=:8443
29+
- --metrics-cert-path=/tmp/k8s-metrics-server/metrics-certs
30+
- --webhook-cert-path=/tmp/k8s-webhook-server/serving-certs
31+
{{- else }}
2632
- --metrics-bind-address=127.0.0.1:8080
27-
- --leader-elect
33+
{{- end }}
2834
command:
2935
- /manager
3036
env:
@@ -55,12 +61,18 @@ spec:
5561
memory: {{ .Deployment.Manager.Resources.Requests.Memory }}
5662
securityContext:
5763
allowPrivilegeEscalation: false
58-
{{- if isEnvVarTrue .Deployment.Manager.Env "ENABLE_WEBHOOKS" }}
5964
volumeMounts:
65+
{{- if isEnvVarTrue .Deployment.Manager.Env "ENABLE_WEBHOOKS" }}
6066
- mountPath: /tmp/k8s-webhook-server/serving-certs
6167
name: cert
6268
readOnly: true
6369
{{- end }}
70+
{{- if isEnvVarTrue .Deployment.Manager.Env "METRICS_CERTS" }}
71+
- mountPath: /tmp/k8s-metrics-server/metrics-certs
72+
name: metrics-certs
73+
readOnly: true
74+
{{- end }}
75+
{{- if isEnvVarFalse .Deployment.Manager.Env "METRICS_CERTS" }}
6476
- args:
6577
- --secure-listen-address=0.0.0.0:8443
6678
- --upstream=http://127.0.0.1:8080/
@@ -81,6 +93,7 @@ spec:
8193
memory: {{ .Deployment.KubeRbacProxy.Resources.Requests.Memory }}
8294
securityContext:
8395
allowPrivilegeEscalation: false
96+
{{- end }}
8497
securityContext:
8598
runAsNonRoot: true
8699
serviceAccountName: {{ .Name }}-operator-controller-manager
@@ -101,12 +114,28 @@ spec:
101114
tolerationSeconds: {{ .TolerationSeconds }}
102115
{{- end }}
103116
{{- end }}
104-
{{- if isEnvVarTrue .Deployment.Manager.Env "ENABLE_WEBHOOKS" }}
105117
volumes:
118+
{{- if isEnvVarTrue .Deployment.Manager.Env "ENABLE_WEBHOOKS" }}
106119
- name: cert
107120
secret:
108121
defaultMode: 420
109122
secretName: {{ .Name }}-operator-webhook-server-cert
110123
{{ end }}
124+
{{- if isEnvVarTrue .Deployment.Manager.Env "METRICS_CERTS" }}
125+
- name: metrics-certs
126+
secret:
127+
items:
128+
- key: ca.crt
129+
path: ca.crt
130+
- key: tls.crt
131+
path: tls.crt
132+
- key: tls.key
133+
path: tls.key
134+
optional: false
135+
- name: cert
136+
secret:
137+
defaultMode: 420
138+
secretName: {{ .Name }}-operator-metrics-server-cert
139+
{{ end }}
111140
---
112141
{{ end }}

‎bindata/operator/openstack-baremetal-operator-webhooks.yaml‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
protocol: TCP
1717
targetPort: 9443
1818
selector:
19-
openstack.org/operator-name: openstack-baremetal
19+
openstack.org/operator-name: openstack-baremetal openstack.org/operator-name: openstack-baremetal
2020
---
2121
apiVersion: cert-manager.io/v1
2222
kind: Certificate
@@ -39,21 +39,6 @@ spec:
3939
name: openstack-baremetal-operator-selfsigned-issuer
4040
secretName: openstack-baremetal-operator-webhook-server-cert
4141
---
42-
apiVersion: cert-manager.io/v1
43-
kind: Issuer
44-
metadata:
45-
labels:
46-
app.kubernetes.io/component: certificate
47-
app.kubernetes.io/created-by: openstack-operator
48-
app.kubernetes.io/instance: selfsigned-issuer
49-
app.kubernetes.io/managed-by: kustomize
50-
app.kubernetes.io/name: issuer
51-
app.kubernetes.io/part-of: openstack-baremetal-operator
52-
name: openstack-baremetal-operator-selfsigned-issuer
53-
namespace: '{{ .OperatorNamespace }}'
54-
spec:
55-
selfSigned: {}
56-
---
5742
apiVersion: admissionregistration.k8s.io/v1
5843
kind: MutatingWebhookConfiguration
5944
metadata:

‎bindata/rbac/barbican-operator-rbac.yaml‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# NOTE: this file is automatically generated by hack/sync-bindata.sh!
22
#
3+
---
4+
apiVersion: cert-manager.io/v1
5+
kind: Issuer
6+
metadata:
7+
labels:
8+
app.kubernetes.io/component: certificate
9+
app.kubernetes.io/created-by: openstack-operator
10+
app.kubernetes.io/instance: selfsigned-issuer
11+
app.kubernetes.io/managed-by: kustomize
12+
app.kubernetes.io/name: issuer
13+
app.kubernetes.io/part-of: barbican-operator
14+
name: barbican-operator-selfsigned-issuer
15+
namespace: '{{ .OperatorNamespace }}'
16+
spec:
17+
selfSigned: {}
18+
---
319
apiVersion: v1
420
kind: ServiceAccount
521
metadata:
@@ -290,6 +306,7 @@ spec:
290306
- name: https
291307
port: 8443
292308
protocol: TCP
293-
targetPort: https
309+
targetPort: 8443
294310
selector:
295311
openstack.org/operator-name: barbican
312+
control-plane: controller-manager

‎bindata/rbac/cinder-operator-rbac.yaml‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# NOTE: this file is automatically generated by hack/sync-bindata.sh!
22
#
3+
---
4+
apiVersion: cert-manager.io/v1
5+
kind: Issuer
6+
metadata:
7+
labels:
8+
app.kubernetes.io/component: certificate
9+
app.kubernetes.io/created-by: openstack-operator
10+
app.kubernetes.io/instance: selfsigned-issuer
11+
app.kubernetes.io/managed-by: kustomize
12+
app.kubernetes.io/name: issuer
13+
app.kubernetes.io/part-of: cinder-operator
14+
name: cinder-operator-selfsigned-issuer
15+
namespace: '{{ .OperatorNamespace }}'
16+
spec:
17+
selfSigned: {}
18+
---
319
apiVersion: v1
420
kind: ServiceAccount
521
metadata:
@@ -303,6 +319,7 @@ spec:
303319
- name: https
304320
port: 8443
305321
protocol: TCP
306-
targetPort: https
322+
targetPort: 8443
307323
selector:
308324
openstack.org/operator-name: cinder
325+
control-plane: controller-manager

‎bindata/rbac/designate-operator-rbac.yaml‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# NOTE: this file is automatically generated by hack/sync-bindata.sh!
22
#
3+
---
4+
apiVersion: cert-manager.io/v1
5+
kind: Issuer
6+
metadata:
7+
labels:
8+
app.kubernetes.io/component: certificate
9+
app.kubernetes.io/created-by: openstack-operator
10+
app.kubernetes.io/instance: selfsigned-issuer
11+
app.kubernetes.io/managed-by: kustomize
12+
app.kubernetes.io/name: issuer
13+
app.kubernetes.io/part-of: designate-operator
14+
name: designate-operator-selfsigned-issuer
15+
namespace: '{{ .OperatorNamespace }}'
16+
spec:
17+
selfSigned: {}
18+
---
319
apiVersion: v1
420
kind: ServiceAccount
521
metadata:
@@ -337,6 +353,7 @@ spec:
337353
- name: https
338354
port: 8443
339355
protocol: TCP
340-
targetPort: https
356+
targetPort: 8443
341357
selector:
342358
openstack.org/operator-name: designate
359+
control-plane: controller-manager

0 commit comments

Comments
 (0)