Update chart to use the new "crds" directory.

Helm 3 will handle CRD installation for CRD manifests located in the
chart's "crds" subdirectory, in exchange for dropping template
rendering support for CRD manifests. The only CRD template that exists
in the OLM chart today is used by a single test of downstream-only
behavior. The others are moved to "crds", and the release script has
been modified to look in both "templates" and "crds" for
manifests. The apiVersion in Chart.yaml has accordingly been bumped to
v2 to indicate that it requires Helm 3.

On its own, this change is intended to have minimal impact, but it's
part of the groundwork for bootstrapping E2E test environments for our
upstream CI.

Author: benluddy

Makefile

@@ -156,9 +156,9 @@ clean:
 
 # Generate manifests for CRDs
 manifests: vendor
-	$(CONTROLLER_GEN) schemapatch:manifests=./deploy/chart/templates paths=./pkg/api/apis/operators/... output:dir=./deploy/chart/templates
+	$(CONTROLLER_GEN) schemapatch:manifests=./deploy/chart/crds paths=./pkg/api/apis/operators/... output:dir=./deploy/chart/crds
 
-	$(YQ_INTERNAL) w --inplace deploy/chart/templates/0000_50_olm_03-clusterserviceversion.crd.yaml spec.validation.openAPIV3Schema.properties.spec.properties.install.properties.spec.properties.deployments.items.properties.spec.properties.template.properties.metadata.x-kubernetes-preserve-unknown-fields true
+	$(YQ_INTERNAL) w --inplace deploy/chart/crds/0000_50_olm_03-clusterserviceversion.crd.yaml spec.validation.openAPIV3Schema.properties.spec.properties.install.properties.spec.properties.deployments.items.properties.spec.properties.template.properties.metadata.x-kubernetes-preserve-unknown-fields true
 
 # Generate clients, listers, and informers
 codegen:

deploy/chart/Chart.yaml

@@ -1,3 +1,3 @@
-apiVersion: v1
+apiVersion: v2
 description: A Helm chart for Kubernetes
 name: olm

deploy/chart/templates/0000_50_olm_03-clusterserviceversion.crd.yaml renamed to deploy/chart/crds/0000_50_olm_03-clusterserviceversion.crd.yaml

@@ -16,19 +16,19 @@ require (
 	github.com/openshift/client-go v0.0.0-20190923180330-3b6373338c9b
 	github.com/operator-framework/operator-registry v1.5.8
 	github.com/otiai10/copy v1.0.1
-	github.com/pkg/errors v0.8.1
+	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.2.1
 	github.com/sirupsen/logrus v1.4.2
 	github.com/spf13/cobra v0.0.5
 	github.com/stretchr/testify v1.4.0
 	golang.org/x/sys v0.0.0-20191210023423-ac6580df4449 // indirect
 	golang.org/x/time v0.0.0-20191024005414-555d28b269f0
-	google.golang.org/grpc v1.24.0
+	google.golang.org/grpc v1.27.0
 	gopkg.in/yaml.v2 v2.2.4
-	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
+	helm.sh/helm/v3 v3.1.2
+	k8s.io/api v0.17.2
+	k8s.io/apiextensions-apiserver v0.17.2
+	k8s.io/apimachinery v0.17.2
 	k8s.io/apiserver v0.0.0
 	k8s.io/client-go v8.0.0+incompatible
 	k8s.io/code-generator v0.0.0
@@ -41,11 +41,12 @@ require (
 )
 
 replace (
+	github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.2+incompatible
 	github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 // Required by Helm
 	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
+	google.golang.org/grpc => google.golang.org/grpc v1.26.0 // https://github.com/etcd-io/etcd/issues/11563
 
 	// Pin to kube 1.16
 	k8s.io/api => k8s.io/api v0.0.0-20190918155943-95b840bb6a1f

deploy/chart/templates/0000_50_olm_04-installplan.crd.yaml renamed to deploy/chart/crds/0000_50_olm_04-installplan.crd.yaml

@@ -21,6 +21,6 @@ echo "Version: $1" >> ${charttmpdir}/Chart.yaml
 
 mkdir -p ${chartdir}
 
-go run -mod=vendor helm.sh/helm/v3/cmd/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} --include-crds --output-dir ${charttmpdir} ${charttmpdir}
 
-cp -R ${charttmpdir}/olm/templates/. ${chartdir}
+cp -R "${charttmpdir}"/olm/{templates,crds}/. "${chartdir}"