chore(deploy): regen /manifests

Author: ecordell

Makefile

@@ -103,7 +103,7 @@ container:
 
 clean-e2e:
 	kubectl delete crds --all
-	kubectl delete apiservices.apiregistration.k8s.io v1alpha1.packages.apps.redhat.com || true
+	kubectl delete apiservices.apiregistration.k8s.io v1.packages.operators.coreos.com || true
 	kubectl delete -f test/e2e/resources/0000_50_olm_00-namespace.yaml
 
 clean:

deploy/chart/templates/0000_50_olm_08-catalog-operator.deployment.yaml

@@ -62,6 +62,11 @@ spec:
             httpGet:
               path: /healthz
               port: {{ .Values.catalog.service.internalPort }}
+          env:
+          {{ if and .Values.installType (eq .Values.installType "ocp") }}
+          - name: RELEASE_VERSION
+            value: "0.0.1-snapshot"
+          {{ end }}
           {{- if .Values.catalog.resources }}
           resources:
 {{ toYaml .Values.catalog.resources | indent 12 }}

deploy/chart/templates/image-references

@@ -10,5 +10,5 @@ spec:
   - name: operator-registry
     from:
       kind: DockerImage
-      name: quay.io/operatorframework/configmap-operator-registry:latest
+      name: quay.io/operator-framework/configmap-operator-registry:latest
 {{- end }}

manifests/0000_50_olm_00-namespace.yaml

@@ -2,12 +2,17 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: openshift-operator-lifecycle-manager
+  
   labels:
     openshift.io/run-level: "1"
+    openshift.io/cluster-monitoring: "true"
+  
 ---
 apiVersion: v1
 kind: Namespace
 metadata:
   name: openshift-operators
+  
   labels:
     openshift.io/run-level: "1"
+  

manifests/0000_50_olm_02-services.yaml

@@ -0,0 +1,39 @@
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: olm-operator-metrics
+  namespace: openshift-operator-lifecycle-manager
+  annotations:
+    service.alpha.openshift.io/serving-cert-secret-name: olm-operator-serving-cert
+  labels:
+    app: olm-operator
+spec:
+  type: ClusterIP
+  ports:
+  - name: https-metrics
+    port: 8081
+    protocol: TCP
+    targetPort: metrics
+  selector:
+    app: olm-operator
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: catalog-operator-metrics
+  namespace: openshift-operator-lifecycle-manager
+  annotations:
+    service.alpha.openshift.io/serving-cert-secret-name: catalog-operator-serving-cert
+  labels:
+    app: catalog-operator
+spec:
+  type: ClusterIP
+  ports:
+  - name: https-metrics
+    port: 8081
+    protocol: TCP
+    targetPort: metrics
+  selector:
+    app: catalog-operator
+

manifests/0000_50_olm_02-clusterserviceversion.crd.yaml renamed to manifests/0000_50_olm_03-clusterserviceversion.crd.yaml

@@ -25,10 +25,17 @@ spec:
           args:
           - -writeStatusName
           - operator-lifecycle-manager
+          - -tls-cert
+          - /var/run/secrets/serving-cert/tls.crt
+          - -tls-key
+          - /var/run/secrets/serving-cert/tls.key
           image: quay.io/operator-framework/olm@sha256:4b7dec341fc754fdd2c8784ca7d81747ebbb2b87866b9e61ebbebc8c5614cfdc
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080
+            - containerPort: 8081
+              name: metrics
+              protocol: TCP
           livenessProbe:
             httpGet:
               path: /healthz
@@ -48,6 +55,18 @@ spec:
                 fieldPath: metadata.namespace
           - name: OPERATOR_NAME
             value: olm-operator
+          
+          volumeMounts:
+          - mountPath: /var/run/secrets/serving-cert
+            name: serving-cert
+          
+      
+      volumes:
+      - name: serving-cert
+        secret:
+          secretName: olm-operator-serving-cert
+          optional: true
+      
       nodeSelector:
         beta.kubernetes.io/os: linux
         node-role.kubernetes.io/master: ""