From 06d1a0a876af94efc95b8cd2edba1029db3b6065 Mon Sep 17 00:00:00 2001 From: Luke Morfill Date: Tue, 21 Nov 2023 11:42:06 +0000 Subject: [PATCH] Use our images --- config/manager/kustomization.yaml | 2 +- deploy/csv-templates/ocs-operator.csv.yaml.in | 2 +- deploy/deploy-with-olm.yaml | 2 +- .../manifests/ocs-operator.clusterserviceversion.yaml | 6 +++--- metrics/deploy/deployment.yaml | 2 +- tools/csv-merger/csv-merger.go | 3 +-- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 49cf16d183..15ba7b9f3f 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization images: - name: ocs-dev/ocs-operator - newName: quay.io/ocs-dev/ocs-operator + newName: ghcr.io/teamziax/ocs-operator/ocs-operator newTag: latest diff --git a/deploy/csv-templates/ocs-operator.csv.yaml.in b/deploy/csv-templates/ocs-operator.csv.yaml.in index 3a217f12c4..c47fbb0e12 100644 --- a/deploy/csv-templates/ocs-operator.csv.yaml.in +++ b/deploy/csv-templates/ocs-operator.csv.yaml.in @@ -565,7 +565,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.annotations['olm.targetNamespaces'] - image: quay.io/ocs-dev/ocs-operator:latest + image: ghcr.io/teamziax/ocs-operator/ocs-operator:latest imagePullPolicy: Always name: ocs-operator readinessProbe: diff --git a/deploy/deploy-with-olm.yaml b/deploy/deploy-with-olm.yaml index f385a24af4..73d1340bd2 100644 --- a/deploy/deploy-with-olm.yaml +++ b/deploy/deploy-with-olm.yaml @@ -26,7 +26,7 @@ spec: icon: base64data: PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxOTIgMTQ1Ij48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6I2UwMDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPlJlZEhhdC1Mb2dvLUhhdC1Db2xvcjwvdGl0bGU+PHBhdGggZD0iTTE1Ny43Nyw2Mi42MWExNCwxNCwwLDAsMSwuMzEsMy40MmMwLDE0Ljg4LTE4LjEsMTcuNDYtMzAuNjEsMTcuNDZDNzguODMsODMuNDksNDIuNTMsNTMuMjYsNDIuNTMsNDRhNi40Myw2LjQzLDAsMCwxLC4yMi0xLjk0bC0zLjY2LDkuMDZhMTguNDUsMTguNDUsMCwwLDAtMS41MSw3LjMzYzAsMTguMTEsNDEsNDUuNDgsODcuNzQsNDUuNDgsMjAuNjksMCwzNi40My03Ljc2LDM2LjQzLTIxLjc3LDAtMS4wOCwwLTEuOTQtMS43My0xMC4xM1oiLz48cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik0xMjcuNDcsODMuNDljMTIuNTEsMCwzMC42MS0yLjU4LDMwLjYxLTE3LjQ2YTE0LDE0LDAsMCwwLS4zMS0zLjQybC03LjQ1LTMyLjM2Yy0xLjcyLTcuMTItMy4yMy0xMC4zNS0xNS43My0xNi42QzEyNC44OSw4LjY5LDEwMy43Ni41LDk3LjUxLjUsOTEuNjkuNSw5MCw4LDgzLjA2LDhjLTYuNjgsMC0xMS42NC01LjYtMTcuODktNS42LTYsMC05LjkxLDQuMDktMTIuOTMsMTIuNSwwLDAtOC40MSwyMy43Mi05LjQ5LDI3LjE2QTYuNDMsNi40MywwLDAsMCw0Mi41Myw0NGMwLDkuMjIsMzYuMywzOS40NSw4NC45NCwzOS40NU0xNjAsNzIuMDdjMS43Myw4LjE5LDEuNzMsOS4wNSwxLjczLDEwLjEzLDAsMTQtMTUuNzQsMjEuNzctMzYuNDMsMjEuNzdDNzguNTQsMTA0LDM3LjU4LDc2LjYsMzcuNTgsNTguNDlhMTguNDUsMTguNDUsMCwwLDEsMS41MS03LjMzQzIyLjI3LDUyLC41LDU1LC41LDc0LjIyYzAsMzEuNDgsNzQuNTksNzAuMjgsMTMzLjY1LDcwLjI4LDQ1LjI4LDAsNTYuNy0yMC40OCw1Ni43LTM2LjY1LDAtMTIuNzItMTEtMjcuMTYtMzAuODMtMzUuNzgiLz48L3N2Zz4= mediatype: image/svg+xml - image: quay.io/ocs-dev/ocs-operator-catalog:latest + image: ghcr.io/teamziax/ocs-operator/ocs-operator-catalog:latest publisher: Red Hat sourceType: grpc --- diff --git a/deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml b/deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml index acb5656d9a..aa6f765587 100644 --- a/deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml +++ b/deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml @@ -56,7 +56,7 @@ metadata: ] capabilities: Deep Insights categories: Storage - containerImage: quay.io/ocs-dev/ocs-operator:4.15.0 + containerImage: ghcr.io/teamziax/ocs-operator/ocs-operator:4.15.0 description: Red Hat OpenShift Container Storage provides hyperconverged storage for applications within an OpenShift cluster. external.features.ocs.openshift.io/export-script: |- @@ -3081,12 +3081,12 @@ spec: - name: NOOBAA_DB_IMAGE value: docker.io/centos/postgresql-12-centos8 - name: PROVIDER_API_SERVER_IMAGE - value: quay.io/ocs-dev/ocs-operator:latest + value: ghcr.io/teamziax/ocs-operator/ocs-operator:latest - name: OPERATOR_NAMESPACE valueFrom: fieldRef: fieldPath: metadata.namespace - image: quay.io/ocs-dev/ocs-operator:latest + image: ghcr.io/teamziax/ocs-operator/ocs-operator:latest imagePullPolicy: Always name: ocs-operator readinessProbe: diff --git a/metrics/deploy/deployment.yaml b/metrics/deploy/deployment.yaml index 61b29a3cfe..299c9222bc 100644 --- a/metrics/deploy/deployment.yaml +++ b/metrics/deploy/deployment.yaml @@ -21,7 +21,7 @@ spec: app.kubernetes.io/version: 0.0.1 spec: containers: - - image: quay.io/ocs-dev/ocs-operator + - image: ghcr.io/teamziax/ocs-operator/ocs-operator name: ocs-metrics-exporter ports: - containerPort: 8080 diff --git a/tools/csv-merger/csv-merger.go b/tools/csv-merger/csv-merger.go index 8a89bf60ba..9e4e166d08 100644 --- a/tools/csv-merger/csv-merger.go +++ b/tools/csv-merger/csv-merger.go @@ -13,7 +13,6 @@ import ( "text/template" "time" - "github.com/blang/semver/v4" "github.com/ghodss/yaml" "github.com/operator-framework/api/pkg/lib/version" csvv1 "github.com/operator-framework/api/pkg/operators/v1alpha1" @@ -625,7 +624,7 @@ func generateUnifiedCSV() *csvv1.ClusterServiceVersion { } ocsCSV.Annotations["createdAt"] = time.Now().In(loc).Format("2006-01-02 15:04:05") } - ocsCSV.Annotations["containerImage"] = "quay.io/ocs-dev/ocs-operator:" + ocsversion.Version + ocsCSV.Annotations["containerImage"] = "ghcr.io/teamziax/ocs-operator/ocs-operator:" + ocsversion.Version ocsCSV.Annotations["capabilities"] = "Deep Insights" ocsCSV.Annotations["categories"] = "Storage" ocsCSV.Annotations["operators.operatorframework.io/operator-type"] = "non-standalone"