mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-27 21:47:07 +00:00
Update CSI tests to point to 1.0.0 external bits.
This commit is contained in:
parent
09d3dce38a
commit
503f654d7a
@ -147,7 +147,7 @@ var _ DynamicPVTestDriver = &gcePDCSIDriver{}
|
|||||||
func InitGcePDCSIDriver() TestDriver {
|
func InitGcePDCSIDriver() TestDriver {
|
||||||
return &gcePDCSIDriver{
|
return &gcePDCSIDriver{
|
||||||
driverInfo: DriverInfo{
|
driverInfo: DriverInfo{
|
||||||
Name: "com.google.csi.gcepd",
|
Name: "pd.csi.storage.gke.io",
|
||||||
FeatureTag: "[Serial]",
|
FeatureTag: "[Serial]",
|
||||||
MaxFileSize: testpatterns.FileSizeMedium,
|
MaxFileSize: testpatterns.FileSizeMedium,
|
||||||
SupportedFsType: sets.NewString(
|
SupportedFsType: sets.NewString(
|
||||||
@ -237,7 +237,7 @@ var _ DynamicPVTestDriver = &gcePDExternalCSIDriver{}
|
|||||||
func InitGcePDExternalCSIDriver() TestDriver {
|
func InitGcePDExternalCSIDriver() TestDriver {
|
||||||
return &gcePDExternalCSIDriver{
|
return &gcePDExternalCSIDriver{
|
||||||
driverInfo: DriverInfo{
|
driverInfo: DriverInfo{
|
||||||
Name: "com.google.csi.gcepd",
|
Name: "pd.csi.storage.gke.io",
|
||||||
// TODO(#70258): this is temporary until we can figure out how to make e2e tests a library
|
// TODO(#70258): this is temporary until we can figure out how to make e2e tests a library
|
||||||
FeatureTag: "[Feature: gcePD-external]",
|
FeatureTag: "[Feature: gcePD-external]",
|
||||||
MaxFileSize: testpatterns.FileSizeMedium,
|
MaxFileSize: testpatterns.FileSizeMedium,
|
||||||
|
@ -342,7 +342,7 @@ func testVolumeModeSuccessForDynamicPV(input *volumeModeTestInput) {
|
|||||||
var err error
|
var err error
|
||||||
|
|
||||||
// TODO: This skip should be removed once #70760 is fixed
|
// TODO: This skip should be removed once #70760 is fixed
|
||||||
skipTestUntilBugfix("70760", input.driverName, []string{"com.google.csi.gcepd"})
|
skipTestUntilBugfix("70760", input.driverName, []string{"pd.csi.storage.gke.io"})
|
||||||
|
|
||||||
By("Creating sc")
|
By("Creating sc")
|
||||||
input.sc, err = cs.StorageV1().StorageClasses().Create(input.sc)
|
input.sc, err = cs.StorageV1().StorageClasses().Create(input.sc)
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ServiceAccount
|
kind: ServiceAccount
|
||||||
metadata:
|
metadata:
|
||||||
name: csi-driver-registrar
|
name: csi-node-sa
|
||||||
# replace with non-default namespace name
|
# replace with non-default namespace name
|
||||||
namespace: default
|
namespace: default
|
||||||
|
|
||||||
@ -42,7 +42,7 @@ metadata:
|
|||||||
name: csi-driver-registrar-role
|
name: csi-driver-registrar-role
|
||||||
subjects:
|
subjects:
|
||||||
- kind: ServiceAccount
|
- kind: ServiceAccount
|
||||||
name: csi-driver-registrar
|
name: csi-node-sa
|
||||||
# replace with non-default namespace name
|
# replace with non-default namespace name
|
||||||
namespace: default
|
namespace: default
|
||||||
roleRef:
|
roleRef:
|
||||||
|
@ -1,54 +1,51 @@
|
|||||||
kind: StatefulSet
|
kind: StatefulSet
|
||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
metadata:
|
metadata:
|
||||||
name: csi-gce-controller
|
name: csi-gce-pd-controller
|
||||||
spec:
|
spec:
|
||||||
serviceName: "csi-gce-pd"
|
serviceName: "csi-gce-pd"
|
||||||
replicas: 1
|
replicas: 1
|
||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
app: csi-gce-pd-driver
|
app: gcp-compute-persistent-disk-csi-driver
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
app: csi-gce-pd-driver
|
app: gcp-compute-persistent-disk-csi-driver
|
||||||
spec:
|
spec:
|
||||||
serviceAccountName: csi-controller
|
serviceAccountName: csi-controller-sa
|
||||||
containers:
|
containers:
|
||||||
- name: csi-external-provisioner
|
- name: csi-provisioner
|
||||||
imagePullPolicy: Always
|
image: gcr.io/gke-release/csi-provisioner:v1.0.0-gke.0
|
||||||
image: gcr.io/gke-release/csi-provisioner:v0.4.1-gke.0
|
|
||||||
args:
|
args:
|
||||||
- "--v=5"
|
- "--v=5"
|
||||||
- "--provisioner=com.google.csi.gcepd"
|
- "--provisioner=pd.csi.storage.gke.io"
|
||||||
- "--csi-address=/csi/csi.sock"
|
- "--csi-address=/csi/csi.sock"
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: socket-dir
|
- name: socket-dir
|
||||||
mountPath: /csi
|
mountPath: /csi
|
||||||
- name: csi-attacher
|
- name: csi-attacher
|
||||||
imagePullPolicy: Always
|
image: gcr.io/gke-release/csi-attacher:v1.0.0-gke.0
|
||||||
image: gcr.io/gke-release/csi-attacher:v0.4.1-gke.0
|
|
||||||
args:
|
args:
|
||||||
- "--v=5"
|
- "--v=5"
|
||||||
- "--csi-address=/csi/csi.sock"
|
- "--csi-address=/csi/csi.sock"
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: socket-dir
|
- name: socket-dir
|
||||||
mountPath: /csi
|
mountPath: /csi
|
||||||
- name: gce-driver
|
- name: gce-pd-driver
|
||||||
imagePullPolicy: Always
|
image: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver:v0.3.0-gke.0
|
||||||
image: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver:v0.2.0-gke.0
|
|
||||||
args:
|
args:
|
||||||
- "--v=5"
|
- "--v=5"
|
||||||
- "--endpoint=unix:///csi/csi.sock"
|
- "--endpoint=unix:/csi/csi.sock"
|
||||||
env:
|
env:
|
||||||
- name: GOOGLE_APPLICATION_CREDENTIALS
|
- name: GOOGLE_APPLICATION_CREDENTIALS
|
||||||
value: "/etc/service-account/cloud-sa.json"
|
value: "/etc/cloud-sa/cloud-sa.json"
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: socket-dir
|
- name: socket-dir
|
||||||
mountPath: /csi
|
mountPath: /csi
|
||||||
- name: cloud-sa-volume
|
- name: cloud-sa-volume
|
||||||
readOnly: true
|
readOnly: true
|
||||||
mountPath: "/etc/service-account"
|
mountPath: "/etc/cloud-sa"
|
||||||
volumes:
|
volumes:
|
||||||
- name: socket-dir
|
- name: socket-dir
|
||||||
emptyDir: {}
|
emptyDir: {}
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ServiceAccount
|
kind: ServiceAccount
|
||||||
metadata:
|
metadata:
|
||||||
name: csi-controller
|
name: csi-controller-sa
|
||||||
|
|
||||||
---
|
---
|
||||||
kind: ClusterRoleBinding
|
kind: ClusterRoleBinding
|
||||||
@ -10,7 +10,7 @@ metadata:
|
|||||||
name: csi-controller-attacher-role
|
name: csi-controller-attacher-role
|
||||||
subjects:
|
subjects:
|
||||||
- kind: ServiceAccount
|
- kind: ServiceAccount
|
||||||
name: csi-controller
|
name: csi-controller-sa
|
||||||
namespace: default
|
namespace: default
|
||||||
roleRef:
|
roleRef:
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
@ -25,7 +25,7 @@ metadata:
|
|||||||
namespace: default
|
namespace: default
|
||||||
subjects:
|
subjects:
|
||||||
- kind: ServiceAccount
|
- kind: ServiceAccount
|
||||||
name: csi-controller
|
name: csi-controller-sa
|
||||||
namespace: default
|
namespace: default
|
||||||
roleRef:
|
roleRef:
|
||||||
kind: Role
|
kind: Role
|
||||||
@ -38,7 +38,7 @@ metadata:
|
|||||||
name: csi-controller-provisioner-role
|
name: csi-controller-provisioner-role
|
||||||
subjects:
|
subjects:
|
||||||
- kind: ServiceAccount
|
- kind: ServiceAccount
|
||||||
name: csi-controller
|
name: csi-controller-sa
|
||||||
namespace: default
|
namespace: default
|
||||||
roleRef:
|
roleRef:
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
@ -53,7 +53,7 @@ metadata:
|
|||||||
namespace: default
|
namespace: default
|
||||||
subjects:
|
subjects:
|
||||||
- kind: ServiceAccount
|
- kind: ServiceAccount
|
||||||
name: csi-controller
|
name: csi-controller-sa
|
||||||
namespace: default
|
namespace: default
|
||||||
roleRef:
|
roleRef:
|
||||||
kind: Role
|
kind: Role
|
||||||
@ -67,10 +67,10 @@ metadata:
|
|||||||
name: psp-csi-controller-driver-registrar-role
|
name: psp-csi-controller-driver-registrar-role
|
||||||
subjects:
|
subjects:
|
||||||
- kind: ServiceAccount
|
- kind: ServiceAccount
|
||||||
name: csi-controller
|
name: csi-controller-sa
|
||||||
namespace: default
|
namespace: default
|
||||||
- kind: ServiceAccount
|
- kind: ServiceAccount
|
||||||
name: csi-driver-registrar
|
name: csi-node-sa
|
||||||
namespace: default
|
namespace: default
|
||||||
roleRef:
|
roleRef:
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
|
@ -1,26 +1,28 @@
|
|||||||
kind: DaemonSet
|
kind: DaemonSet
|
||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
metadata:
|
metadata:
|
||||||
name: csi-gce-node
|
name: csi-gce-pd-node
|
||||||
spec:
|
spec:
|
||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
app: csi-gce-driver
|
app: gcp-compute-persistent-disk-csi-driver
|
||||||
serviceName: csi-gce
|
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
app: csi-gce-driver
|
app: gcp-compute-persistent-disk-csi-driver
|
||||||
spec:
|
spec:
|
||||||
serviceAccountName: csi-driver-registrar
|
serviceAccountName: csi-node-sa
|
||||||
containers:
|
containers:
|
||||||
- name: csi-driver-registrar
|
- name: csi-driver-registrar
|
||||||
imagePullPolicy: Always
|
image: gcr.io/gke-release/csi-driver-registrar:v1.0.0-gke.0
|
||||||
image: gcr.io/gke-release/csi-driver-registrar:v0.4.1-gke.0
|
|
||||||
args:
|
args:
|
||||||
- "--v=5"
|
- "--v=5"
|
||||||
- "--csi-address=/csi/csi.sock"
|
- "--csi-address=/var/lib/kubelet/plugins/pd.csi.storage.gke.io/csi.sock"
|
||||||
- "--kubelet-registration-path=/var/lib/kubelet/plugins/com.google.csi.gcepd/csi.sock"
|
- "--kubelet-registration-path=/var/lib/kubelet/plugins/pd.csi.storage.gke.io/csi.sock"
|
||||||
|
lifecycle:
|
||||||
|
preStop:
|
||||||
|
exec:
|
||||||
|
command: ["/bin/sh", "-c", "rm -rf /registration/pd.csi.storage.gke.io /registration/pd.csi.storage.gke.io-reg.sock"]
|
||||||
env:
|
env:
|
||||||
- name: KUBE_NODE_NAME
|
- name: KUBE_NODE_NAME
|
||||||
valueFrom:
|
valueFrom:
|
||||||
@ -28,17 +30,16 @@ spec:
|
|||||||
fieldPath: spec.nodeName
|
fieldPath: spec.nodeName
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: plugin-dir
|
- name: plugin-dir
|
||||||
mountPath: /csi
|
mountPath: /var/lib/kubelet/plugins/pd.csi.storage.gke.io/
|
||||||
- name: registration-dir
|
- name: registration-dir
|
||||||
mountPath: /registration
|
mountPath: /registration
|
||||||
- name: gce-driver
|
- name: gce-pd-driver
|
||||||
securityContext:
|
securityContext:
|
||||||
privileged: true
|
privileged: true
|
||||||
imagePullPolicy: Always
|
image: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver:v0.3.0-gke.0
|
||||||
image: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver:v0.2.0-gke.0
|
|
||||||
args:
|
args:
|
||||||
- "--v=5"
|
- "--v=5"
|
||||||
- "--endpoint=unix:///csi/csi.sock"
|
- "--endpoint=unix:/csi/csi.sock"
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: kubelet-dir
|
- name: kubelet-dir
|
||||||
mountPath: /var/lib/kubelet
|
mountPath: /var/lib/kubelet
|
||||||
@ -67,7 +68,7 @@ spec:
|
|||||||
type: Directory
|
type: Directory
|
||||||
- name: plugin-dir
|
- name: plugin-dir
|
||||||
hostPath:
|
hostPath:
|
||||||
path: /var/lib/kubelet/plugins/com.google.csi.gcepd/
|
path: /var/lib/kubelet/plugins/pd.csi.storage.gke.io/
|
||||||
type: DirectoryOrCreate
|
type: DirectoryOrCreate
|
||||||
- name: device-dir
|
- name: device-dir
|
||||||
hostPath:
|
hostPath:
|
||||||
@ -90,4 +91,3 @@ spec:
|
|||||||
hostPath:
|
hostPath:
|
||||||
path: /sys
|
path: /sys
|
||||||
type: Directory
|
type: Directory
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@ spec:
|
|||||||
serviceAccountName: csi-attacher
|
serviceAccountName: csi-attacher
|
||||||
containers:
|
containers:
|
||||||
- name: csi-attacher
|
- name: csi-attacher
|
||||||
image: quay.io/k8scsi/csi-attacher:v0.4.1
|
image: gcr.io/gke-release/csi-attacher:v1.0.0-gke.0
|
||||||
args:
|
args:
|
||||||
- --v=5
|
- --v=5
|
||||||
- --csi-address=$(ADDRESS)
|
- --csi-address=$(ADDRESS)
|
||||||
|
@ -30,7 +30,7 @@ spec:
|
|||||||
serviceAccountName: csi-provisioner
|
serviceAccountName: csi-provisioner
|
||||||
containers:
|
containers:
|
||||||
- name: csi-provisioner
|
- name: csi-provisioner
|
||||||
image: quay.io/k8scsi/csi-provisioner:v0.4.1
|
image: gcr.io/gke-release/csi-provisioner:v1.0.0-gke.0
|
||||||
args:
|
args:
|
||||||
- "--provisioner=csi-hostpath"
|
- "--provisioner=csi-hostpath"
|
||||||
- "--csi-address=$(ADDRESS)"
|
- "--csi-address=$(ADDRESS)"
|
||||||
|
@ -11,11 +11,11 @@ spec:
|
|||||||
labels:
|
labels:
|
||||||
app: csi-hostpathplugin
|
app: csi-hostpathplugin
|
||||||
spec:
|
spec:
|
||||||
serviceAccountName: csi-driver-registrar
|
serviceAccountName: csi-node-sa
|
||||||
hostNetwork: true
|
hostNetwork: true
|
||||||
containers:
|
containers:
|
||||||
- name: driver-registrar
|
- name: driver-registrar
|
||||||
image: quay.io/k8scsi/driver-registrar:v0.4.1
|
image: gcr.io/gke-release/csi-driver-registrar:v1.0.0-gke.0
|
||||||
args:
|
args:
|
||||||
- --v=5
|
- --v=5
|
||||||
- --csi-address=/csi/csi.sock
|
- --csi-address=/csi/csi.sock
|
||||||
@ -33,7 +33,7 @@ spec:
|
|||||||
- mountPath: /registration
|
- mountPath: /registration
|
||||||
name: registration-dir
|
name: registration-dir
|
||||||
- name: hostpath
|
- name: hostpath
|
||||||
image: quay.io/k8scsi/hostpathplugin:v0.4.1
|
image: quay.io/k8scsi/hostpathplugin:v1.0.0
|
||||||
args:
|
args:
|
||||||
- "--v=5"
|
- "--v=5"
|
||||||
- "--endpoint=$(CSI_ENDPOINT)"
|
- "--endpoint=$(CSI_ENDPOINT)"
|
||||||
|
@ -8,7 +8,7 @@ subjects:
|
|||||||
name: csi-attacher
|
name: csi-attacher
|
||||||
namespace: default
|
namespace: default
|
||||||
- kind: ServiceAccount
|
- kind: ServiceAccount
|
||||||
name: csi-driver-registrar
|
name: csi-node-sa
|
||||||
namespace: default
|
namespace: default
|
||||||
- kind: ServiceAccount
|
- kind: ServiceAccount
|
||||||
name: csi-provisioner
|
name: csi-provisioner
|
||||||
|
Loading…
Reference in New Issue
Block a user