Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OCPVE-328: Update dev images to use the new lvms_dev registry #327

Merged
merged 1 commit into from
Apr 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions bundle/manifests/lvms-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion config/manager/manager.env
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/manifests/bases/clusterserviceversion.yaml.in
Original file line number Diff line number Diff line change
Expand Up @@ -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: |-
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: |-
Expand Down
4 changes: 2 additions & 2 deletions controllers/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ 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",
"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",

// 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")
Expand Down
2 changes: 1 addition & 1 deletion doc/usage/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions must-gather/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion olm-deploy/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down