Skip to content

Commit 2909edf

Browse files
committed
Cert fix
1 parent 669f965 commit 2909edf

4 files changed

Lines changed: 21 additions & 15 deletions

File tree

bindata/rbac/glance-operator-rbac.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -383,8 +383,8 @@ metadata:
383383
namespace: '{{ .OperatorNamespace }}'
384384
spec:
385385
dnsNames:
386-
- glance-operator-metrics-service.{{ .OperatorNamespace }}.svc
387-
- glance-operator-metrics-service.{{ .OperatorNamespace }}.svc.cluster.local
386+
- glance-operator-controller-manager-metrics-service.{{ .OperatorNamespace }}.svc
387+
- glance-operator-controller-manager-metrics-service.{{ .OperatorNamespace }}.svc.cluster.local
388388
issuerRef:
389389
kind: Issuer
390390
name: glance-operator-selfsigned-issuer
@@ -409,15 +409,15 @@ spec:
409409
ca:
410410
secret:
411411
key: ca.crt
412-
name: metrics-server-cert
412+
name: glance-operator-metrics-server-cert
413413
cert:
414414
secret:
415415
key: tls.crt
416-
name: metrics-server-cert
416+
name: glance-operator-metrics-server-cert
417417
insecureSkipVerify: false
418418
keySecret:
419419
key: tls.key
420-
name: metrics-server-cert
420+
name: glance-operator-metrics-server-cert
421421
serverName: glance-operator-controller-manager-metrics-service.{{ .OperatorNamespace }}.svc
422422
selector:
423423
matchLabels:

bindata/rbac/test-operator-rbac.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,8 @@ metadata:
256256
namespace: '{{ .OperatorNamespace }}'
257257
spec:
258258
dnsNames:
259-
- test-operator-metrics-service.{{ .OperatorNamespace }}.svc
260-
- test-operator-metrics-service.{{ .OperatorNamespace }}.svc.cluster.local
259+
- test-operator-controller-manager-metrics-service.{{ .OperatorNamespace }}.svc
260+
- test-operator-controller-manager-metrics-service.{{ .OperatorNamespace }}.svc.cluster.local
261261
issuerRef:
262262
kind: Issuer
263263
name: test-operator-selfsigned-issuer
@@ -282,15 +282,15 @@ spec:
282282
ca:
283283
secret:
284284
key: ca.crt
285-
name: metrics-server-cert
285+
name: test-operator-metrics-server-cert
286286
cert:
287287
secret:
288288
key: tls.crt
289-
name: metrics-server-cert
289+
name: test-operator-metrics-server-cert
290290
insecureSkipVerify: false
291291
keySecret:
292292
key: tls.key
293-
name: metrics-server-cert
293+
name: test-operator-metrics-server-cert
294294
serverName: test-operator-controller-manager-metrics-service.{{ .OperatorNamespace }}.svc
295295
selector:
296296
matchLabels:

config/manager/kustomization.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
11
resources:
22
- manager.yaml
3+
apiVersion: kustomize.config.k8s.io/v1beta1
4+
kind: Kustomization
5+
images:
6+
- name: controller
7+
newName: quay.io/openstack-k8s-operators/openstack-operator
8+
newTag: latest

hack/sync-bindata.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -332,8 +332,8 @@ metadata:
332332
namespace: '{{ .OperatorNamespace }}'
333333
spec:
334334
dnsNames:
335-
- $OPERATOR_NAME-metrics-service.{{ .OperatorNamespace }}.svc
336-
- $OPERATOR_NAME-metrics-service.{{ .OperatorNamespace }}.svc.cluster.local
335+
- $OPERATOR_NAME-controller-manager-metrics-service.{{ .OperatorNamespace }}.svc
336+
- $OPERATOR_NAME-controller-manager-metrics-service.{{ .OperatorNamespace }}.svc.cluster.local
337337
issuerRef:
338338
kind: Issuer
339339
name: $OPERATOR_NAME-selfsigned-issuer
@@ -358,15 +358,15 @@ spec:
358358
ca:
359359
secret:
360360
key: ca.crt
361-
name: metrics-server-cert
361+
name: $OPERATOR_NAME-metrics-server-cert
362362
cert:
363363
secret:
364364
key: tls.crt
365-
name: metrics-server-cert
365+
name: $OPERATOR_NAME-metrics-server-cert
366366
insecureSkipVerify: false
367367
keySecret:
368368
key: tls.key
369-
name: metrics-server-cert
369+
name: $OPERATOR_NAME-metrics-server-cert
370370
serverName: $OPERATOR_NAME-controller-manager-metrics-service.{{ .OperatorNamespace }}.svc
371371
selector:
372372
matchLabels:

0 commit comments

Comments
 (0)