Skip to content

Commit bbd5817

Browse files
committed
Add dev-gke-noauth overlay that allows dev version of driver to be deployed
1 parent 2ec1e10 commit bbd5817

File tree

11 files changed

+123
-12
lines changed

11 files changed

+123
-12
lines changed

cmd/gce-pd-csi-driver/main.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,9 @@ var (
9494

9595
extraTagsStr = flag.String("extra-tags", "", "Extra tags to attach to each Compute Disk, Image, Snapshot created. It is a comma separated list of parent id, key and value like '<parent_id1>/<tag_key1>/<tag_value1>,...,<parent_idN>/<tag_keyN>/<tag_valueN>'. parent_id is the Organization or the Project ID or Project name where the tag key and the tag value resources exist. A maximum of 50 tags bindings is allowed for a resource. See https://cloud.google.com/resource-manager/docs/tags/tags-overview, https://cloud.google.com/resource-manager/docs/tags/tags-creating-and-managing for details")
9696

97-
version string
98-
)
97+
driverName = flag.String("driver-name", "pd.csi.storage.gke.io", "Driver name. Defaults to pd.csi.storage.gke.io")
9998

100-
const (
101-
driverName = "pd.csi.storage.gke.io"
99+
version string
102100
)
103101

104102
func init() {
@@ -150,7 +148,7 @@ func handle() {
150148

151149
var metricsManager *metrics.MetricsManager = nil
152150
if *runControllerService && *httpEndpoint != "" {
153-
mm := metrics.NewMetricsManager()
151+
mm := metrics.NewMetricsManager(*driverName)
154152
mm.InitializeHttpHandler(*httpEndpoint, *metricsPath)
155153
mm.RegisterPDCSIMetric()
156154

@@ -272,7 +270,7 @@ func handle() {
272270
}
273271
}
274272

275-
err = gceDriver.SetupGCEDriver(driverName, version, extraVolumeLabels, extraTags, identityServer, controllerServer, nodeServer)
273+
err = gceDriver.SetupGCEDriver(*driverName, version, extraVolumeLabels, extraTags, identityServer, controllerServer, nodeServer)
276274
if err != nil {
277275
klog.Fatalf("Failed to initialize GCE CSI Driver: %v", err.Error())
278276
}

deploy/kubernetes/base/controller/controller.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
# since it replaces GCE Metadata Server with GKE Metadata Server. Remove
1717
# this requirement when issue is resolved and before any exposure of
1818
# metrics ports
19-
hostNetwork: true
19+
hostNetwork: false
2020
nodeSelector:
2121
kubernetes.io/os: linux
2222
serviceAccountName: csi-gce-pd-controller-sa
@@ -145,6 +145,9 @@ spec:
145145
- "--supports-dynamic-iops-provisioning=hyperdisk-balanced,hyperdisk-extreme"
146146
- "--supports-dynamic-throughput-provisioning=hyperdisk-balanced,hyperdisk-throughput,hyperdisk-ml"
147147
- --enable-data-cache
148+
- --run-node-service=false
149+
- --multi-zone-volume-handle-disk-types=hyperdisk-ml
150+
- --multi-zone-volume-handle-enable
148151
command:
149152
- /gce-pd-csi-driver
150153
env:
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
kind: Deployment
2+
apiVersion: apps/v1
3+
metadata:
4+
name: csi-gce-pd-controller
5+
spec:
6+
template:
7+
spec:
8+
containers:
9+
- name: gce-pd-driver
10+
imagePullPolicy: Always
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
- op: replace
2+
path: /metadata/name
3+
value: pd.dev.csi.storage.gke.io
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
- op: add
2+
path: /spec/template/spec/containers/0/args/-
3+
value: --driver-name=pd.dev.csi.storage.gke.io
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
patchesStrategicMerge:
4+
- controller_always_pull.yaml
5+
- node_always_pull.yaml
6+
- noauth.yaml
7+
- node_overwrite_pdcsi_path.yaml
8+
namespace: gce-pd-csi-driver
9+
resources:
10+
- ../../base/
11+
# Here dev overlay is using the same image as alpha
12+
transformers:
13+
- ../../images/stable-master
14+
# Apply patches to support dynamic provisioning for hyperdisks
15+
patches:
16+
- path: ./driver-args.yaml
17+
target:
18+
group: apps
19+
version: v1
20+
kind: Deployment
21+
name: csi-gce-pd-controller
22+
- path: ./node-driver-args.yaml
23+
target:
24+
group: apps
25+
version: v1
26+
kind: DaemonSet
27+
name: csi-gce-pd-node
28+
- path: ./csidriver_dev_name.yaml
29+
target:
30+
kind: CSIDriver
31+
name: pd.csi.storage.gke.io
32+
# To change the dev image, add something like the following.
33+
images:
34+
- name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver
35+
newName: us-central1-docker.pkg.dev/psch-gke-dev/csi-dev/gcp-compute-persistent-disk-csi-driver
36+
newTag: latest
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
kind: Deployment
2+
apiVersion: apps/v1
3+
metadata:
4+
name: csi-gce-pd-controller
5+
spec:
6+
template:
7+
spec:
8+
containers:
9+
- name: gce-pd-driver
10+
env:
11+
- $patch: delete
12+
name: GOOGLE_APPLICATION_CREDENTIALS
13+
value: "/etc/cloud-sa/cloud-sa.json"
14+
volumeMounts:
15+
- $patch: delete
16+
name: cloud-sa-volume
17+
readOnly: true
18+
mountPath: "/etc/cloud-sa"
19+
volumes:
20+
- $patch: delete
21+
name: cloud-sa-volume
22+
secret:
23+
secretName: cloud-sa
24+
25+
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
- op: add
2+
path: /spec/template/spec/containers/1/args/-
3+
value: --driver-name=pd.dev.csi.storage.gke.io
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
kind: DaemonSet
2+
apiVersion: apps/v1
3+
metadata:
4+
name: csi-gce-pd-node
5+
spec:
6+
template:
7+
spec:
8+
containers:
9+
- name: gce-pd-driver
10+
imagePullPolicy: Always
11+
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
kind: DaemonSet
2+
apiVersion: apps/v1
3+
metadata:
4+
name: csi-gce-pd-node
5+
spec:
6+
template:
7+
spec:
8+
containers:
9+
- name: csi-driver-registrar
10+
args:
11+
- "--v=5"
12+
- "--csi-address=/csi/csi.sock"
13+
- "--kubelet-registration-path=/var/lib/kubelet/plugins/pd.dev.csi.storage.gke.io/csi.sock"
14+
volumes:
15+
- name: plugin-dir
16+
hostPath:
17+
path: /var/lib/kubelet/plugins/pd.dev.csi.storage.gke.io/
18+
type: DirectoryOrCreate

0 commit comments

Comments
 (0)