update CatalogSource

quay · Oct 2, 2020 · 97408ff · 97408ff
1 parent 88ec417
commit 97408ff
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 6 deletions.
diff --git a/deploy/manifests/quay-operator/0.0.1/quay-operator.clusterserviceversion.yaml b/deploy/manifests/quay-operator/0.0.1/quay-operator.clusterserviceversion.yaml
@@ -4,7 +4,7 @@ metadata:
   annotations:
     capabilities: Full Lifecycle
     categories: Integration & Delivery
-    containerImage: quay.io/projectquay/quay-operator@sha256:a80a19cdf70e37a0c4e4a1ee0434098cceaaddf43825d2c6d9b202300531b74f
+    containerImage: quay.io/projectquay/quay-operator@sha256:61ddeaf70655abc027d209185bf20f94173cb02d7455bb78452e1e0637c6bd65
     createdAt: 2020-08-24 00:00:00
     description: Opinionated deployment of Quay on Kubernetes.
     repository: https://github.com/quay/quay-operator
@@ -23,7 +23,9 @@ metadata:
               {"kind": "clair", "managed": true},
               {"kind": "postgres", "managed": true},
               {"kind": "objectstorage", "managed": true},
-              {"kind": "redis", "managed": true}
+              {"kind": "redis", "managed": true},
+              {"kind": "horizontalpodautoscaler", "managed": true},
+              {"kind": "route", "managed": true}
             ]
           }
         }
@@ -49,6 +51,7 @@ spec:
         - kind: Route
         - kind: Role
         - kind: Rolebinding
+        - kind: HorizontalPodAutoscaler
       specDescriptors:
         - path: configBundleSecret
           displayName: Config Bundle Secret
@@ -107,9 +110,18 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
-                image: quay.io/projectquay/quay-operator@sha256:a80a19cdf70e37a0c4e4a1ee0434098cceaaddf43825d2c6d9b202300531b74f
+                image: quay.io/projectquay/quay-operator@sha256:61ddeaf70655abc027d209185bf20f94173cb02d7455bb78452e1e0637c6bd65
                 name: quay-operator
+                # FIXME(alecmerdler): Kustomize panics because of the extra "magic" `..data/` directories that k8s adds to mounted volumes...
+                # volumeMounts:
+                # - mountPath: /workspace/kustomize/overlays/upstream/dev
+                #   name: quay-dev-kustomize
               serviceAccountName: quay-operator
+              # volumes:
+              # - name: quay-dev-kustomize
+              #   configMap:
+              #     name: quay-dev-kustomize
+              #     optional: true
       permissions:
       - rules:
         - apiGroups:
@@ -149,6 +161,12 @@ spec:
           - routes
           verbs:
           - '*'
+        - apiGroups:
+          - autoscaling
+          resources:
+          - horizontalpodautoscalers
+          verbs:
+          - '*'
         - apiGroups:
           - objectbucket.io
           resources:

diff --git a/deploy/quay-operator.catalogsource.yaml b/deploy/quay-operator.catalogsource.yaml
@@ -4,4 +4,4 @@ metadata:
   name: quay-operator
 spec:
   sourceType: grpc
-  image: quay.io/projectquay/quay-operator-catalog@sha256:d1aa83948a404616aef974e902e66086e140a2898b464b372bc0a1db6013c2f9
+  image: quay.io/projectquay/quay-operator-catalog@sha256:58eeadb2188862bb067d76dffc69be7173577e098523b5aefae58008043a192e
diff --git a/kustomize/base/config.deployment.yaml b/kustomize/base/config.deployment.yaml
@@ -23,7 +23,7 @@ spec:
             name: cluster-service-ca
       containers:
         - name: quay-config-editor
-          image: quay.io/projectquay/config-tool@sha256:9aeff823414c93c3129eb98132affda14adce1d60af23b9e23ce481327591eaf
+          image: quay.io/projectquay/config-tool
           ports:
             - containerPort: 8080
               protocol: TCP

diff --git a/kustomize/overlays/upstream/vader/kustomization.yaml b/kustomize/overlays/upstream/vader/kustomization.yaml
@@ -7,6 +7,9 @@ bases:
   - ../../../tmp
 images:
   - name: quay.io/projectquay/quay
+    # newTag: vader
+    digest: sha256:b05c0c8b419396307a54bef0b25fa51ea0e7b034e4c676f4cbdf48b7b2739e5b
+  - name: quay.io/projectquay/config-tool
     newTag: vader
   - name: quay.io/projectquay/clair
     # newTag: vader

diff --git a/kustomize/overlays/upstream/vader/upgrade/kustomization.yaml b/kustomize/overlays/upstream/vader/upgrade/kustomization.yaml
@@ -11,6 +11,10 @@ patchesStrategicMerge:
   - ./upgrade.deployment.patch.yaml
 images:
   - name: quay.io/projectquay/quay
+    # newTag: vader
+    digest: sha256:b05c0c8b419396307a54bef0b25fa51ea0e7b034e4c676f4cbdf48b7b2739e5b
+  - name: quay.io/projectquay/config-tool
     newTag: vader
   - name: quay.io/projectquay/clair
-    newTag: vader
+    # newTag: vader
+    newTag: 4.0.0-rc.3