build: update from downstream files (PROJQUAY-2230) (#486)

Updates from downstream files, including updated channel name
quay · Aug 25, 2021 · ba686da · ba686da
1 parent cf46e87
commit ba686da
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/Dockerfile.osbs b/Dockerfile.osbs
@@ -8,16 +8,17 @@ RUN cp -Rp $REMOTE_SOURCE_DIR/app/* /workspace
 RUN go build -o manager
 
 
-FROM registry.redhat.io/ubi8:latest
+FROM registry.redhat.io/ubi8:8.4
 
 LABEL com.redhat.component="quay-operator-container"
 LABEL name="quay/quay-operator-rhel8"
-LABEL version="v3.5.0"
+LABEL version="v3.6.0"
 LABEL display-name="Red Hat Quay Operator"
 LABEL io.k8s.display-name="Red Hat Quay Operator"
 LABEL summary="Red Hat Quay Operator"
 LABEL description="Red Hat Quay Operator"
 LABEL maintainer="support@redhat.com"
+LABEL io.openshift.tags="quay"
 
 RUN mkdir /workspace
 WORKDIR /workspace

diff --git a/bundle/downstream/manifests/quay-operator.clusterserviceversion.yaml b/bundle/downstream/manifests/quay-operator.clusterserviceversion.yaml
@@ -2,13 +2,13 @@ apiVersion: operators.coreos.com/v1alpha1
 kind: ClusterServiceVersion
 metadata:
   annotations:
-    olm.skipRange: ">=3.4.x <3.5.0"
+    olm.skipRange: ">=3.3.x <3.6.0"
     capabilities: Full Lifecycle
     categories: Integration & Delivery
-    containerImage: registry-proxy.engineering.redhat.com/rh-osbs/quay-quay-operator-rhel8:v3.5.0
-    createdAt: 2021-03-16 12:03 UTC
+    containerImage: registry-proxy.engineering.redhat.com/rh-osbs/quay-quay-operator-rhel8:v3.6.0
+    createdAt: 2021-07-07 18:07 UTC
     description: Opinionated deployment of Red Hat Quay on Kubernetes.
-    quay-version: 3.5.0
+    quay-version: 3.6.0
     repository: https://github.com/quay/quay-operator
     tectonic-visibility: ocs
     alm-examples: |-
@@ -36,8 +36,8 @@ metadata:
       ]
     operators.operatorframework.io/internal-objects: |-
       ["quayecosystems.redhatcop.redhat.io"]
-    operators.openshift.io/infrastructure-features: '["Disconnected"]'
-  name: quay-operator.v3.5.0
+    operators.openshift.io/infrastructure-features: '["disconnected"]'
+  name: quay-operator.v3.6.0
   namespace: placeholder
 spec:
   customresourcedefinitions:
@@ -153,7 +153,7 @@ spec:
   install:
     spec:
       deployments:
-      - name: quay-operator.v3.5.0
+      - name: quay-operator.v3.6.0
         spec:
           replicas: 1
           selector:
@@ -167,7 +167,7 @@ spec:
             spec:
               containers:
               - name: quay-operator
-                image: registry-proxy.engineering.redhat.com/rh-osbs/quay-quay-operator-rhel8:v3.5.0
+                image: registry-proxy.engineering.redhat.com/rh-osbs/quay-quay-operator-rhel8:v3.6.0
                 command:
                 - /workspace/manager
                 - '--namespace=$(WATCH_NAMESPACE)'
@@ -189,13 +189,13 @@ spec:
                     fieldRef:
                       fieldPath: metadata.annotations['quay-version']
                 - name: RELATED_IMAGE_COMPONENT_QUAY
-                  value: registry-proxy.engineering.redhat.com/rh-osbs/quay-quay-rhel8:v3.5.0
+                  value: registry-proxy.engineering.redhat.com/rh-osbs/quay-quay-rhel8:v3.6.0
                 - name: RELATED_IMAGE_COMPONENT_CLAIR
-                  value: registry-proxy.engineering.redhat.com/rh-osbs/quay-clair-rhel8:v3.5.0
+                  value: registry-proxy.engineering.redhat.com/rh-osbs/quay-clair-rhel8:v3.6.0
                 - name: RELATED_IMAGE_COMPONENT_BUILDER
-                  value: registry-proxy.engineering.redhat.com/rh-osbs/quay-quay-builder-rhel8:v3.5.0
+                  value: registry-proxy.engineering.redhat.com/rh-osbs/quay-quay-builder-rhel8:v3.6.0
                 - name: RELATED_IMAGE_COMPONENT_BUILDER_QEMU
-                  value: registry-proxy.engineering.redhat.com/rh-osbs/quay-quay-builder-qemu-rhcos-rhel8:v3.5.0
+                  value: registry-proxy.engineering.redhat.com/rh-osbs/quay-quay-builder-qemu-rhcos-rhel8:v3.6.0
                 - name: RELATED_IMAGE_COMPONENT_POSTGRES
                   value: registry.redhat.io/rhel8/postgresql-10:1
                 - name: RELATED_IMAGE_COMPONENT_REDIS
@@ -318,4 +318,5 @@ spec:
     matchLabels:
       alm-owner-quay-operator: quay-operator
       operated-by: quay-operator
-  version: 3.5.0
+  version: 3.6.0
+  # replaces: quay-operator.v3.6.0  ## Except for ".0", always put the previous z-stream here
diff --git a/bundle/downstream/metadata/annotations.yaml b/bundle/downstream/metadata/annotations.yaml
@@ -1,6 +1,6 @@
 annotations:
-  operators.operatorframework.io.bundle.channel.default.v1: quay-v3.5
-  operators.operatorframework.io.bundle.channels.v1: quay-v3.5
+  operators.operatorframework.io.bundle.channel.default.v1: stable-3.6
+  operators.operatorframework.io.bundle.channels.v1: stable-3.6
   operators.operatorframework.io.bundle.manifests.v1: manifests/
   operators.operatorframework.io.bundle.mediatype.v1: registry+v1
   operators.operatorframework.io.bundle.metadata.v1: metadata/