File tree Expand file tree Collapse file tree 1 file changed +0
-6
lines changed
deploy/kubernetes/images/stable-master Expand file tree Collapse file tree 1 file changed +0
-6
lines changed Original file line number Diff line number Diff line change @@ -44,14 +44,8 @@ metadata:
44
44
name : imagetag-gcepd-driver
45
45
imageTag :
46
46
name : gke.gcr.io/gcp-compute-persistent-disk-csi-driver
47
- <<<<<<< HEAD
48
- # Don't change stable image without changing pdImagePlaceholder in
49
- # test/k8s-integration/main.go
50
- newName : us-central1-docker.pkg.dev/enginakdemir-gke-dev/csi-dev/gcp-compute-persistent-disk-csi-driver
51
- =======
52
47
# pdImagePlaceholder in test/k8s-integration/main.go is updated automatically with the newTag
53
48
newName : us-central1-docker.pkg.dev/juliankatz-joonix/csi-dev/gcp-compute-persistent-disk-csi-driver
54
- >>>>>>> 264b82ed (New implementation that is hooked into nodestage/unstage. Just linux)
55
49
newTag : " latest"
56
50
---
57
51
You can’t perform that action at this time.
0 commit comments