Skip to content

Changed deploy yamls to prod version of container #59

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jul 11, 2018
Merged

Changed deploy yamls to prod version of container #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e24dca
Changed deploy yamls to prod version of container
davidz627 Jul 11, 2018
cf5dc31
fix straggler DeleteVolume unit test
davidz627 Jul 11, 2018
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
7 changes: 3 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
STAGINGIMAGE=${GCE_PD_CSI_STAGING_IMAGE}
STAGINGVERSION=latest

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

all: gce-pd-driver

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

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

push-container: build-container
Expand All @@ -39,4 +38,4 @@ prod-push-container: prod-build-container
gcloud docker -- push $(PRODIMAGE):$(PRODVERSION)

test-sanity: gce-pd-driver
go test -timeout 30s sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/test -run ^TestSanity$
go test -timeout 30s sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/test -run ^TestSanity$
2 changes: 1 addition & 1 deletion deploy/kubernetes/controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ spec:
mountPath: /csi
- name: gce-pd-driver
imagePullPolicy: Always
image: gcr.io/dyzz-csi-staging/csi/gce-pd-driver:latest
image: gcr.io/google-containers/volume-csi/gcp-compute-persistent-disk-csi-driver:v0.1.0.alpha
args:
- "--v=5"
- "--endpoint=$(CSI_ENDPOINT)"
Expand Down
4 changes: 2 additions & 2 deletions deploy/kubernetes/node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
securityContext:
privileged: true
imagePullPolicy: Always
image: gcr.io/dyzz-csi-staging/csi/gce-pd-driver:latest
image: gcr.io/google-containers/volume-csi/gcp-compute-persistent-disk-csi-driver:v0.1.0.alpha
args:
- "--v=5"
- "--endpoint=$(CSI_ENDPOINT)"
Expand Down Expand Up @@ -73,4 +73,4 @@ spec:
- name: device-dir
hostPath:
path: /dev
type: Directory
type: Directory
2 changes: 1 addition & 1 deletion pkg/gce-pd-csi-driver/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ func TestDeleteVolume(t *testing.T) {
req: &csi.DeleteVolumeRequest{
VolumeId: testVolumeId + "/foo",
},
expErr: true,
expErr: false,
},
}
for _, tc := range testCases {
Expand Down