Cert fix

Author: dprince

bindata/operator/operator.yaml

@@ -68,6 +68,7 @@ spec:
     spec:
       containers:
       - args:
+        - --metrics-secure
         - --metrics-bind-address=:8443
         - --leader-elect
         - --health-probe-bind-address=:8081

bindata/rbac/glance-operator-rbac.yaml

@@ -383,8 +383,8 @@ metadata:
   namespace: '{{ .OperatorNamespace }}'
 spec:
   dnsNames:
-  - glance-operator-metrics-service.{{ .OperatorNamespace }}.svc
-  - glance-operator-metrics-service.{{ .OperatorNamespace }}.svc.cluster.local
+  - glance-operator-controller-manager-metrics-service.{{ .OperatorNamespace }}.svc
+  - glance-operator-controller-manager-metrics-service.{{ .OperatorNamespace }}.svc.cluster.local
   issuerRef:
     kind: Issuer
     name: glance-operator-selfsigned-issuer
@@ -409,15 +409,15 @@ spec:
       ca:
         secret:
           key: ca.crt
-          name: metrics-server-cert
+          name: glance-operator-metrics-server-cert
       cert:
         secret:
           key: tls.crt
-          name: metrics-server-cert
+          name: glance-operator-metrics-server-cert
       insecureSkipVerify: false
       keySecret:
         key: tls.key
-        name: metrics-server-cert
+        name: glance-operator-metrics-server-cert
       serverName: glance-operator-controller-manager-metrics-service.{{ .OperatorNamespace }}.svc
   selector:
     matchLabels:

bindata/rbac/test-operator-rbac.yaml

@@ -256,8 +256,8 @@ metadata:
   namespace: '{{ .OperatorNamespace }}'
 spec:
   dnsNames:
-  - test-operator-metrics-service.{{ .OperatorNamespace }}.svc
-  - test-operator-metrics-service.{{ .OperatorNamespace }}.svc.cluster.local
+  - test-operator-controller-manager-metrics-service.{{ .OperatorNamespace }}.svc
+  - test-operator-controller-manager-metrics-service.{{ .OperatorNamespace }}.svc.cluster.local
   issuerRef:
     kind: Issuer
     name: test-operator-selfsigned-issuer
@@ -282,15 +282,15 @@ spec:
       ca:
         secret:
           key: ca.crt
-          name: metrics-server-cert
+          name: test-operator-metrics-server-cert
       cert:
         secret:
           key: tls.crt
-          name: metrics-server-cert
+          name: test-operator-metrics-server-cert
       insecureSkipVerify: false
       keySecret:
         key: tls.key
-        name: metrics-server-cert
+        name: test-operator-metrics-server-cert
       serverName: test-operator-controller-manager-metrics-service.{{ .OperatorNamespace }}.svc
   selector:
     matchLabels:

config/default/manager_metrics_patch.yaml

@@ -2,3 +2,6 @@
 - op: add
   path: /spec/template/spec/containers/0/args/0
   value: --metrics-bind-address=:8443
+- op: add
+  path: /spec/template/spec/containers/0/args/0
+  value: --metrics-secure

config/manager/kustomization.yaml

@@ -1,2 +1,8 @@
 resources:
 - manager.yaml
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+images:
+- name: controller
+  newName: quay.io/openstack-k8s-operators/openstack-operator
+  newTag: latest

hack/sync-bindata.sh

@@ -332,8 +332,8 @@ metadata:
   namespace: '{{ .OperatorNamespace }}'
 spec:
   dnsNames:
-  - $OPERATOR_NAME-metrics-service.{{ .OperatorNamespace }}.svc
-  - $OPERATOR_NAME-metrics-service.{{ .OperatorNamespace }}.svc.cluster.local
+  - $OPERATOR_NAME-controller-manager-metrics-service.{{ .OperatorNamespace }}.svc
+  - $OPERATOR_NAME-controller-manager-metrics-service.{{ .OperatorNamespace }}.svc.cluster.local
   issuerRef:
     kind: Issuer
     name: $OPERATOR_NAME-selfsigned-issuer
@@ -358,15 +358,15 @@ spec:
       ca:
         secret:
           key: ca.crt
-          name: metrics-server-cert
+          name: $OPERATOR_NAME-metrics-server-cert
       cert:
         secret:
           key: tls.crt
-          name: metrics-server-cert
+          name: $OPERATOR_NAME-metrics-server-cert
       insecureSkipVerify: false
       keySecret:
         key: tls.key
-        name: metrics-server-cert
+        name: $OPERATOR_NAME-metrics-server-cert
       serverName: $OPERATOR_NAME-controller-manager-metrics-service.{{ .OperatorNamespace }}.svc
   selector:
     matchLabels: