Upgrade DO CSI driver to 4.2.0

This commit is contained in:
Peter Rifel 2022-07-18 23:10:48 -06:00
parent f508f71881
commit 40268c1342
No known key found for this signature in database
GPG Key ID: BC6469E5B16DB2B6
1 changed files with 75 additions and 29 deletions

View File

@ -26,8 +26,8 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:
controller-gen.kubebuilder.io/version: v0.4.0 controller-gen.kubebuilder.io/version: v0.8.0
api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/419" api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/665"
creationTimestamp: null creationTimestamp: null
name: volumesnapshotclasses.snapshot.storage.k8s.io name: volumesnapshotclasses.snapshot.storage.k8s.io
spec: spec:
@ -36,6 +36,9 @@ spec:
kind: VolumeSnapshotClass kind: VolumeSnapshotClass
listKind: VolumeSnapshotClassList listKind: VolumeSnapshotClassList
plural: volumesnapshotclasses plural: volumesnapshotclasses
shortNames:
- vsclass
- vsclasses
singular: volumesnapshotclass singular: volumesnapshotclass
scope: Cluster scope: Cluster
versions: versions:
@ -127,7 +130,7 @@ spec:
- deletionPolicy - deletionPolicy
- driver - driver
type: object type: object
served: true served: false
storage: false storage: false
subresources: {} subresources: {}
status: status:
@ -143,8 +146,8 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:
controller-gen.kubebuilder.io/version: v0.4.0 controller-gen.kubebuilder.io/version: v0.8.0
api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/419" api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/665"
creationTimestamp: null creationTimestamp: null
name: volumesnapshotcontents.snapshot.storage.k8s.io name: volumesnapshotcontents.snapshot.storage.k8s.io
spec: spec:
@ -153,6 +156,9 @@ spec:
kind: VolumeSnapshotContent kind: VolumeSnapshotContent
listKind: VolumeSnapshotContentList listKind: VolumeSnapshotContentList
plural: volumesnapshotcontents plural: volumesnapshotcontents
shortNames:
- vsc
- vscs
singular: volumesnapshotcontent singular: volumesnapshotcontent
scope: Cluster scope: Cluster
versions: versions:
@ -224,6 +230,12 @@ spec:
oneOf: oneOf:
- required: ["snapshotHandle"] - required: ["snapshotHandle"]
- required: ["volumeHandle"] - required: ["volumeHandle"]
sourceVolumeMode:
description: SourceVolumeMode is the mode of the volume whose snapshot
is taken. Can be either “Filesystem” or “Block”. If not specified,
it indicates the source volume's mode is unknown. This field is
immutable. This field is an alpha field.
type: string
volumeSnapshotClassName: volumeSnapshotClassName:
description: name of the VolumeSnapshotClass from which this snapshot was (or will be) created. Note that after provisioning, the VolumeSnapshotClass may be deleted or recreated with different set of values, and as such, should not be referenced post-snapshot creation. description: name of the VolumeSnapshotClass from which this snapshot was (or will be) created. Note that after provisioning, the VolumeSnapshotClass may be deleted or recreated with different set of values, and as such, should not be referenced post-snapshot creation.
type: string type: string
@ -432,7 +444,7 @@ spec:
required: required:
- spec - spec
type: object type: object
served: true served: false
storage: false storage: false
subresources: subresources:
status: {} status: {}
@ -449,8 +461,8 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:
controller-gen.kubebuilder.io/version: v0.4.0 controller-gen.kubebuilder.io/version: v0.8.0
api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/419" api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/665"
creationTimestamp: null creationTimestamp: null
name: volumesnapshots.snapshot.storage.k8s.io name: volumesnapshots.snapshot.storage.k8s.io
spec: spec:
@ -459,6 +471,8 @@ spec:
kind: VolumeSnapshot kind: VolumeSnapshot
listKind: VolumeSnapshotList listKind: VolumeSnapshotList
plural: volumesnapshots plural: volumesnapshots
shortNames:
- vs
singular: volumesnapshot singular: volumesnapshot
scope: Namespaced scope: Namespaced
versions: versions:
@ -538,7 +552,7 @@ spec:
format: date-time format: date-time
type: string type: string
error: error:
description: error is the last observed error during snapshot creation, if any. This field could be helpful to upper level controllers(i.e., application controller) to decide whether they should continue on waiting for the snapshot to be created based on the type of error reported. The snapshot controller will keep retrying when an error occurrs during the snapshot creation. Upon success, this error field will be cleared. description: error is the last observed error during snapshot creation, if any. This field could be helpful to upper level controllers(i.e., application controller) to decide whether they should continue on waiting for the snapshot to be created based on the type of error reported. The snapshot controller will keep retrying when an error occurs during the snapshot creation. Upon success, this error field will be cleared.
properties: properties:
message: message:
description: 'message is a string detailing the encountered error during snapshot creation if specified. NOTE: message may be logged, and it should not contain sensitive information.' description: 'message is a string detailing the encountered error during snapshot creation if specified. NOTE: message may be logged, and it should not contain sensitive information.'
@ -642,7 +656,7 @@ spec:
format: date-time format: date-time
type: string type: string
error: error:
description: error is the last observed error during snapshot creation, if any. This field could be helpful to upper level controllers(i.e., application controller) to decide whether they should continue on waiting for the snapshot to be created based on the type of error reported. The snapshot controller will keep retrying when an error occurrs during the snapshot creation. Upon success, this error field will be cleared. description: error is the last observed error during snapshot creation, if any. This field could be helpful to upper level controllers(i.e., application controller) to decide whether they should continue on waiting for the snapshot to be created based on the type of error reported. The snapshot controller will keep retrying when an error occurs during the snapshot creation. Upon success, this error field will be cleared.
properties: properties:
message: message:
description: 'message is a string detailing the encountered error during snapshot creation if specified. NOTE: message may be logged, and it should not contain sensitive information.' description: 'message is a string detailing the encountered error during snapshot creation if specified. NOTE: message may be logged, and it should not contain sensitive information.'
@ -664,7 +678,7 @@ spec:
required: required:
- spec - spec
type: object type: object
served: true served: false
storage: false storage: false
subresources: subresources:
status: {} status: {}
@ -725,6 +739,39 @@ allowVolumeExpansion: true
--- ---
kind: StorageClass
apiVersion: storage.k8s.io/v1
metadata:
name: do-block-storage-retain
provisioner: dobs.csi.digitalocean.com
reclaimPolicy: Retain
allowVolumeExpansion: true
---
kind: StorageClass
apiVersion: storage.k8s.io/v1
metadata:
name: do-block-storage-xfs
provisioner: dobs.csi.digitalocean.com
parameters:
fstype: xfs
allowVolumeExpansion: true
---
kind: StorageClass
apiVersion: storage.k8s.io/v1
metadata:
name: do-block-storage-xfs-retain
provisioner: dobs.csi.digitalocean.com
parameters:
fstype: xfs
reclaimPolicy: Retain
allowVolumeExpansion: true
---
############################################## ##############################################
########### ############ ########### ############
########### Controller plugin ############ ########### Controller plugin ############
@ -754,7 +801,7 @@ spec:
serviceAccount: csi-do-controller-sa serviceAccount: csi-do-controller-sa
containers: containers:
- name: csi-provisioner - name: csi-provisioner
image: k8s.gcr.io/sig-storage/csi-provisioner:v3.0.0 image: k8s.gcr.io/sig-storage/csi-provisioner:v3.2.1
args: args:
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
- "--default-fstype=ext4" - "--default-fstype=ext4"
@ -767,10 +814,12 @@ spec:
- name: socket-dir - name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/ mountPath: /var/lib/csi/sockets/pluginproxy/
- name: csi-attacher - name: csi-attacher
image: k8s.gcr.io/sig-storage/csi-attacher:v3.3.0 image: k8s.gcr.io/sig-storage/csi-attacher:v3.5.0
args: args:
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
- "--v=5" - "--v=5"
- "--reconcile-sync=30m"
- "--timeout=2m"
env: env:
- name: ADDRESS - name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock value: /var/lib/csi/sockets/pluginproxy/csi.sock
@ -779,7 +828,7 @@ spec:
- name: socket-dir - name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/ mountPath: /var/lib/csi/sockets/pluginproxy/
- name: csi-snapshotter - name: csi-snapshotter
image: k8s.gcr.io/sig-storage/csi-snapshotter:v5.0.0 image: k8s.gcr.io/sig-storage/csi-snapshotter:v6.0.1
args: args:
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
- "--v=5" - "--v=5"
@ -791,7 +840,7 @@ spec:
- name: socket-dir - name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/ mountPath: /var/lib/csi/sockets/pluginproxy/
- name: csi-resizer - name: csi-resizer
image: k8s.gcr.io/sig-storage/csi-resizer:v1.3.0 image: k8s.gcr.io/sig-storage/csi-resizer:v1.5.0
args: args:
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
- "--timeout=30s" - "--timeout=30s"
@ -806,11 +855,12 @@ spec:
- name: socket-dir - name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/ mountPath: /var/lib/csi/sockets/pluginproxy/
- name: csi-do-plugin - name: csi-do-plugin
image: digitalocean/do-csi-plugin:v4.0.0 image: digitalocean/do-csi-plugin:v4.2.0
args : args :
- "--endpoint=$(CSI_ENDPOINT)" - "--endpoint=$(CSI_ENDPOINT)"
- "--token=$(DIGITALOCEAN_ACCESS_TOKEN)" - "--token=$(DIGITALOCEAN_ACCESS_TOKEN)"
- "--url=$(DIGITALOCEAN_API_URL)" - "--url=$(DIGITALOCEAN_API_URL)"
- "--default-volumes-page-size=200"
env: env:
- name: CSI_ENDPOINT - name: CSI_ENDPOINT
value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock
@ -940,7 +990,7 @@ rules:
verbs: ["get", "list", "watch"] verbs: ["get", "list", "watch"]
- apiGroups: ["snapshot.storage.k8s.io"] - apiGroups: ["snapshot.storage.k8s.io"]
resources: ["volumesnapshotcontents"] resources: ["volumesnapshotcontents"]
verbs: ["create", "get", "list", "watch", "update", "delete", "patch"] verbs: ["get", "list", "watch", "update", "patch"]
- apiGroups: ["snapshot.storage.k8s.io"] - apiGroups: ["snapshot.storage.k8s.io"]
resources: ["volumesnapshotcontents/status"] resources: ["volumesnapshotcontents/status"]
verbs: ["update", "patch"] verbs: ["update", "patch"]
@ -1038,7 +1088,7 @@ spec:
mountPath: /etc/udev/rules.d/ mountPath: /etc/udev/rules.d/
containers: containers:
- name: csi-node-driver-registrar - name: csi-node-driver-registrar
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.4.0 image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.1
args: args:
- "--v=5" - "--v=5"
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
@ -1062,7 +1112,7 @@ spec:
- name: registration-dir - name: registration-dir
mountPath: /registration/ mountPath: /registration/
- name: csi-do-plugin - name: csi-do-plugin
image: digitalocean/do-csi-plugin:v4.0.0 image: digitalocean/do-csi-plugin:v4.2.0
args : args :
- "--endpoint=$(CSI_ENDPOINT)" - "--endpoint=$(CSI_ENDPOINT)"
- "--url=$(DIGITALOCEAN_API_URL)" - "--url=$(DIGITALOCEAN_API_URL)"
@ -1141,7 +1191,6 @@ roleRef:
name: csi-do-node-driver-registrar-role name: csi-do-node-driver-registrar-role
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
--- ---
# Copyright 2022 DigitalOcean # Copyright 2022 DigitalOcean
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
@ -1178,10 +1227,10 @@ spec:
labels: labels:
app: snapshot-controller app: snapshot-controller
spec: spec:
serviceAccount: snapshot-controller serviceAccountName: snapshot-controller
containers: containers:
- name: snapshot-controller - name: snapshot-controller
image: k8s.gcr.io/sig-storage/snapshot-controller:v5.0.0 image: k8s.gcr.io/sig-storage/snapshot-controller:v6.0.1
args: args:
- "--v=5" - "--v=5"
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
@ -1207,9 +1256,6 @@ rules:
- apiGroups: [""] - apiGroups: [""]
resources: ["persistentvolumeclaims"] resources: ["persistentvolumeclaims"]
verbs: ["get", "list", "watch", "update"] verbs: ["get", "list", "watch", "update"]
- apiGroups: ["storage.k8s.io"]
resources: ["storageclasses"]
verbs: ["get", "list", "watch"]
- apiGroups: [""] - apiGroups: [""]
resources: ["events"] resources: ["events"]
verbs: ["list", "watch", "create", "update", "patch"] verbs: ["list", "watch", "create", "update", "patch"]
@ -1218,16 +1264,16 @@ rules:
verbs: ["get", "list", "watch"] verbs: ["get", "list", "watch"]
- apiGroups: ["snapshot.storage.k8s.io"] - apiGroups: ["snapshot.storage.k8s.io"]
resources: ["volumesnapshotcontents"] resources: ["volumesnapshotcontents"]
verbs: ["create", "get", "list", "watch", "patch", "update", "delete"] verbs: ["create", "get", "list", "watch", "update", "delete", "patch"]
- apiGroups: ["snapshot.storage.k8s.io"]
resources: ["volumesnapshotcontents/status"]
verbs: ["patch"]
- apiGroups: ["snapshot.storage.k8s.io"] - apiGroups: ["snapshot.storage.k8s.io"]
resources: ["volumesnapshots"] resources: ["volumesnapshots"]
verbs: ["get", "list", "watch", "update", "patch"] verbs: ["get", "list", "watch", "update", "patch"]
- apiGroups: ["snapshot.storage.k8s.io"] - apiGroups: ["snapshot.storage.k8s.io"]
resources: ["volumesnapshots/status"] resources: ["volumesnapshots/status"]
verbs: ["update", "patch"] verbs: ["update", "patch"]
- apiGroups: [ "snapshot.storage.k8s.io" ]
resources: [ "volumesnapshotcontents/status" ]
verbs: ["patch"]
--- ---