From 0c8675347be7b5c4a77379c4d3558751f87ec74e Mon Sep 17 00:00:00 2001 From: Suleyman Akbas Date: Fri, 21 Apr 2023 15:00:31 +0200 Subject: [PATCH] chore: update dev images Signed-off-by: Suleyman Akbas --- Makefile | 6 +++--- bundle/manifests/lvms-operator.clusterserviceversion.yaml | 8 ++++---- config/manager/manager.env | 2 +- config/manifests/bases/clusterserviceversion.yaml.in | 2 +- .../bases/lvms-operator.clusterserviceversion.yaml | 2 +- controllers/defaults.go | 4 ++-- doc/usage/install.md | 2 +- must-gather/README.md | 4 ++-- olm-deploy/kustomization.yaml | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index c9d4e81f8..937ad4b58 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ BUNDLE_PACKAGE ?= lvms-operator # Image URL to use all building/pushing image targets IMAGE_REGISTRY ?= quay.io -REGISTRY_NAMESPACE ?= ocs-dev +REGISTRY_NAMESPACE ?= lvms_dev IMAGE_TAG ?= latest IMAGE_NAME ?= lvms-operator VGMANAGER_IMAGE_NAME ?= vgmanager @@ -120,13 +120,13 @@ test: manifests generate fmt vet envtest godeps-update ## Run tests. OPERATOR_NAMESPACE ?= openshift-storage -TOPOLVM_CSI_IMAGE ?= quay.io/ocs-dev/topolvm:latest +TOPOLVM_CSI_IMAGE ?= quay.io/lvms_dev/topolvm:latest CSI_REGISTRAR_IMAGE ?= k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.6.2 CSI_PROVISIONER_IMAGE ?= k8s.gcr.io/sig-storage/csi-provisioner:v3.3.0 CSI_LIVENESSPROBE_IMAGE ?= k8s.gcr.io/sig-storage/livenessprobe:v2.8.0 CSI_RESIZER_IMAGE ?= k8s.gcr.io/sig-storage/csi-resizer:v1.6.0 CSI_SNAPSHOTTER_IMAGE ?= k8s.gcr.io/sig-storage/csi-snapshotter:v6.1.0 -VGMANAGER_IMAGE ?= quay.io/ocs-dev/vgmanager:latest +VGMANAGER_IMAGE ?= quay.io/lvms_dev/vgmanager:latest define MANAGER_ENV_VARS diff --git a/bundle/manifests/lvms-operator.clusterserviceversion.yaml b/bundle/manifests/lvms-operator.clusterserviceversion.yaml index 84d302caf..7ba894753 100644 --- a/bundle/manifests/lvms-operator.clusterserviceversion.yaml +++ b/bundle/manifests/lvms-operator.clusterserviceversion.yaml @@ -29,7 +29,7 @@ metadata: ] capabilities: Basic Install categories: Storage - containerImage: quay.io/ocs-dev/lvms-operator:latest + containerImage: quay.io/lvms_dev/lvms-operator:latest description: Logical volume manager storage provides dynamically provisioned local storage for container workloads olm.skipRange: "" @@ -551,7 +551,7 @@ spec: - /manager env: - name: TOPOLVM_CSI_IMAGE - value: quay.io/ocs-dev/topolvm:latest + value: quay.io/lvms_dev/topolvm:latest - name: CSI_LIVENESSPROBE_IMAGE value: k8s.gcr.io/sig-storage/livenessprobe:v2.8.0 - name: CSI_PROVISIONER_IMAGE @@ -570,7 +570,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.name - image: quay.io/ocs-dev/lvms-operator:latest + image: quay.io/lvms_dev/lvms-operator:latest livenessProbe: httpGet: path: /healthz @@ -615,7 +615,7 @@ spec: memory: 20Mi - command: - /metricsexporter - image: quay.io/ocs-dev/lvms-operator:latest + image: quay.io/lvms_dev/lvms-operator:latest name: metricsexporter resources: requests: diff --git a/config/manager/manager.env b/config/manager/manager.env index 4444414d9..5e5aee5bc 100644 --- a/config/manager/manager.env +++ b/config/manager/manager.env @@ -1,5 +1,5 @@ OPERATOR_NAMESPACE=openshift-storage -TOPOLVM_CSI_IMAGE=quay.io/ocs-dev/topolvm:latest +TOPOLVM_CSI_IMAGE=quay.io/lvms_dev/topolvm:latest CSI_REGISTRAR_IMAGE=k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.6.2 CSI_PROVISIONER_IMAGE=k8s.gcr.io/sig-storage/csi-provisioner:v3.3.0 CSI_LIVENESSPROBE_IMAGE=k8s.gcr.io/sig-storage/livenessprobe:v2.8.0 diff --git a/config/manifests/bases/clusterserviceversion.yaml.in b/config/manifests/bases/clusterserviceversion.yaml.in index 0fb98023b..4ddda5988 100644 --- a/config/manifests/bases/clusterserviceversion.yaml.in +++ b/config/manifests/bases/clusterserviceversion.yaml.in @@ -5,7 +5,7 @@ metadata: alm-examples: '[]' capabilities: Basic Install categories: Storage - containerImage: quay.io/ocs-dev/lvms-operator:latest + containerImage: quay.io/lvms_dev/lvms-operator:latest description: Logical volume manager storage provides dynamically provisioned local storage for container workloads operatorframework.io/cluster-monitoring: "true" operatorframework.io/initialization-resource: |- diff --git a/config/manifests/bases/lvms-operator.clusterserviceversion.yaml b/config/manifests/bases/lvms-operator.clusterserviceversion.yaml index 1f8071788..ccacb9126 100644 --- a/config/manifests/bases/lvms-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/lvms-operator.clusterserviceversion.yaml @@ -5,7 +5,7 @@ metadata: alm-examples: '[]' capabilities: Basic Install categories: Storage - containerImage: quay.io/ocs-dev/lvms-operator:latest + containerImage: quay.io/lvms_dev/lvms-operator:latest description: Logical volume manager storage provides dynamically provisioned local storage for container workloads operatorframework.io/cluster-monitoring: "true" operatorframework.io/initialization-resource: |- diff --git a/controllers/defaults.go b/controllers/defaults.go index 5b89e2685..975ef53f0 100644 --- a/controllers/defaults.go +++ b/controllers/defaults.go @@ -23,7 +23,7 @@ import ( var ( defaultValMap = map[string]string{ "OPERATOR_NAMESPACE": "openshift-storage", - "TOPOLVM_CSI_IMAGE": "quay.io/ocs-dev/topolvm:latest", + "TOPOLVM_CSI_IMAGE": "quay.io/lvms_dev/topolvm:latest", "CSI_REGISTRAR_IMAGE": "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.6.2", "CSI_PROVISIONER_IMAGE": "k8s.gcr.io/sig-storage/csi-provisioner:v3.3.0", "CSI_LIVENESSPROBE_IMAGE": "k8s.gcr.io/sig-storage/livenessprobe:v2.8.0", @@ -31,7 +31,7 @@ var ( "CSI_SNAPSHOTTER_IMAGE": "k8s.gcr.io/sig-storage/csi-snapshotter:v6.1.0", // not being used, only for reference - "VGMANAGER_IMAGE": "quay.io/ocs-dev/vgmanager:latest", + "VGMANAGER_IMAGE": "quay.io/lvms_dev/vgmanager:latest", } OperatorNamespace = GetEnvOrDefault("OPERATOR_NAMESPACE") diff --git a/doc/usage/install.md b/doc/usage/install.md index 32d98a629..39c702760 100644 --- a/doc/usage/install.md +++ b/doc/usage/install.md @@ -29,7 +29,7 @@ When this is finished, you are ready to continue with the deploy steps If you are ok with using the prebuilt images, then just set your variable like this: ``` -export IMG=quay.io/ocs-dev/lvms-operator +export IMG=quay.io/lvms_dev/lvms-operator ``` ## Deploy diff --git a/must-gather/README.md b/must-gather/README.md index eeba026b4..d5f546ae2 100644 --- a/must-gather/README.md +++ b/must-gather/README.md @@ -6,7 +6,7 @@ that expands its capabilities to gather LVM Operator information. ### Usage ```sh -oc adm must-gather --image=quay.io/ocs-dev/lvm-must-gather:latest +oc adm must-gather --image=quay.io/lvms_dev/lvm-must-gather:latest ``` The command above will create a local directory with a dump of the lvm state. @@ -33,7 +33,7 @@ Developers must follow these steps to make a change: To test the changes in must-gather follow these steps: 1. Run `make lvm-must-gather` -2. It will create an image named `quay.io/ocs-dev/lvm-must-gather:latest` +2. It will create an image named `quay.io/lvms_dev/lvm-must-gather:latest` 3. Tag it and push it to your image repository to use it with the `oc adm` command #### Commit and Pull Request Messages diff --git a/olm-deploy/kustomization.yaml b/olm-deploy/kustomization.yaml index f8e416f59..2622d63d6 100644 --- a/olm-deploy/kustomization.yaml +++ b/olm-deploy/kustomization.yaml @@ -14,7 +14,7 @@ configurations: # replace catalogsource image images: - name: catalog-img - newName: quay.io/ocs-dev/lvms-operator-catalog + newName: quay.io/lvms_dev/lvms-operator-catalog newTag: latest patches: