Merge pull request #771 from njhale/recut-0.8.1

openshift-merge-robot · web-flow · commit 9ee66d01eec2 · 2019-03-20T20:01:29.000-07:00
chore(manifests): recut 0.8.1
diff --git a/Documentation/install/local-values.yaml b/Documentation/install/local-values.yaml
@@ -1,3 +1,4 @@
+installType: "upstream"
 rbacApiVersion: rbac.authorization.k8s.io
 namespace: local
 writeStatusName: '""'
diff --git a/Makefile b/Makefile
@@ -185,5 +185,5 @@ endif
 	./scripts/package_release.sh $(ver) deploy/$(target)/manifests/$(ver) deploy/$(target)/values.yaml
 	ln -sfFn ./$(ver) deploy/$(target)/manifests/latest
 ifeq ($(quickstart), true)
-	./scripts/package_quickstart.sh deploy/$(target)/manifests/$(ver) deploy/$(target)/manifests/quickstart/olm.yaml
+	./scripts/package_quickstart.sh deploy/$(target)/manifests/$(ver) deploy/$(target)/quickstart/olm.yaml
 endif
diff --git a/deploy/chart/templates/0000_50_olm_06-olm-operator.deployment.yaml b/deploy/chart/templates/0000_50_olm_06-olm-operator.deployment.yaml
@@ -50,7 +50,7 @@ spec:
               path: /healthz
               port: {{ .Values.olm.service.internalPort }}
           env:
-        {{ if (.Values.installType) and eq .Values.installType "ocp" }}
+        {{ if and .Values.installType (eq .Values.installType "ocp") }}
           - name: RELEASE_VERSION
             value: "0.0.1-snapshot"
         {{ end }}
diff --git a/deploy/chart/templates/0000_50_olm_15-packageserver.clusterserviceversion.yaml b/deploy/chart/templates/0000_50_olm_15-packageserver.clusterserviceversion.yaml
@@ -1,4 +1,4 @@
-{{ if (.Values.installType) and eq .Values.installType "ocp" }}
+{{ if and .Values.installType (eq .Values.installType "ocp") }}
 # keep in sync with _packageserver.clusterserviceversion.yaml
 apiVersion: operators.coreos.com/v1alpha1
 kind: ClusterServiceVersion
diff --git a/deploy/chart/templates/0000_50_olm_16-packageserver.deployment.yaml b/deploy/chart/templates/0000_50_olm_16-packageserver.deployment.yaml
@@ -1,4 +1,4 @@
-{{ if (.Values.installType) and eq .Values.installType "ocp" }}
+{{ if and .Values.installType (eq .Values.installType "ocp") }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
diff --git a/deploy/chart/templates/0000_50_olm_17-upstream-operators.catalogsource.yaml b/deploy/chart/templates/0000_50_olm_17-upstream-operators.catalogsource.yaml
@@ -1,6 +1,4 @@
-#! validate-crd: ./deploy/chart/templates/05-catalogsource.crd.yaml
-#! parse-kind: CatalogSource
-{{ if (.Values.installType) and eq .Values.installType "upstream" }}
+{{ if and .Values.installType (eq .Values.installType "upstream") }}
 apiVersion: operators.coreos.com/v1alpha1
 kind: CatalogSource
 metadata:
diff --git a/deploy/ocp/manifests/0.8.1/0000_50_olm_06-olm-operator.deployment.yaml b/deploy/ocp/manifests/0.8.1/0000_50_olm_06-olm-operator.deployment.yaml
@@ -27,7 +27,7 @@ spec:
           args:
           - -writeStatusName
           - operator-lifecycle-manager
-          image: quay.io/coreos/olm@sha256:995a181839f301585a0e115c083619b6d73812c58a8444d7b13b8e407010325f
+          image: quay.io/operator-framework/olm@sha256:4b7dec341fc754fdd2c8784ca7d81747ebbb2b87866b9e61ebbebc8c5614cfdc
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080
@@ -40,6 +40,10 @@ spec:
               path: /healthz
               port: 8080
           env:
+        
+          - name: RELEASE_VERSION
+            value: "0.0.1-snapshot"
+        
           - name: OPERATOR_NAMESPACE
             valueFrom:
               fieldRef:
diff --git a/deploy/ocp/manifests/0.8.1/0000_50_olm_07-catalog-operator.deployment.yaml b/deploy/ocp/manifests/0.8.1/0000_50_olm_07-catalog-operator.deployment.yaml
@@ -28,7 +28,7 @@ spec:
           - '-namespace'
           - openshift-operator-lifecycle-manager
           - -configmapServerImage=quay.io/operatorframework/configmap-operator-registry:latest
-          image: quay.io/coreos/olm@sha256:995a181839f301585a0e115c083619b6d73812c58a8444d7b13b8e407010325f
+          image: quay.io/operator-framework/olm@sha256:4b7dec341fc754fdd2c8784ca7d81747ebbb2b87866b9e61ebbebc8c5614cfdc
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080
diff --git a/deploy/ocp/manifests/0.8.1/0000_50_olm_10-olm-operators.configmap.yaml b/deploy/ocp/manifests/0.8.1/0000_50_olm_10-olm-operators.configmap.yaml
@@ -97,7 +97,7 @@ data:
                       - "5443"
                       - --global-namespace
                       - openshift-operator-lifecycle-manager
-                      image: quay.io/coreos/olm@sha256:995a181839f301585a0e115c083619b6d73812c58a8444d7b13b8e407010325f
+                      image: quay.io/operator-framework/olm@sha256:4b7dec341fc754fdd2c8784ca7d81747ebbb2b87866b9e61ebbebc8c5614cfdc
                       imagePullPolicy: IfNotPresent
                       ports:
                       - containerPort: 5443
diff --git a/deploy/ocp/manifests/0.8.1/0000_50_olm_14-operatorstatus.yaml b/deploy/ocp/manifests/0.8.1/0000_50_olm_14-operatorstatus.yaml
@@ -5,3 +5,7 @@ apiVersion: config.openshift.io/v1
 kind: ClusterOperator
 metadata:
   name: operator-lifecycle-manager
+status:
+  versions:
+    - name: operator
+      version: "0.0.1-snapshot"
diff --git a/deploy/ocp/manifests/0.8.1/0000_50_olm_15-packageserver.clusterserviceversion.yaml b/deploy/ocp/manifests/0.8.1/0000_50_olm_15-packageserver.clusterserviceversion.yaml
@@ -0,0 +1,118 @@
+---
+# Source: olm/templates/0000_50_olm_15-packageserver.clusterserviceversion.yaml
+
+# keep in sync with _packageserver.clusterserviceversion.yaml
+apiVersion: operators.coreos.com/v1alpha1
+kind: ClusterServiceVersion
+metadata:
+  name: packageserver.v0.8.1
+  namespace: openshift-operator-lifecycle-manager
+spec:
+  displayName: Package Server
+  description: Represents an Operator package that is available from a given CatalogSource which will resolve to a ClusterServiceVersion.
+  minKubeVersion: 1.11.0
+  keywords: ['packagemanifests', 'olm', 'packages']
+  maintainers:
+  - name: Red Hat
+    email: openshift-operators@redhat.com
+  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:
+          - ""
+          resources:
+          - configmaps
+          verbs:
+          - get
+          - list
+          - watch
+        - apiGroups:
+          - operators.coreos.com
+          resources:
+          - catalogsources
+          verbs:
+          - get
+          - list
+          - watch
+        - apiGroups:
+          - packages.apps.redhat.com
+          resources:
+          - packagemanifests
+          verbs:
+          - get
+          - list
+      deployments:
+      - name: packageserver        
+        spec:
+          strategy:
+            type: RollingUpdate
+          replicas: 2
+          selector:
+            matchLabels:
+              app: packageserver
+          template:
+            metadata:
+              labels:
+                app: packageserver
+            spec:
+              serviceAccountName: packageserver
+              nodeSelector:
+                          beta.kubernetes.io/os: linux
+                          node-role.kubernetes.io/master: ""
+                          
+              tolerations:
+                          - operator: Exists
+                          
+              containers:
+              - name: packageserver
+                command:
+                - /bin/package-server
+                - -v=4
+                - --secure-port
+                - "5443"
+                - --global-namespace
+                - openshift-operator-lifecycle-manager
+                image: quay.io/operator-framework/olm@sha256:4b7dec341fc754fdd2c8784ca7d81747ebbb2b87866b9e61ebbebc8c5614cfdc
+                imagePullPolicy: IfNotPresent
+                ports:
+                - containerPort: 5443
+                livenessProbe:
+                  httpGet:
+                    scheme: HTTPS
+                    path: /healthz
+                    port: 5443
+                readinessProbe:
+                  httpGet:
+                    scheme: HTTPS
+                    path: /healthz
+                    port: 5443
+  maturity: alpha
+  version: 0.8.1
+  apiservicedefinitions:
+    owned:
+    - group: packages.apps.redhat.com
+      version: v1alpha1
+      kind: PackageManifest
+      name: packagemanifest
+      displayName: PackageManifest
+      description: A PackageManifest is a resource generated from existing CatalogSources and their ConfigMaps
+      deploymentName: packageserver
+      containerPort: 5443
+
diff --git a/deploy/ocp/manifests/0.8.1/0000_50_olm_16-packageserver.deployment.yaml b/deploy/ocp/manifests/0.8.1/0000_50_olm_16-packageserver.deployment.yaml
@@ -0,0 +1,54 @@
+---
+# Source: olm/templates/0000_50_olm_16-packageserver.deployment.yaml
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: packageserver
+  namespace: openshift-operator-lifecycle-manager
+  labels:
+    app: packageserver
+spec:
+  strategy:
+    type: RollingUpdate
+  replicas: 2
+  selector:
+    matchLabels:
+      app: packageserver
+  template:
+    metadata:
+      labels:
+        app: packageserver
+    spec:
+      serviceAccountName: packageserver
+      nodeSelector:
+                  beta.kubernetes.io/os: linux
+                  node-role.kubernetes.io/master: ""
+                  
+      tolerations:
+                  - operator: Exists
+                  
+      containers:
+      - name: packageserver
+        command:
+        - /bin/package-server
+        - -v=4
+        - --secure-port
+        - "5443"
+        - --global-namespace
+        - openshift-operator-lifecycle-manager
+        image: quay.io/operator-framework/olm@sha256:4b7dec341fc754fdd2c8784ca7d81747ebbb2b87866b9e61ebbebc8c5614cfdc
+        imagePullPolicy: IfNotPresent
+        ports:
+        - containerPort: 5443
+        livenessProbe:
+          httpGet:
+            scheme: HTTPS
+            path: /healthz
+            port: 5443
+        readinessProbe:
+          httpGet:
+            scheme: HTTPS
+            path: /healthz
+            port: 5443
+
diff --git a/deploy/ocp/manifests/0.8.1/image-references b/deploy/ocp/manifests/0.8.1/image-references
@@ -8,7 +8,7 @@ spec:
   - name: operator-lifecycle-manager
     from:
       kind: DockerImage
-      name: quay.io/coreos/olm@sha256:995a181839f301585a0e115c083619b6d73812c58a8444d7b13b8e407010325f
+      name: quay.io/operator-framework/olm@sha256:4b7dec341fc754fdd2c8784ca7d81747ebbb2b87866b9e61ebbebc8c5614cfdc
   - name: operator-registry
     from:
       kind: DockerImage
diff --git a/deploy/ocp/values.yaml b/deploy/ocp/values.yaml
@@ -8,7 +8,7 @@ writeStatusName: operator-lifecycle-manager
 olm:
   replicaCount: 1
   image:
-    ref: quay.io/coreos/olm@sha256:995a181839f301585a0e115c083619b6d73812c58a8444d7b13b8e407010325f
+    ref: quay.io/operator-framework/olm@sha256:4b7dec341fc754fdd2c8784ca7d81747ebbb2b87866b9e61ebbebc8c5614cfdc
     pullPolicy: IfNotPresent
   service:
     internalPort: 8080
@@ -20,7 +20,7 @@ olm:
 catalog:
   replicaCount: 1
   image:
-    ref: quay.io/coreos/olm@sha256:995a181839f301585a0e115c083619b6d73812c58a8444d7b13b8e407010325f
+    ref: quay.io/operator-framework/olm@sha256:4b7dec341fc754fdd2c8784ca7d81747ebbb2b87866b9e61ebbebc8c5614cfdc
     pullPolicy: IfNotPresent
   service:
     internalPort: 8080
@@ -32,7 +32,7 @@ catalog:
 package:
   replicaCount: 2
   image:
-    ref: quay.io/coreos/olm@sha256:995a181839f301585a0e115c083619b6d73812c58a8444d7b13b8e407010325f
+    ref: quay.io/operator-framework/olm@sha256:4b7dec341fc754fdd2c8784ca7d81747ebbb2b87866b9e61ebbebc8c5614cfdc
     pullPolicy: IfNotPresent
   service:
     internalPort: 5443
diff --git a/deploy/okd/manifests/0.8.1/0000_50_olm_06-olm-operator.deployment.yaml b/deploy/okd/manifests/0.8.1/0000_50_olm_06-olm-operator.deployment.yaml
@@ -27,7 +27,7 @@ spec:
           args:
           - -writeStatusName
           - operator-lifecycle-manager
-          image: quay.io/coreos/olm@sha256:995a181839f301585a0e115c083619b6d73812c58a8444d7b13b8e407010325f
+          image: quay.io/operator-framework/olm@sha256:4b7dec341fc754fdd2c8784ca7d81747ebbb2b87866b9e61ebbebc8c5614cfdc
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080
@@ -40,6 +40,7 @@ spec:
               path: /healthz
               port: 8080
           env:
+        
           - name: OPERATOR_NAMESPACE
             valueFrom:
               fieldRef:
diff --git a/deploy/okd/manifests/0.8.1/0000_50_olm_07-catalog-operator.deployment.yaml b/deploy/okd/manifests/0.8.1/0000_50_olm_07-catalog-operator.deployment.yaml
@@ -28,7 +28,7 @@ spec:
           - '-namespace'
           - openshift-operator-lifecycle-manager
           - -configmapServerImage=quay.io/operatorframework/configmap-operator-registry:latest
-          image: quay.io/coreos/olm@sha256:995a181839f301585a0e115c083619b6d73812c58a8444d7b13b8e407010325f
+          image: quay.io/operator-framework/olm@sha256:4b7dec341fc754fdd2c8784ca7d81747ebbb2b87866b9e61ebbebc8c5614cfdc
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080
diff --git a/deploy/okd/manifests/0.8.1/0000_50_olm_10-olm-operators.configmap.yaml b/deploy/okd/manifests/0.8.1/0000_50_olm_10-olm-operators.configmap.yaml
@@ -93,7 +93,7 @@ data:
                       - "5443"
                       - --global-namespace
                       - openshift-operator-lifecycle-manager
-                      image: quay.io/coreos/olm@sha256:995a181839f301585a0e115c083619b6d73812c58a8444d7b13b8e407010325f
+                      image: quay.io/operator-framework/olm@sha256:4b7dec341fc754fdd2c8784ca7d81747ebbb2b87866b9e61ebbebc8c5614cfdc
                       imagePullPolicy: Always
                       ports:
                       - containerPort: 5443
diff --git a/deploy/okd/values.yaml b/deploy/okd/values.yaml
@@ -8,21 +8,21 @@ writeStatusName: operator-lifecycle-manager
 olm:
   replicaCount: 1
   image:
-    ref: quay.io/coreos/olm@sha256:995a181839f301585a0e115c083619b6d73812c58a8444d7b13b8e407010325f
+    ref: quay.io/operator-framework/olm@sha256:4b7dec341fc754fdd2c8784ca7d81747ebbb2b87866b9e61ebbebc8c5614cfdc
     pullPolicy: IfNotPresent
   service:
     internalPort: 8080
 catalog:
   replicaCount: 1
   image:
-    ref: quay.io/coreos/olm@sha256:995a181839f301585a0e115c083619b6d73812c58a8444d7b13b8e407010325f
+    ref: quay.io/operator-framework/olm@sha256:4b7dec341fc754fdd2c8784ca7d81747ebbb2b87866b9e61ebbebc8c5614cfdc
     pullPolicy: IfNotPresent
   service:
     internalPort: 8080
 package:
   replicaCount: 2
   image:
-    ref: quay.io/coreos/olm@sha256:995a181839f301585a0e115c083619b6d73812c58a8444d7b13b8e407010325f
+    ref: quay.io/operator-framework/olm@sha256:4b7dec341fc754fdd2c8784ca7d81747ebbb2b87866b9e61ebbebc8c5614cfdc
     pullPolicy: Always
   service:
     internalPort: 5443
diff --git a/deploy/upstream/manifests/0.8.1/0000_50_olm_06-olm-operator.deployment.yaml b/deploy/upstream/manifests/0.8.1/0000_50_olm_06-olm-operator.deployment.yaml
@@ -27,7 +27,7 @@ spec:
           args:
           - -writeStatusName
           - ""
-          image: quay.io/coreos/olm@sha256:995a181839f301585a0e115c083619b6d73812c58a8444d7b13b8e407010325f
+          image: quay.io/operator-framework/olm@sha256:4b7dec341fc754fdd2c8784ca7d81747ebbb2b87866b9e61ebbebc8c5614cfdc
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080
@@ -40,6 +40,7 @@ spec:
               path: /healthz
               port: 8080
           env:
+        
           - name: OPERATOR_NAMESPACE
             valueFrom:
               fieldRef:
diff --git a/deploy/upstream/manifests/0.8.1/0000_50_olm_07-catalog-operator.deployment.yaml b/deploy/upstream/manifests/0.8.1/0000_50_olm_07-catalog-operator.deployment.yaml
@@ -28,7 +28,7 @@ spec:
           - '-namespace'
           - olm
           - -configmapServerImage=quay.io/operatorframework/configmap-operator-registry:latest
-          image: quay.io/coreos/olm@sha256:995a181839f301585a0e115c083619b6d73812c58a8444d7b13b8e407010325f
+          image: quay.io/operator-framework/olm@sha256:4b7dec341fc754fdd2c8784ca7d81747ebbb2b87866b9e61ebbebc8c5614cfdc
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080
diff --git a/deploy/upstream/manifests/0.8.1/0000_50_olm_10-olm-operators.configmap.yaml b/deploy/upstream/manifests/0.8.1/0000_50_olm_10-olm-operators.configmap.yaml
@@ -93,7 +93,7 @@ data:
                       - "5443"
                       - --global-namespace
                       - olm
-                      image: quay.io/coreos/olm@sha256:995a181839f301585a0e115c083619b6d73812c58a8444d7b13b8e407010325f
+                      image: quay.io/operator-framework/olm@sha256:4b7dec341fc754fdd2c8784ca7d81747ebbb2b87866b9e61ebbebc8c5614cfdc
                       imagePullPolicy: Always
                       ports:
                       - containerPort: 5443
diff --git a/deploy/upstream/manifests/0.8.1/0000_50_olm_17-upstream-operators.catalogsource.yaml b/deploy/upstream/manifests/0.8.1/0000_50_olm_17-upstream-operators.catalogsource.yaml
diff --git a/deploy/upstream/quickstart/olm.yaml b/deploy/upstream/quickstart/olm.yaml
diff --git a/deploy/upstream/values.yaml b/deploy/upstream/values.yaml
diff --git a/manifests/0000_50_olm_06-olm-operator.deployment.yaml b/manifests/0000_50_olm_06-olm-operator.deployment.yaml
diff --git a/manifests/0000_50_olm_07-catalog-operator.deployment.yaml b/manifests/0000_50_olm_07-catalog-operator.deployment.yaml
diff --git a/manifests/0000_50_olm_10-olm-operators.configmap.yaml b/manifests/0000_50_olm_10-olm-operators.configmap.yaml
diff --git a/manifests/0000_50_olm_14-operatorstatus.yaml b/manifests/0000_50_olm_14-operatorstatus.yaml
diff --git a/manifests/0000_50_olm_15-packageserver.clusterserviceversion.yaml b/manifests/0000_50_olm_15-packageserver.clusterserviceversion.yaml
diff --git a/manifests/0000_50_olm_16-packageserver.deployment.yaml b/manifests/0000_50_olm_16-packageserver.deployment.yaml
diff --git a/manifests/image-references b/manifests/image-references

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+installType: "upstream"`
`1`	`2`	`rbacApiVersion: rbac.authorization.k8s.io`
`2`	`3`	`namespace: local`
`3`	`4`	`writeStatusName: '""'`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{{ if (.Values.installType) and eq .Values.installType "ocp" }}`
	`1`	`+{{ if and .Values.installType (eq .Values.installType "ocp") }}`
`2`	`2`	`# keep in sync with _packageserver.clusterserviceversion.yaml`
`3`	`3`	`apiVersion: operators.coreos.com/v1alpha1`
`4`	`4`	`kind: ClusterServiceVersion`