Skip to content

Move Windows deployment to stable overlay #701

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 1 commit into from
Feb 10, 2021
Merged

Move Windows deployment to stable overlay #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions deploy/kubernetes/base/node_linux/node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ spec:
args:
- "--v=5"
- "--endpoint=unix:/csi/csi.sock"
- "--run-controller-service=false"
securityContext:
privileged: true
volumeMounts:
Expand Down
14 changes: 4 additions & 10 deletions deploy/kubernetes/base/node_windows/node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ metadata:
spec:
selector:
matchLabels:
app: gcp-compute-persistent-disk-csi-driver-win
app: gcp-compute-persistent-disk-csi-driver
template:
metadata:
labels:
app: gcp-compute-persistent-disk-csi-driver-win
app: gcp-compute-persistent-disk-csi-driver
spec:
# Host network must be used for interaction with Workload Identity in GKE
# since it replaces GCE Metadata Server with GKE Metadata Server. Remove
Expand All @@ -24,7 +24,7 @@ spec:
kubernetes.io/os: windows
containers:
- name: csi-driver-registrar
image: gke.gcr.io/k8s-staging-csi/csi-node-driver-registrar-win
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you explain why we don't have to use a windows image for the registrar? Do we have a multi-arch build or something like that?

(and ditto for the driver image)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

right, both container images support multi-arch build now.

args:
- --v=5
- --csi-address=unix://C:\\csi\\csi.sock
Expand All @@ -46,26 +46,20 @@ spec:
args:
- "--v=5"
- "--endpoint=unix:/csi/csi.sock"
- "--run-controller-service=false"
volumeMounts:
- name: kubelet-dir
mountPath: C:\var\lib\kubelet
mountPropagation: "None"
- name: plugin-dir
mountPath: C:\csi
# TODO: check overlay and remove v1beta1 if it is safe
- name: csi-proxy-disk-v1beta1
mountPath: \\.\pipe\csi-proxy-disk-v1beta1
- name: csi-proxy-volume-v1beta1
mountPath: \\.\pipe\csi-proxy-volume-v1beta1
- name: csi-proxy-filesystem-v1beta1
mountPath: \\.\pipe\csi-proxy-filesystem-v1beta1
- name: csi-proxy-disk-v1beta2
mountPath: \\.\pipe\csi-proxy-disk-v1beta2
volumes:
- name: csi-proxy-disk-v1beta1
hostPath:
path: \\.\pipe\csi-proxy-disk-v1beta1
type: ""
- name: csi-proxy-disk-v1beta2
hostPath:
path: \\.\pipe\csi-proxy-disk-v1beta2
Expand Down
8 changes: 3 additions & 5 deletions deploy/kubernetes/images/alpha/image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,13 @@ metadata:
name: imagetag-gcepd-driver-alpha-win
imageTag:
name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver
newName: gcr.io/gke-release-staging/gcp-compute-persistent-disk-csi-driver
newTag: "v1.0.1-gke.9"
newTag: "v1.2.0-gke.8"
---

apiVersion: builtin
kind: ImageTagTransformer
metadata:
name: imagetag-node-registrar-win
imageTag:
name: gke.gcr.io/k8s-staging-csi/csi-node-driver-registrar-win
newName: gcr.io/k8s-staging-csi/csi-node-driver-registrar
newTag: "amd64-windows-canary"
name: k8s.gcr.io/sig-storage/csi-node-driver-registrar
newTag: "v2.1.0"
2 changes: 1 addition & 1 deletion deploy/kubernetes/images/stable/image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ imageTag:
name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver
# Don't change stable image without changing pdImagePlaceholder in
# test/k8s-integration/main.go
newTag: "v1.2.0-gke.0"
newTag: "v1.2.0-gke.8"
---
3 changes: 1 addition & 2 deletions deploy/kubernetes/overlays/stable/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ kind: Kustomization
namespace:
gce-pd-csi-driver
resources:
- ../../base/controller
- ../../base/node_linux
- ../../base/
transformers:
- ../../images/stable
2 changes: 1 addition & 1 deletion test/run-windows-k8s-integration.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ set -o nounset
set -o errexit

readonly PKGDIR=${GOPATH}/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver
readonly overlay_name="${GCE_PD_OVERLAY_NAME:-alpha}"
readonly overlay_name="${GCE_PD_OVERLAY_NAME:-stable}"
readonly do_driver_build="${GCE_PD_DO_DRIVER_BUILD:-true}"
readonly deployment_strategy=${DEPLOYMENT_STRATEGY:-gce}
readonly test_version=${TEST_VERSION:-master}
Expand Down