Merge pull request #1228 from benluddy/helm-template-v3

Update release script to require version 3 of helm.

Author: openshift-merge-robot

manifests/0000_50_olm_00-namespace.yaml

@@ -1,22 +1,20 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: openshift-operator-lifecycle-manager
+  name: openshift-operators
 
   annotations:
     openshift.io/node-selector: ""
   labels:
     openshift.io/run-level: "1"
-    openshift.io/cluster-monitoring: "true"
-  
 ---
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: openshift-operators
+  name: openshift-operator-lifecycle-manager
 
   annotations:
     openshift.io/node-selector: ""
   labels:
     openshift.io/run-level: "1"
-  
+    openshift.io/cluster-monitoring: "true"

manifests/0000_50_olm_01-olm-operator.serviceaccount.yaml

@@ -1,3 +1,9 @@
+kind: ServiceAccount
+apiVersion: v1
+metadata:
+  name: olm-operator-serviceaccount
+  namespace: openshift-operator-lifecycle-manager
+---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -9,12 +15,6 @@ rules:
 - nonResourceURLs: ["*"]
   verbs: ["*"]
 ---
-kind: ServiceAccount
-apiVersion: v1
-metadata:
-  name: olm-operator-serviceaccount
-  namespace: openshift-operator-lifecycle-manager
----
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:

manifests/0000_50_olm_02-services.yaml

@@ -1,4 +1,3 @@
-
 apiVersion: v1
 kind: Service
 metadata:
@@ -36,4 +35,3 @@ spec:
     targetPort: metrics
   selector:
     app: catalog-operator
-

manifests/0000_50_olm_03-clusterserviceversion.crd.yaml

@@ -42,7 +42,6 @@ spec:
   scope: Namespaced
   preserveUnknownFields: false
   subresources:
-    # status enables the status subresource.
     status: {}
   validation:
     openAPIV3Schema:
@@ -824,7 +823,6 @@ spec:
                                     description: 'Standard object''s metadata. More
                                       info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata'
                                     type: object
-                                    # TODO: Autogen this...
                                     x-kubernetes-preserve-unknown-fields: true
                                   spec:
                                     description: 'Specification of the desired behavior

manifests/0000_50_olm_07-olm-operator.deployment.yaml

@@ -65,7 +65,6 @@ spec:
             requests:
               cpu: 10m
               memory: 160Mi
-            
 
           volumeMounts:
           - mountPath: /var/run/secrets/serving-cert
@@ -80,7 +79,6 @@ spec:
       nodeSelector:
         beta.kubernetes.io/os: linux
         node-role.kubernetes.io/master: ""
-        
       tolerations:
       - effect: NoSchedule
         key: node-role.kubernetes.io/master
@@ -93,4 +91,3 @@ spec:
         key: node.kubernetes.io/not-ready
         operator: Exists
         tolerationSeconds: 120
-      

manifests/0000_50_olm_08-catalog-operator.deployment.yaml

@@ -58,7 +58,6 @@ spec:
             requests:
               cpu: 10m
               memory: 80Mi
-            
 
           volumeMounts:
           - mountPath: /var/run/secrets/serving-cert
@@ -73,7 +72,6 @@ spec:
       nodeSelector:
         beta.kubernetes.io/os: linux
         node-role.kubernetes.io/master: ""
-        
       tolerations:
       - effect: NoSchedule
         key: node-role.kubernetes.io/master
@@ -86,4 +84,3 @@ spec:
         key: node.kubernetes.io/not-ready
         operator: Exists
         tolerationSeconds: 120
-      

manifests/0000_50_olm_09-aggregated.clusterrole.yaml

@@ -1,32 +1,32 @@
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: aggregate-olm-edit
+  name: aggregate-olm-view
   labels:
-    # Add these permissions to the "admin" and "edit" default roles.
+    # Add these permissions to the "admin", "edit" and "view" default roles
     rbac.authorization.k8s.io/aggregate-to-admin: "true"
     rbac.authorization.k8s.io/aggregate-to-edit: "true"
+    rbac.authorization.k8s.io/aggregate-to-view: "true"
 rules:
 - apiGroups: ["operators.coreos.com"]
-  resources: ["subscriptions"]
-  verbs: ["create", "update", "patch", "delete"]
-- apiGroups: ["operators.coreos.com"]
-  resources: ["clusterserviceversions", "catalogsources", "installplans", "subscriptions"]
-  verbs: ["delete"]
+  resources: ["clusterserviceversions", "catalogsources", "installplans", "subscriptions", "operatorgroups"]
+  verbs: ["get", "list", "watch"]
+- apiGroups: ["packages.operators.coreos.com"]
+  resources: ["packagemanifests", "packagemanifests/icon"]
+  verbs: ["get", "list", "watch"]
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: aggregate-olm-view
+  name: aggregate-olm-edit
   labels:
-    # Add these permissions to the "admin", "edit" and "view" default roles
+    # Add these permissions to the "admin" and "edit" default roles.
     rbac.authorization.k8s.io/aggregate-to-admin: "true"
     rbac.authorization.k8s.io/aggregate-to-edit: "true"
-    rbac.authorization.k8s.io/aggregate-to-view: "true"
 rules:
 - apiGroups: ["operators.coreos.com"]
-  resources: ["clusterserviceversions", "catalogsources", "installplans", "subscriptions", "operatorgroups"]
-  verbs: ["get", "list", "watch"]
-- apiGroups: ["packages.operators.coreos.com"]
-  resources: ["packagemanifests", "packagemanifests/icon"]
-  verbs: ["get", "list", "watch"]
+  resources: ["subscriptions"]
+  verbs: ["create", "update", "patch", "delete"]
+- apiGroups: ["operators.coreos.com"]
+  resources: ["clusterserviceversions", "catalogsources", "installplans", "subscriptions"]
+  verbs: ["delete"]

manifests/0000_50_olm_15-packageserver.clusterserviceversion.yaml

@@ -83,7 +83,6 @@ spec:
               nodeSelector:
                 beta.kubernetes.io/os: linux
                 node-role.kubernetes.io/master: ""
-                
               tolerations:
               - effect: NoSchedule
                 key: node-role.kubernetes.io/master
@@ -96,7 +95,6 @@ spec:
                 key: node.kubernetes.io/not-ready
                 operator: Exists
                 tolerationSeconds: 120
-              
               containers:
               - name: packageserver
                 command:
@@ -125,7 +123,6 @@ spec:
                   requests:
                     cpu: 10m
                     memory: 50Mi
-                  
   maturity: alpha
   version: 0.13.0
   apiservicedefinitions:

manifests/0000_50_olm_99-operatorstatus.yaml

@@ -1,8 +1,7 @@
-
 apiVersion: config.openshift.io/v1
 kind: ClusterOperator
 metadata:
-  name: operator-lifecycle-manager
+  name: operator-lifecycle-manager-catalog
 status:
   versions:
     - name: operator
@@ -11,7 +10,7 @@ status:
 apiVersion: config.openshift.io/v1
 kind: ClusterOperator
 metadata:
-  name: operator-lifecycle-manager-catalog
+  name: operator-lifecycle-manager
 status:
   versions:
     - name: operator

manifests/0000_90_olm_00-service-monitor.yaml

@@ -1,12 +1,43 @@
-
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: operator-lifecycle-manager-metrics
+  namespace: openshift-operator-lifecycle-manager
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - services
+  - endpoints
+  - pods
+  verbs:
+  - get
+  - list
+  - watch
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: operator-lifecycle-manager-metrics
+  namespace: openshift-operator-lifecycle-manager
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: operator-lifecycle-manager-metrics
+subjects:
+- kind: ServiceAccount
+  name: prometheus-k8s
+  namespace: openshift-monitoring
+---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: olm-operator
+  name: catalog-operator
   namespace: openshift-operator-lifecycle-manager
   labels:
-    app: olm-operator
+    app: catalog-operator
 spec:
+  jobLabel: k8s-app
   endpoints:
   - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
     interval: 30s
@@ -19,24 +50,23 @@ spec:
     scheme: https
     tlsConfig:
       caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
-      serverName: olm-operator-metrics.openshift-operator-lifecycle-manager.svc
+      serverName: catalog-operator-metrics.openshift-operator-lifecycle-manager.svc
   jobLabel: component
   namespaceSelector:
     matchNames:
     - openshift-operator-lifecycle-manager
   selector:
     matchLabels:
-      app: olm-operator
+      app: catalog-operator
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: catalog-operator
+  name: olm-operator
   namespace: openshift-operator-lifecycle-manager
   labels:
-    app: catalog-operator
+    app: olm-operator
 spec:
-  jobLabel: k8s-app
   endpoints:
   - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
     interval: 30s
@@ -49,43 +79,11 @@ spec:
     scheme: https
     tlsConfig:
       caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
-      serverName: catalog-operator-metrics.openshift-operator-lifecycle-manager.svc
+      serverName: olm-operator-metrics.openshift-operator-lifecycle-manager.svc
   jobLabel: component
   namespaceSelector:
     matchNames:
     - openshift-operator-lifecycle-manager
   selector:
     matchLabels:
-      app: catalog-operator
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: operator-lifecycle-manager-metrics
-  namespace: openshift-operator-lifecycle-manager
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: operator-lifecycle-manager-metrics
-subjects:
-- kind: ServiceAccount
-  name: prometheus-k8s
-  namespace: openshift-monitoring
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: operator-lifecycle-manager-metrics
-  namespace: openshift-operator-lifecycle-manager
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - services
-  - endpoints
-  - pods
-  verbs:
-  - get
-  - list
-  - watch
-
+      app: olm-operator