Merge pull request #852 from ecordell/fix-release-scripts

chore(deploy): fix release scripts

Author: openshift-merge-robot

Dockerfile

@@ -5,6 +5,11 @@ RUN yum install -y make git
 ENV GOPATH /go
 ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
 
+# install helm for templating - used in verification tests
+RUN curl -LO https://storage.googleapis.com/kubernetes-helm/helm-v2.13.1-linux-amd64.tar.gz && \
+    tar -zxvf helm-v2.13.1-linux-amd64.tar.gz && \
+    mv linux-amd64/helm /usr/local/bin/helm
+
 WORKDIR /go/src/github.com/operator-framework/operator-lifecycle-manager
 
 # copy just enough of the git repo to parse HEAD, used to record version in OLM binaries
@@ -18,9 +23,11 @@ COPY pkg pkg
 COPY vendor vendor
 COPY cmd cmd
 COPY test test
+COPY scripts scripts
+COPY deploy deploy
+RUN make verify-manifests
 RUN make build
 
-
 FROM openshift/origin-base
 
 ADD manifests/ /manifests

Makefile

@@ -154,12 +154,25 @@ container-mockgen:
 	docker cp temp-mockgen:/operator-lifecycle-manager/pkg/package-server/client/fakes/. ./pkg/package-server/client/fakes
 	docker rm temp-mockgen
 
+verify: verify-codegen verify-manifests
+
 # Must be run in gopath: https://github.com/kubernetes/kubernetes/issues/67566
 verify-codegen: codegen
 	git diff --exit-code
 
+# this is here for backwards compatibility with the ci job that calls verify-catalog
 verify-catalog:
 
+verify-manifests: ver=$(shell cat OLM_VERSION)
+verify-manifests:
+	rm -rf manifests
+	mkdir manifests
+	./scripts/package_release.sh $(ver) manifests deploy/ocp/values.yaml
+	# requires gnu sed if on mac
+	find ./manifests -type f -exec sed -i "/^#/d" {} \;
+	find ./manifests -type f -exec sed -i "1{/---/d}" {} \;
+	git diff --exit-code
+
 mockgen:
 	$(MOCKGEN)
 
@@ -176,6 +189,7 @@ release:
 	rm -rf manifests
 	mkdir manifests
 	cp -R deploy/ocp/manifests/$(ver)/. manifests
+	# requires gnu sed if on mac
 	find ./manifests -type f -exec sed -i "/^#/d" {} \;
 	find ./manifests -type f -exec sed -i "1{/---/d}" {} \;
 

deploy/chart/templates/0000_50_olm_07-olm-operator.deployment.yaml

@@ -96,5 +96,5 @@ spec:
     {{- end }}
     {{- if .Values.olm.tolerations }}
       tolerations:
-{{ toYaml .Values.olm.tolerations | indent 8 }}
+{{ toYaml .Values.olm.tolerations | indent 6 }}
     {{- end }}

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

@@ -92,5 +92,5 @@ spec:
     {{- end }}
     {{- if .Values.catalog.tolerations }}
       tolerations:
-{{ toYaml .Values.catalog.tolerations | indent 8 }}
+{{ toYaml .Values.catalog.tolerations | indent 6 }}
     {{- end }}

deploy/chart/templates/0000_50_olm_11-olm-operators.configmap.yaml

@@ -6,6 +6,6 @@ metadata:
 data:
   customResourceDefinitions: |-
   clusterServiceVersions: |-
-{{- include "packageserver.clusterserviceversion" . | nindent 4 }}
+{{- include "packageserver.clusterserviceversion" . | cat "-" | nindent 6 | replace "      - apiVersion" "    - apiVersion" }}
   packages: |- 
-{{- include "packageserver.package" . | nindent 4 }}
+{{- include "packageserver.package" . | nindent 4 }}

deploy/chart/templates/_packageserver.clusterserviceversion.yaml

@@ -1,80 +1,80 @@
 {{- define "packageserver.clusterserviceversion" -}}
-- apiVersion: operators.coreos.com/v1alpha1
-  kind: ClusterServiceVersion
-  metadata:
-    name: packageserver.v{{ .Chart.Version }}
-    namespace: {{ .Values.namespace }}
-  spec:
-    displayName: Package Server
-    description: Represents an Operator package that is available from a given CatalogSource which will resolve to a ClusterServiceVersion.
-    minKubeVersion: {{ .Values.minKubeVersion }}
-    keywords: ['packagemanifests', 'olm', 'packages']
-    maintainers:
-    - name: Red Hat
-      email: [email protected]
-    provider:
-      name: Red Hat
-    links:
-    - name: Package Server
-      url: https://github.com/operator-framework/operator-lifecycle-manager/tree/master/pkg/package-server
-    installModes:
-    - type: OwnNamespace
-      supported: true
-    - type: SingleNamespace
-      supported: true
-    - type: MultiNamespace
-      supported: true
-    - type: AllNamespaces
-      supported: true
-    install:
-      strategy: deployment
-      spec:
-        clusterPermissions:
-        - serviceAccountName: packageserver
-          rules:
-          - apiGroups:
-              - authorization.k8s.io
-            resources:
-              - subjectaccessreviews
-            verbs:
-              - create
-              - get
-          - apiGroups:
-            - ""
-            resources:
-            - configmaps
-            verbs:
+apiVersion: operators.coreos.com/v1alpha1
+kind: ClusterServiceVersion
+metadata:
+  name: packageserver.v{{ .Chart.Version }}
+  namespace: {{ .Values.namespace }}
+spec:
+  displayName: Package Server
+  description: Represents an Operator package that is available from a given CatalogSource which will resolve to a ClusterServiceVersion.
+  minKubeVersion: {{ .Values.minKubeVersion }}
+  keywords: ['packagemanifests', 'olm', 'packages']
+  maintainers:
+  - name: Red Hat
+    email: [email protected]
+  provider:
+    name: Red Hat
+  links:
+  - name: Package Server
+    url: https://github.com/operator-framework/operator-lifecycle-manager/tree/master/pkg/package-server
+  installModes:
+  - type: OwnNamespace
+    supported: true
+  - type: SingleNamespace
+    supported: true
+  - type: MultiNamespace
+    supported: true
+  - type: AllNamespaces
+    supported: true
+  install:
+    strategy: deployment
+    spec:
+      clusterPermissions:
+      - serviceAccountName: packageserver
+        rules:
+        - apiGroups:
+            - authorization.k8s.io
+          resources:
+            - subjectaccessreviews
+          verbs:
+            - create
             - get
-            - list
-            - watch
-          - apiGroups:
-            - "operators.coreos.com"
-            resources:
-            - catalogsources
-            verbs:
-            - get
-            - list
-            - watch
-          - apiGroups:
-            - "packages.operators.coreos.com"
-            resources:
-            - packagemanifests
-            verbs:
-            - get
-            - list
-        deployments:
-        - name: packageserver
-          {{- include "packageserver.deployment-spec" . | nindent 10 }}
-    maturity: alpha
-    version: {{ .Chart.Version }}
-    apiservicedefinitions:
-      owned:
-      - group: packages.operators.coreos.com
-        version: v1
-        kind: PackageManifest
-        name: packagemanifests
-        displayName: PackageManifest
-        description: A PackageManifest is a resource generated from existing CatalogSources and their ConfigMaps
-        deploymentName: packageserver
-        containerPort: {{ .Values.package.service.internalPort }}
+        - apiGroups:
+          - ""
+          resources:
+          - configmaps
+          verbs:
+          - get
+          - list
+          - watch
+        - apiGroups:
+          - "operators.coreos.com"
+          resources:
+          - catalogsources
+          verbs:
+          - get
+          - list
+          - watch
+        - apiGroups:
+          - "packages.operators.coreos.com"
+          resources:
+          - packagemanifests
+          verbs:
+          - get
+          - list
+      deployments:
+      - name: packageserver
+        {{- include "packageserver.deployment-spec" . | nindent 8 }}
+  maturity: alpha
+  version: {{ .Chart.Version }}
+  apiservicedefinitions:
+    owned:
+    - group: packages.operators.coreos.com
+      version: v1
+      kind: PackageManifest
+      name: packagemanifests
+      displayName: PackageManifest
+      description: A PackageManifest is a resource generated from existing CatalogSources and their ConfigMaps
+      deploymentName: packageserver
+      containerPort: {{ .Values.package.service.internalPort }}
 {{- end -}}

deploy/chart/templates/_packageserver.deployment-spec.yaml

@@ -21,7 +21,7 @@ spec:
       {{- end }}
       {{- if .Values.package.tolerations }}
       tolerations:
-        {{- toYaml .Values.package.tolerations | nindent 8 }}
+        {{- toYaml .Values.package.tolerations | nindent 6 }}
       {{- end }}
       containers:
       - name: packageserver

deploy/ocp/manifests/0.9.0/0000_50_olm_00-namespace.yaml

@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: openshift-operator-lifecycle-manager
+  
   annotations:
     openshift.io/node-selector: ""
   labels:
@@ -15,6 +16,7 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: openshift-operators
+  
   annotations:
     openshift.io/node-selector: ""
   labels:

deploy/ocp/manifests/0.9.0/0000_50_olm_03-clusterserviceversion.crd.yaml

@@ -46,6 +46,7 @@ spec:
     status: {}
   validation:
     openAPIV3Schema:
+      description: Represents an Operator that should be running on the cluster, including requirements and install strategy.
       properties:
         spec:
           type: object

deploy/ocp/manifests/0.9.0/0000_50_olm_04-installplan.crd.yaml

@@ -45,6 +45,7 @@ spec:
     status: {}
   validation:
     openAPIV3Schema:
+      description: Represents a plan to install and resolve dependencies for Cluster Services.
       properties:
         spec:
           type: object