Merge pull request #1247 from benluddy/vendor-helm

Vendor helm, since it is used for templating manifests.

Author: openshift-merge-robot

go.mod

@@ -32,9 +32,10 @@ require (
 	golang.org/x/time v0.0.0-20191024005414-555d28b269f0
 	gonum.org/v1/gonum v0.0.0-20190710053202-4340aa3071a0 // indirect
 	google.golang.org/grpc v1.24.0
-	k8s.io/api v0.17.0
-	k8s.io/apiextensions-apiserver v0.0.0
-	k8s.io/apimachinery v0.17.0
+	helm.sh/helm/v3 v3.0.1
+	k8s.io/api v0.17.1
+	k8s.io/apiextensions-apiserver v0.17.1
+	k8s.io/apimachinery v0.17.1
 	k8s.io/apiserver v0.0.0
 	k8s.io/client-go v8.0.0+incompatible
 	k8s.io/code-generator v0.0.0
@@ -51,6 +52,7 @@ replace (
 	github.com/openshift/api => github.com/openshift/api v3.9.1-0.20190924102528-32369d4db2ad+incompatible
 	github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20190923180330-3b6373338c9b
 	github.com/prometheus/client_golang => github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829
+	helm.sh/helm/v3 => helm.sh/helm/v3 v3.0.0-beta.5.0.20200123114618-5e3c7d7eb86a
 
 	// Pin to kube 1.16
 	k8s.io/api => k8s.io/api v0.0.0-20190918155943-95b840bb6a1f

go.sum

@@ -1,20 +1,20 @@
 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"
 ---
 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"

manifests/0000_50_olm_00-namespace.yaml

@@ -1,32 +1,32 @@
 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"]
 ---
 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"]

manifests/0000_50_olm_09-aggregated.clusterrole.yaml

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

manifests/0000_50_olm_99-operatorstatus.yaml

@@ -32,12 +32,11 @@ subjects:
 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
@@ -50,23 +49,24 @@ 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
+      app: olm-operator
 ---
 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
@@ -79,11 +79,11 @@ 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

manifests/0000_90_olm_00-service-monitor.yaml

@@ -1,12 +1,5 @@
 #!/usr/bin/env bash
 
-# requires helm v3 to be installed
-# the output of "helm template" is not stable between versions 2 and 3
-if helm version 2>/dev/null | grep -v -q -E 'Version:"v3\.'; then
-    echo "error: helm version 3 is required"
-    exit 1
-fi
-
 if [[ ${#@} -lt 3 ]]; then
     echo "Usage: $0 semver chart values"
     echo "* semver: semver-formatted version for this package"
@@ -28,6 +21,6 @@ echo "Version: $1" >> ${charttmpdir}/Chart.yaml
 
 mkdir -p ${chartdir}
 
-helm template -n olm -f ${values} ${charttmpdir} --output-dir ${charttmpdir}
+go run -mod=vendor helm.sh/helm/v3/cmd/helm template -n olm -f ${values} ${charttmpdir} --output-dir ${charttmpdir}
 
 cp -R ${charttmpdir}/olm/templates/. ${chartdir}

scripts/package_release.sh

@@ -9,4 +9,5 @@ import (
 	_ "k8s.io/code-generator"
 	_ "k8s.io/kube-openapi/cmd/openapi-gen"
 	_ "sigs.k8s.io/controller-tools/cmd/controller-gen"
+	_ "helm.sh/helm/v3/cmd/helm"
 )