Version bump for aws-efs-csi-driver, use upstream helm chart

charts/kubezero-aws-efs-csi-driver/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
 name: kubezero-aws-efs-csi-driver
 description: KubeZero Umbrella Chart for aws-efs-csi-driver
-version: 0.2.0
+version: 0.2.1
-appVersion: 1.0.0
+appVersion: 1.1.1
-kubeVersion: ">=1.16.0-0"
+kubeVersion: ">=1.18.0-0"
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 sources:
@@ -20,7 +20,6 @@ dependencies:
   - name: kubezero-lib
     version: ">= 0.1.3"
     repository: https://zero-down-time.github.io/kubezero/
-# Once they properly update upstream
+  - name: aws-efs-csi-driver
-#  - name: aws-ebs-csi-driver
+    version: 1.1.2
-#    version: 1.0.0
+    repository: https://kubernetes-sigs.github.io/aws-efs-csi-driver/
-#    repository: https://kubernetes-sigs.github.io/aws-efs-csi-driver

charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/Chart.yaml

@@ -1,15 +0,0 @@
-apiVersion: v1
-appVersion: "1.0.0"
-name: aws-efs-csi-driver
-description: A Helm chart for AWS EFS CSI Driver
-version: 0.2.0
-kubeVersion: ">=1.14.0-0"
-home: https://github.com/kubernetes-sigs/aws-efs-csi-driver
-sources:
-  - https://github.com/kubernetes-sigs/aws-efs-csi-driver
-keywords:
-  - aws
-  - efs
-  - csi
-maintainers:
-  - name: leakingtapan

charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/NOTES.txt

@@ -1,3 +0,0 @@
-To verify that aws-efs-csi-driver has started, run:
-
-    kubectl get pod -n kube-system -l "app.kubernetes.io/name={{ include "aws-efs-csi-driver.name" . }},app.kubernetes.io/instance={{ .Release.Name }}"

charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/_helpers.tpl

@@ -1,45 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "aws-efs-csi-driver.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "aws-efs-csi-driver.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "aws-efs-csi-driver.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "aws-efs-csi-driver.labels" -}}
-app.kubernetes.io/name: {{ include "aws-efs-csi-driver.name" . }}
-helm.sh/chart: {{ include "aws-efs-csi-driver.chart" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}

charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/csidriver.yaml

@@ -1,6 +0,0 @@
-apiVersion: storage.k8s.io/v1beta1
-kind: CSIDriver
-metadata:
-  name: efs.csi.aws.com
-spec:
-  attachRequired: false

charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/daemonset.yaml

@@ -1,117 +0,0 @@
-# Node Service
-kind: DaemonSet
-apiVersion: apps/v1
-metadata:
-  name: efs-csi-node
-  namespace: kube-system
-spec:
-  selector:
-    matchLabels:
-      app: efs-csi-node
-      app.kubernetes.io/name: {{ include "aws-efs-csi-driver.name" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: efs-csi-node
-        app.kubernetes.io/name: {{ include "aws-efs-csi-driver.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
-      {{- if .Values.node.podAnnotations }}
-      annotations: {{ toYaml .Values.node.podAnnotations | nindent 8 }}
-      {{- end }}
-    spec:
-      nodeSelector:
-        beta.kubernetes.io/os: linux
-        {{- with .Values.nodeSelector }}
-        {{- . | toYaml | nindent 8 }}
-        {{- end }}
-      hostNetwork: true
-      priorityClassName: system-node-critical
-      tolerations:
-        - operator: Exists
-        {{- with .Values.node.tolerations }}
-        {{- . | toYaml | nindent 8 }}
-        {{- end }}
-      containers:
-        - name: efs-plugin
-          securityContext:
-            privileged: true
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          args:
-            - --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: efs-state-dir
-              mountPath: /var/run/efs
-            - name: efs-utils-config
-              mountPath: /etc/amazon/efs
-          ports:
-            - name: healthz
-              containerPort: 9809
-              protocol: TCP
-          livenessProbe:
-            httpGet:
-              path: /healthz
-              port: healthz
-            initialDelaySeconds: 10
-            timeoutSeconds: 3
-            periodSeconds: 2
-            failureThreshold: 5
-        - name: cs-driver-registrar
-          image: {{ printf "%s:%s" .Values.sidecars.nodeDriverRegistrarImage.repository .Values.sidecars.nodeDriverRegistrarImage.tag }}
-          args:
-            - --csi-address=$(ADDRESS)
-            - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
-            - --v=5
-          env:
-            - name: ADDRESS
-              value: /csi/csi.sock
-            - name: DRIVER_REG_SOCK_PATH
-              value: /var/lib/kubelet/plugins/efs.csi.aws.com/csi.sock
-            - name: KUBE_NODE_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: spec.nodeName
-          volumeMounts:
-            - name: plugin-dir
-              mountPath: /csi
-            - name: registration-dir
-              mountPath: /registration
-        - name: liveness-probe
-          image: {{ printf "%s:%s" .Values.sidecars.livenessProbeImage.repository .Values.sidecars.livenessProbeImage.tag }}
-          args:
-            - --csi-address=/csi/csi.sock
-            - --health-port=9809
-          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/efs.csi.aws.com/
-            type: DirectoryOrCreate
-        - name: registration-dir
-          hostPath:
-            path: /var/lib/kubelet/plugins_registry/
-            type: Directory
-        - name: efs-state-dir
-          hostPath:
-            path: /var/run/efs
-            type: DirectoryOrCreate
-        - name: efs-utils-config
-          hostPath:
-            path: /etc/amazon/efs
-            type: DirectoryOrCreate

charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/values.yaml

@@ -1,46 +0,0 @@
-# Default values for aws-efs-csi-driver.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 2
-
-image:
-  repository: amazon/aws-efs-csi-driver
-  tag: "v1.0.0"
-  pullPolicy: IfNotPresent
-
-sidecars:
-  livenessProbeImage:
-    repository: quay.io/k8scsi/livenessprobe
-    tag: "v2.0.0"
-  nodeDriverRegistrarImage:
-    repository: quay.io/k8scsi/csi-node-driver-registrar
-    tag: "v1.3.0"
-
-imagePullSecrets: []
-nameOverride: ""
-fullnameOverride: ""
-
-podAnnotations: {}
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
-
-node:
-  podAnnotations: {}
-  tolerations: []

charts/kubezero-aws-efs-csi-driver/update.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-set -ex
-
-# Upstream doesnt have proper Helm repo yet so we just download latest release and stuff it into charts
-
-REPO="kubernetes-sigs/aws-efs-csi-driver"
-[ -z "$RELEASE" ] && RELEASE=$(curl -sL -s https://api.github.com/repos/${REPO}/releases | grep '"tag_name":' | cut -d'"' -f4 | grep -v -E "(alpha|beta|rc)" | sort -t"." -k 1,1 -k 2,2 -k 3,3 -k 4,4 | tail -n 1)
-
-rm -rf git
-git clone https://github.com/$REPO.git git
-cd git && git checkout $RELEASE && cd -
-
-rm -rf charts/aws-efs-csi-driver && mkdir -p charts/aws-efs-csi-driver
-mv git/helm/* charts/aws-efs-csi-driver

charts/kubezero-kiam/Chart.yaml

@@ -19,4 +19,4 @@ dependencies:
     version: 6.0.0
     repository: https://uswitch.github.io/kiam-helm-charts/charts/
     condition: kiam.enabled
-kubeVersion: ">= 1.16.0"
+kubeVersion: ">= 1.18.0"