Skip to content

Commit 6c599dd

Browse files
committed
Revert stable-master/image.yaml to master version
1 parent 4fc1f45 commit 6c599dd

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

deploy/kubernetes/images/stable-master/image.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,8 @@ metadata:
4444
name: imagetag-gcepd-driver
4545
imageTag:
4646
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-
=======
5247
# pdImagePlaceholder in test/k8s-integration/main.go is updated automatically with the newTag
5348
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)
5549
newTag: "latest"
5650
---
5751

0 commit comments

Comments
 (0)