Skip to content

Commit bcc92ab

Browse files
authored
Merge pull request #59 from davidz627/fix/prodContainers
Changed deploy yamls to prod version of container
2 parents 890790c + cf5dc31 commit bcc92ab

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

Makefile

+3-4
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
STAGINGIMAGE=${GCE_PD_CSI_STAGING_IMAGE}
1616
STAGINGVERSION=latest
1717

18-
PRODIMAGE=gcr.io/google-containers/volume-csi/compute-persistent-disk-csi-driver
19-
PRODVERSION=v0.2.0.alpha
18+
PRODIMAGE=gcr.io/google-containers/volume-csi/gcp-compute-persistent-disk-csi-driver
19+
PRODVERSION=v0.1.0.alpha
2020

2121
all: gce-pd-driver
2222

@@ -26,7 +26,6 @@ gce-pd-driver:
2626
go test -c sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/test/e2e -o bin/e2e.test
2727

2828
build-container:
29-
# TODO CHANGE PRODVERSION TO STAGINGVERSION AFTER TESTING
3029
docker build --build-arg TAG=$(STAGINGVERSION) -t $(STAGINGIMAGE):$(STAGINGVERSION) .
3130

3231
push-container: build-container
@@ -39,4 +38,4 @@ prod-push-container: prod-build-container
3938
gcloud docker -- push $(PRODIMAGE):$(PRODVERSION)
4039

4140
test-sanity: gce-pd-driver
42-
go test -timeout 30s sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/test -run ^TestSanity$
41+
go test -timeout 30s sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/test -run ^TestSanity$

deploy/kubernetes/controller.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ spec:
4242
mountPath: /csi
4343
- name: gce-pd-driver
4444
imagePullPolicy: Always
45-
image: gcr.io/dyzz-csi-staging/csi/gce-pd-driver:latest
45+
image: gcr.io/google-containers/volume-csi/gcp-compute-persistent-disk-csi-driver:v0.1.0.alpha
4646
args:
4747
- "--v=5"
4848
- "--endpoint=$(CSI_ENDPOINT)"

deploy/kubernetes/node.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ spec:
3636
securityContext:
3737
privileged: true
3838
imagePullPolicy: Always
39-
image: gcr.io/dyzz-csi-staging/csi/gce-pd-driver:latest
39+
image: gcr.io/google-containers/volume-csi/gcp-compute-persistent-disk-csi-driver:v0.1.0.alpha
4040
args:
4141
- "--v=5"
4242
- "--endpoint=$(CSI_ENDPOINT)"
@@ -73,4 +73,4 @@ spec:
7373
- name: device-dir
7474
hostPath:
7575
path: /dev
76-
type: Directory
76+
type: Directory

pkg/gce-pd-csi-driver/controller_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ func TestDeleteVolume(t *testing.T) {
213213
req: &csi.DeleteVolumeRequest{
214214
VolumeId: testVolumeId + "/foo",
215215
},
216-
expErr: true,
216+
expErr: false,
217217
},
218218
}
219219
for _, tc := range testCases {

0 commit comments

Comments
 (0)