From 422955db5bd1adaa6fcef8de1d2c47ab6ae0e7d7 Mon Sep 17 00:00:00 2001 From: Ayberk Yilmaz Date: Wed, 3 Feb 2021 15:58:44 -0800 Subject: [PATCH] Remove arm overlay --- .../base/arm64/clusterrole-attacher.yaml | 24 ---- .../base/arm64/clusterrole-provisioner.yaml | 39 ------ .../arm64/clusterrolebinding-attacher.yaml | 16 --- .../arm64/clusterrolebinding-provisioner.yaml | 16 --- deploy/kubernetes/base/arm64/controller.yaml | 102 ---------------- deploy/kubernetes/base/arm64/csidriver.yaml | 11 -- .../kubernetes/base/arm64/kustomization.yaml | 12 -- deploy/kubernetes/base/arm64/node.yaml | 113 ------------------ .../arm64/serviceaccount-csi-controller.yaml | 12 -- .../overlays/stable/arm64/kustomization.yaml | 15 --- 10 files changed, 360 deletions(-) delete mode 100644 deploy/kubernetes/base/arm64/clusterrole-attacher.yaml delete mode 100644 deploy/kubernetes/base/arm64/clusterrole-provisioner.yaml delete mode 100644 deploy/kubernetes/base/arm64/clusterrolebinding-attacher.yaml delete mode 100644 deploy/kubernetes/base/arm64/clusterrolebinding-provisioner.yaml delete mode 100644 deploy/kubernetes/base/arm64/controller.yaml delete mode 100644 deploy/kubernetes/base/arm64/csidriver.yaml delete mode 100644 deploy/kubernetes/base/arm64/kustomization.yaml delete mode 100644 deploy/kubernetes/base/arm64/node.yaml delete mode 100644 deploy/kubernetes/base/arm64/serviceaccount-csi-controller.yaml delete mode 100644 deploy/kubernetes/overlays/stable/arm64/kustomization.yaml diff --git a/deploy/kubernetes/base/arm64/clusterrole-attacher.yaml b/deploy/kubernetes/base/arm64/clusterrole-attacher.yaml deleted file mode 100644 index 5805412acb..0000000000 --- a/deploy/kubernetes/base/arm64/clusterrole-attacher.yaml +++ /dev/null @@ -1,24 +0,0 @@ ---- -# Source: aws-ebs-csi-driver/templates/clusterrole-attacher.yaml -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: ebs-external-attacher-role - labels: - app.kubernetes.io/name: aws-ebs-csi-driver -rules: - - apiGroups: [""] - resources: ["persistentvolumes"] - verbs: ["get", "list", "watch", "update", "patch"] - - apiGroups: [""] - resources: ["nodes"] - verbs: ["get", "list", "watch"] - - apiGroups: ["csi.storage.k8s.io"] - resources: ["csinodeinfos"] - verbs: ["get", "list", "watch"] - - apiGroups: ["storage.k8s.io"] - resources: ["volumeattachments"] - verbs: ["get", "list", "watch", "update", "patch"] - - apiGroups: ["storage.k8s.io"] - resources: ["volumeattachments/status"] - verbs: ["patch"] diff --git a/deploy/kubernetes/base/arm64/clusterrole-provisioner.yaml b/deploy/kubernetes/base/arm64/clusterrole-provisioner.yaml deleted file mode 100644 index b8cf0b054e..0000000000 --- a/deploy/kubernetes/base/arm64/clusterrole-provisioner.yaml +++ /dev/null @@ -1,39 +0,0 @@ ---- -# Source: aws-ebs-csi-driver/templates/clusterrole-provisioner.yaml -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: ebs-external-provisioner-role - labels: - app.kubernetes.io/name: aws-ebs-csi-driver -rules: - - apiGroups: [""] - resources: ["persistentvolumes"] - verbs: ["get", "list", "watch", "create", "delete"] - - apiGroups: [""] - resources: ["persistentvolumeclaims"] - verbs: ["get", "list", "watch", "update"] - - apiGroups: ["storage.k8s.io"] - resources: ["storageclasses"] - verbs: ["get", "list", "watch"] - - apiGroups: [""] - resources: ["events"] - verbs: ["list", "watch", "create", "update", "patch"] - - apiGroups: ["snapshot.storage.k8s.io"] - resources: ["volumesnapshots"] - verbs: ["get", "list"] - - apiGroups: ["snapshot.storage.k8s.io"] - resources: ["volumesnapshotcontents"] - verbs: ["get", "list"] - - apiGroups: ["storage.k8s.io"] - resources: ["csinodes"] - verbs: ["get", "list", "watch"] - - apiGroups: [""] - resources: ["nodes"] - verbs: ["get", "list", "watch"] - - apiGroups: ["coordination.k8s.io"] - resources: ["leases"] - verbs: ["get", "watch", "list", "delete", "update", "create"] - - apiGroups: [ "storage.k8s.io" ] - resources: [ "volumeattachments" ] - verbs: [ "get", "list", "watch" ] diff --git a/deploy/kubernetes/base/arm64/clusterrolebinding-attacher.yaml b/deploy/kubernetes/base/arm64/clusterrolebinding-attacher.yaml deleted file mode 100644 index 9a97b8efcb..0000000000 --- a/deploy/kubernetes/base/arm64/clusterrolebinding-attacher.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -# Source: aws-ebs-csi-driver/templates/clusterrolebinding-attacher.yaml -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: ebs-csi-attacher-binding - labels: - app.kubernetes.io/name: aws-ebs-csi-driver -subjects: - - kind: ServiceAccount - name: ebs-csi-controller-sa - namespace: kube-system -roleRef: - kind: ClusterRole - name: ebs-external-attacher-role - apiGroup: rbac.authorization.k8s.io diff --git a/deploy/kubernetes/base/arm64/clusterrolebinding-provisioner.yaml b/deploy/kubernetes/base/arm64/clusterrolebinding-provisioner.yaml deleted file mode 100644 index 084bed9df9..0000000000 --- a/deploy/kubernetes/base/arm64/clusterrolebinding-provisioner.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -# Source: aws-ebs-csi-driver/templates/clusterrolebinding-provisioner.yaml -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: ebs-csi-provisioner-binding - labels: - app.kubernetes.io/name: aws-ebs-csi-driver -subjects: - - kind: ServiceAccount - name: ebs-csi-controller-sa - namespace: kube-system -roleRef: - kind: ClusterRole - name: ebs-external-provisioner-role - apiGroup: rbac.authorization.k8s.io diff --git a/deploy/kubernetes/base/arm64/controller.yaml b/deploy/kubernetes/base/arm64/controller.yaml deleted file mode 100644 index 009b16df29..0000000000 --- a/deploy/kubernetes/base/arm64/controller.yaml +++ /dev/null @@ -1,102 +0,0 @@ ---- -# Source: aws-ebs-csi-driver/templates/controller.yaml -# Controller Service -kind: Deployment -apiVersion: apps/v1 -metadata: - name: ebs-csi-controller - namespace: kube-system - labels: - app.kubernetes.io/name: aws-ebs-csi-driver -spec: - replicas: 2 - selector: - matchLabels: - app: ebs-csi-controller - app.kubernetes.io/name: aws-ebs-csi-driver - template: - metadata: - labels: - app: ebs-csi-controller - app.kubernetes.io/name: aws-ebs-csi-driver - spec: - nodeSelector: - kubernetes.io/os: linux - serviceAccountName: ebs-csi-controller-sa - priorityClassName: system-cluster-critical - tolerations: - - operator: Exists - containers: - - name: ebs-plugin - image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:latest - imagePullPolicy: IfNotPresent - args: - # - {all,controller,node} # specify the driver mode - - --endpoint=$(CSI_ENDPOINT) - - --logtostderr - - --v=5 - env: - - name: CSI_ENDPOINT - value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock - - name: AWS_ACCESS_KEY_ID - valueFrom: - secretKeyRef: - name: aws-secret - key: key_id - optional: true - - name: AWS_SECRET_ACCESS_KEY - valueFrom: - secretKeyRef: - name: aws-secret - key: access_key - optional: true - volumeMounts: - - name: socket-dir - mountPath: /var/lib/csi/sockets/pluginproxy/ - ports: - - name: healthz - containerPort: 9808 - protocol: TCP - livenessProbe: - httpGet: - path: /healthz - port: healthz - initialDelaySeconds: 10 - timeoutSeconds: 3 - periodSeconds: 10 - failureThreshold: 5 - - name: csi-provisioner - image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2 - args: - - --csi-address=$(ADDRESS) - - --v=5 - - --feature-gates=Topology=true - - --leader-election=true - env: - - name: ADDRESS - value: /var/lib/csi/sockets/pluginproxy/csi.sock - volumeMounts: - - name: socket-dir - mountPath: /var/lib/csi/sockets/pluginproxy/ - - name: csi-attacher - image: k8s.gcr.io/sig-storage/csi-attacher:v3.0.0 - args: - - --csi-address=$(ADDRESS) - - --v=5 - - --leader-election=true - env: - - name: ADDRESS - value: /var/lib/csi/sockets/pluginproxy/csi.sock - volumeMounts: - - name: socket-dir - mountPath: /var/lib/csi/sockets/pluginproxy/ - - name: liveness-probe - image: k8s.gcr.io/sig-storage/livenessprobe:v2.1.0 - args: - - --csi-address=/csi/csi.sock - volumeMounts: - - name: socket-dir - mountPath: /csi - volumes: - - name: socket-dir - emptyDir: { } diff --git a/deploy/kubernetes/base/arm64/csidriver.yaml b/deploy/kubernetes/base/arm64/csidriver.yaml deleted file mode 100644 index 357b3d71a2..0000000000 --- a/deploy/kubernetes/base/arm64/csidriver.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# Source: aws-ebs-csi-driver/templates/csidriver.yaml -apiVersion: storage.k8s.io/v1beta1 -kind: CSIDriver -metadata: - name: ebs.csi.aws.com - labels: - app.kubernetes.io/name: aws-ebs-csi-driver -spec: - attachRequired: true - podInfoOnMount: false diff --git a/deploy/kubernetes/base/arm64/kustomization.yaml b/deploy/kubernetes/base/arm64/kustomization.yaml deleted file mode 100644 index f6978d7e21..0000000000 --- a/deploy/kubernetes/base/arm64/kustomization.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: kube-system -resources: -- clusterrole-attacher.yaml -- clusterrole-provisioner.yaml -- clusterrolebinding-attacher.yaml -- clusterrolebinding-provisioner.yaml -- controller.yaml -- csidriver.yaml -- node.yaml -- serviceaccount-csi-controller.yaml diff --git a/deploy/kubernetes/base/arm64/node.yaml b/deploy/kubernetes/base/arm64/node.yaml deleted file mode 100644 index 2f6c0348da..0000000000 --- a/deploy/kubernetes/base/arm64/node.yaml +++ /dev/null @@ -1,113 +0,0 @@ ---- -# Source: aws-ebs-csi-driver/templates/node.yaml -# Node Service -kind: DaemonSet -apiVersion: apps/v1 -metadata: - name: ebs-csi-node - namespace: kube-system - labels: - app.kubernetes.io/name: aws-ebs-csi-driver -spec: - selector: - matchLabels: - app: ebs-csi-node - app.kubernetes.io/name: aws-ebs-csi-driver - template: - metadata: - labels: - app: ebs-csi-node - app.kubernetes.io/name: aws-ebs-csi-driver - spec: - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: eks.amazonaws.com/compute-type - operator: NotIn - values: - - fargate - nodeSelector: - kubernetes.io/os: linux - hostNetwork: true - priorityClassName: system-node-critical - tolerations: - - operator: Exists - containers: - - name: ebs-plugin - securityContext: - privileged: true - image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:latest - args: - - node - - --endpoint=$(CSI_ENDPOINT) - - --logtostderr - - --v=5 - env: - - name: CSI_ENDPOINT - value: unix:/csi/csi.sock - volumeMounts: - - name: kubelet-dir - mountPath: /var/lib/kubelet - mountPropagation: "Bidirectional" - - name: plugin-dir - mountPath: /csi - - name: device-dir - mountPath: /dev - ports: - - name: healthz - containerPort: 9808 - protocol: TCP - livenessProbe: - httpGet: - path: /healthz - port: healthz - initialDelaySeconds: 10 - timeoutSeconds: 3 - periodSeconds: 10 - failureThreshold: 5 - - name: node-driver-registrar - image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.0.1 - args: - - --csi-address=$(ADDRESS) - - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) - - --v=5 - lifecycle: - preStop: - exec: - command: ["/bin/sh", "-c", "rm -rf /registration/ebs.csi.aws.com-reg.sock /csi/csi.sock"] - env: - - name: ADDRESS - value: /csi/csi.sock - - name: DRIVER_REG_SOCK_PATH - value: /var/lib/kubelet/plugins/ebs.csi.aws.com/csi.sock - volumeMounts: - - name: plugin-dir - mountPath: /csi - - name: registration-dir - mountPath: /registration - - name: liveness-probe - image: quay.io/k8scsi/livenessprobe:v2.1.0 - args: - - --csi-address=/csi/csi.sock - volumeMounts: - - name: plugin-dir - mountPath: /csi - volumes: - - name: kubelet-dir - hostPath: - path: /var/lib/kubelet - type: Directory - - name: plugin-dir - hostPath: - path: /var/lib/kubelet/plugins/ebs.csi.aws.com/ - type: DirectoryOrCreate - - name: registration-dir - hostPath: - path: /var/lib/kubelet/plugins_registry/ - type: Directory - - name: device-dir - hostPath: - path: /dev - type: Directory diff --git a/deploy/kubernetes/base/arm64/serviceaccount-csi-controller.yaml b/deploy/kubernetes/base/arm64/serviceaccount-csi-controller.yaml deleted file mode 100644 index 529473f3a3..0000000000 --- a/deploy/kubernetes/base/arm64/serviceaccount-csi-controller.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -# Source: aws-ebs-csi-driver/templates/serviceaccount-csi-controller.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - name: ebs-csi-controller-sa - namespace: kube-system - labels: - app.kubernetes.io/name: aws-ebs-csi-driver - #Enable if EKS IAM for SA is used - #annotations: - # eks.amazonaws.com/role-arn: arn:aws:iam::586565787010:role/ebs-csi-role diff --git a/deploy/kubernetes/overlays/stable/arm64/kustomization.yaml b/deploy/kubernetes/overlays/stable/arm64/kustomization.yaml deleted file mode 100644 index bda0746760..0000000000 --- a/deploy/kubernetes/overlays/stable/arm64/kustomization.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -bases: - - ../../../base/arm64 -images: - - name: k8s.gcr.io/provider-aws/aws-ebs-csi-driver - newTag: v0.8.1 - - name: k8s.gcr.io/sig-storage/csi-provisioner - newTag: v2.0.2 - - name: k8s.gcr.io/sig-storage/csi-attacher - newTag: v3.0.0 - - name: k8s.gcr.io/sig-storage/livenessprobe - newTag: v2.1.0 - - name: k8s.gcr.io/sig-storage/csi-node-driver-registrar - newTag: v2.0.1