fix: refer to test-branch in ds topolvm

Signed-off-by: Santosh Pillai <[email protected]>
openshift · Apr 27, 2022 · 1bd9c1d · 1bd9c1d
1 parent 373c7e1
commit 1bd9c1d
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -105,7 +105,7 @@ test: manifests generate fmt vet envtest ## Run tests.
 
 
 OPERATOR_NAMESPACE ?= openshift-storage
-TOPOLVM_CSI_IMAGE ?= quay.io/topolvm/topolvm:0.11.0
+TOPOLVM_CSI_IMAGE ?= quay.io/sp1098/topolvm:test-branch
 CSI_REGISTRAR_IMAGE ?= k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0
 CSI_PROVISIONER_IMAGE ?= k8s.gcr.io/sig-storage/csi-provisioner:v3.0.0
 CSI_LIVENESSPROBE_IMAGE ?= k8s.gcr.io/sig-storage/livenessprobe:v2.5.0
@@ -318,4 +318,3 @@ e2e-test: ginkgo
 	@echo "build and run e2e tests"
 	cd e2e/lvm && $(GINKGO) build
 	cd e2e/lvm && ./lvm.test --lvm-catalog-image=$(CATALOG_IMG) --lvm-subscription-channel=$(SUBSCRIPTION_CHANNEL) --lvm-operator-install=$(LVM_OPERATOR_INSTALL) --lvm-operator-uninstall=$(LVM_OPERATOR_UNINSTALL) -ginkgo.v
-
diff --git a/bundle/manifests/lvm-operator-manager-config_v1_configmap.yaml b/bundle/manifests/lvm-operator-manager-config_v1_configmap.yaml
@@ -5,7 +5,7 @@ data:
   CSI_REGISTRAR_IMAGE: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0
   CSI_RESIZER_IMAGE: k8s.gcr.io/sig-storage/csi-resizer:v1.3.0
   OPERATOR_NAMESPACE: openshift-storage
-  TOPOLVM_CSI_IMAGE: quay.io/topolvm/topolvm:0.11.0
+  TOPOLVM_CSI_IMAGE: quay.io/sp1098/topolvm:test-branch
   VGMANAGER_IMAGE: quay.io/ocs-dev/vgmanager:latest
   controller_manager_config.yaml: |
     apiVersion: controller-runtime.sigs.k8s.io/v1alpha1

diff --git a/bundle/manifests/lvm-operator.clusterserviceversion.yaml b/bundle/manifests/lvm-operator.clusterserviceversion.yaml
@@ -256,7 +256,7 @@ spec:
                 - /manager
                 env:
                 - name: TOPOLVM_CSI_IMAGE
-                  value: quay.io/topolvm/topolvm:0.11.0
+                  value: quay.io/sp1098/topolvm:test-branch
                 - name: CSI_LIVENESSPROBE_IMAGE
                   value: k8s.gcr.io/sig-storage/livenessprobe:v2.5.0
                 - name: CSI_PROVISIONER_IMAGE

diff --git a/config/manager/manager.env b/config/manager/manager.env
@@ -1,5 +1,5 @@
 OPERATOR_NAMESPACE=openshift-storage
-TOPOLVM_CSI_IMAGE=quay.io/topolvm/topolvm:0.11.0
+TOPOLVM_CSI_IMAGE=quay.io/sp1098/topolvm:test-branch
 CSI_REGISTRAR_IMAGE=k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0
 CSI_PROVISIONER_IMAGE=k8s.gcr.io/sig-storage/csi-provisioner:v3.0.0
 CSI_LIVENESSPROBE_IMAGE=k8s.gcr.io/sig-storage/livenessprobe:v2.5.0

diff --git 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/topolvm/topolvm:0.11.0",
+		"TOPOLVM_CSI_IMAGE":       "quay.io/sp1098/topolvm:test-branch",
 		"CSI_REGISTRAR_IMAGE":     "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0",
 		"CSI_PROVISIONER_IMAGE":   "k8s.gcr.io/sig-storage/csi-provisioner:v3.0.0",
 		"CSI_LIVENESSPROBE_IMAGE": "k8s.gcr.io/sig-storage/livenessprobe:v2.5.0",

diff --git a/go.mod b/go.mod
@@ -101,3 +101,5 @@ require (
 	sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
 )
+
+replace github.com/topolvm/topolvm => github.com/red-hat-storage/topolvm v0.11.1-0.20220425050839-8ff4ca7a611e
diff --git a/go.sum b/go.sum
@@ -536,6 +536,8 @@ github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/pseudomuto/protoc-gen-doc v1.5.0 h1:pHZp0MEiT68jrZV8js8BS7E9ZEnlSLegoQbbtXj5lfo=
 github.com/pseudomuto/protokit v0.2.0 h1:hlnBDcy3YEDXH7kc9gV+NLaN0cDzhDvD1s7Y6FZ8RpM=
+github.com/red-hat-storage/topolvm v0.11.1-0.20220425050839-8ff4ca7a611e h1:K/idNgFK5TTDVRn9XQ/ChL7GkPxz04luare5iu3ofCA=
+github.com/red-hat-storage/topolvm v0.11.1-0.20220425050839-8ff4ca7a611e/go.mod h1:gCCDo47Ay4+jCBZD8BoUVpPxtMBvVWydW93ggV8NSrE=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
@@ -597,8 +599,6 @@ github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
-github.com/topolvm/topolvm v0.11.0 h1:pXIR9PfR345tMVA5V6QM4o3dNlykIT5w50QdlGLByGY=
-github.com/topolvm/topolvm v0.11.0/go.mod h1:gCCDo47Ay4+jCBZD8BoUVpPxtMBvVWydW93ggV8NSrE=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=