catalog: use service serving cert for ctrl mgr & use default prometheus scrape

roles/openshift_prometheus/templates/prometheus.yml.j2

@@ -241,25 +241,6 @@ scrape_configs:
     action: keep
     regex: apiserver;https
 
-# Scrape config for Service Catalog controllers
-- job_name: 'catalog-controllers'
-  scheme: https
-  tls_config:
-    server_name: 'controller-manager.kube-service-catalog'
-    ca_file: /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt
-  bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
-
-  kubernetes_sd_configs:
-  - role: endpoints
-    namespaces:
-      names:
-      - kube-service-catalog
-
-  relabel_configs:
-  - source_labels: [__meta_kubernetes_service_name]
-    action: keep
-    regex: controller-manager
-
 alerting:
   alertmanagers:
   - scheme: http

roles/openshift_service_catalog/tasks/generate_certs.yml

@@ -26,16 +26,6 @@
     path: "{{ generated_certs_dir }}/apiserver.key"
     state: absent
 
-- name: Delete old controllermanager.crt
-  file:
-    path: "{{ generated_certs_dir }}/controllermanager.crt"
-    state: absent
-
-- name: Delete old controllermanager.key
-  file:
-    path: "{{ generated_certs_dir }}/controllermanager.key"
-    state: absent
-
 - name: Generating API Server keys
   oc_adm_ca_server_cert:
     cert: "{{ generated_certs_dir }}/apiserver.crt"
@@ -45,15 +35,6 @@
     signer_key: "{{ generated_certs_dir }}/ca.key"
     signer_serial: "{{ generated_certs_dir }}/apiserver.serial.txt"
 
-- name: Generating Controller Manager keys
-  oc_adm_ca_server_cert:
-    cert: "{{ generated_certs_dir }}/controllermanager.crt"
-    key: "{{ generated_certs_dir }}/controllermanager.key"
-    hostnames: "controller-manager.kube-service-catalog.svc,controller-manager.kube-service-catalog.svc.cluster.local,controller-manager.kube-service-catalog"
-    signer_cert: "{{ generated_certs_dir }}/ca.crt"
-    signer_key: "{{ generated_certs_dir }}/ca.key"
-    signer_serial: "{{ generated_certs_dir }}/apiserver.serial.txt"
-
 - name: Create apiserver-ssl secret
   oc_secret:
     state: present
@@ -65,17 +46,6 @@
     - name: tls.key
       path: "{{ generated_certs_dir }}/apiserver.key"
 
-- name: Create controllermanager-ssl secret
-  oc_secret:
-    state: present
-    name: controllermanager-ssl
-    namespace: kube-service-catalog
-    files:
-    - name: tls.crt
-      path: "{{ generated_certs_dir }}/controllermanager.crt"
-    - name: tls.key
-      path: "{{ generated_certs_dir }}/controllermanager.key"
-
 - slurp:
     src: "{{ generated_certs_dir }}/ca.crt"
   register: apiserver_ca

roles/openshift_service_catalog/tasks/install.yml

@@ -187,6 +187,10 @@
     name: controller-manager
     namespace: kube-service-catalog
     state: present
+    annotations:
+      service.alpha.openshift.io/serving-cert-secret-name: controllermanager-ssl
+      prometheus.io/scrape: "true"
+      prometheus.io/scheme: https
     ports:
     - name: secure
       port: 443