Skip to content

Commit

Permalink
Merge pull request #1992 from kubernetes-sigs/cut-v1.30.4
Browse files Browse the repository at this point in the history
doc: cut v1.30.4 release
  • Loading branch information
andyzhangx authored Jul 18, 2024
2 parents d891051 + 95db2f5 commit 689a63e
Show file tree
Hide file tree
Showing 40 changed files with 4,509 additions and 61 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ GIT_COMMIT ?= $(shell git rev-parse HEAD)
REGISTRY ?= andyzhangx
REGISTRY_NAME ?= $(shell echo $(REGISTRY) | sed "s/.azurecr.io//g")
IMAGE_NAME ?= azurefile-csi
IMAGE_VERSION ?= v1.30.3
IMAGE_VERSION ?= v1.30.4
# Use a custom version for E2E tests if we are testing in CI
ifdef CI
ifndef PUBLISH
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Disclaimer: Deploying this driver manually is not an officially supported Micros
|Driver Version |Image | supported k8s version |
|----------------|---------------------------------------------------------- |-----------------------|
|master branch |mcr.microsoft.com/k8s/csi/azurefile-csi:latest | 1.21+ |
|v1.30.3 |mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.30.3 | 1.21+ |
|v1.30.4 |mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.30.4 | 1.21+ |
|v1.29.2 |mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.29.2 | 1.21+ |
|v1.28.7 |mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.28.7 | 1.21+ |

Expand Down
111 changes: 60 additions & 51 deletions charts/index.yaml

Large diffs are not rendered by default.

Binary file removed charts/latest/azurefile-csi-driver-v1.30.3.tgz
Binary file not shown.
Binary file added charts/latest/azurefile-csi-driver-v1.30.4.tgz
Binary file not shown.
4 changes: 2 additions & 2 deletions charts/latest/azurefile-csi-driver/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v1
appVersion: v1.30.3
appVersion: v1.30.4
description: Azure File Container Storage Interface (CSI) Storage Plugin
name: azurefile-csi-driver
version: v1.30.3
version: v1.30.4
2 changes: 1 addition & 1 deletion charts/latest/azurefile-csi-driver/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ image:
baseRepo: mcr.microsoft.com
azurefile:
repository: /oss/kubernetes-csi/azurefile-csi
tag: v1.30.3
tag: v1.30.4
pullPolicy: IfNotPresent
csiProvisioner:
repository: /oss/kubernetes-csi/csi-provisioner
Expand Down
Binary file added charts/v1.30.4/azurefile-csi-driver-v1.30.4.tgz
Binary file not shown.
5 changes: 5 additions & 0 deletions charts/v1.30.4/azurefile-csi-driver/Chart.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
apiVersion: v1
appVersion: v1.30.4
description: Azure File Container Storage Interface (CSI) Storage Plugin
name: azurefile-csi-driver
version: v1.30.4
5 changes: 5 additions & 0 deletions charts/v1.30.4/azurefile-csi-driver/templates/NOTES.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
The Azure File CSI Driver is getting deployed to your cluster.

To check Azure File CSI Driver pods status, please run:

kubectl --namespace={{ .Release.Namespace }} get pods --selector="app.kubernetes.io/name={{ .Release.Name }}" --watch
49 changes: 49 additions & 0 deletions charts/v1.30.4/azurefile-csi-driver/templates/_helpers.tpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{{/* vim: set filetype=mustache: */}}

{{/* Expand the name of the chart.*/}}
{{- define "azurefile.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}

{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "azurefile.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}

{{/*
Common selectors.
*/}}
{{- define "azurefile.selectorLabels" -}}
app.kubernetes.io/name: {{ template "azurefile.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}}

{{/*
Common labels.
*/}}
{{- define "azurefile.labels" -}}
{{- include "azurefile.selectorLabels" . }}
app.kubernetes.io/component: csi-driver
app.kubernetes.io/part-of: {{ template "azurefile.name" . }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
helm.sh/chart: {{ template "azurefile.chart" . }}
{{- if .Values.customLabels }}
{{ toYaml .Values.customLabels }}
{{- end }}
{{- end -}}


{{/* pull secrets for containers */}}
{{- define "azurefile.pullSecrets" -}}
{{- if .Values.imagePullSecrets }}
imagePullSecrets:
{{- range .Values.imagePullSecrets }}
- name: {{ . }}
{{- end }}
{{- end }}
{{- end -}}
840 changes: 840 additions & 0 deletions charts/v1.30.4/azurefile-csi-driver/templates/crd-csi-snapshot.yaml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,258 @@
kind: Deployment
apiVersion: apps/v1
metadata:
name: {{ .Values.controller.name }}
namespace: {{ .Release.Namespace }}
labels:
app: {{ .Values.controller.name }}
{{- include "azurefile.labels" . | nindent 4 }}
{{- with .Values.controller.labels }}
{{ . | toYaml | indent 4 }}
{{- end }}
{{- with .Values.controller.annotations }}
annotations:
{{ . | toYaml | indent 4 }}
{{- end }}
spec:
replicas: {{ .Values.controller.replicas }}
selector:
matchLabels:
{{- include "azurefile.selectorLabels" . | nindent 6 }}
app: {{ .Values.controller.name }}
strategy:
type: {{ .Values.controller.strategyType }}
template:
metadata:
labels:
{{- include "azurefile.labels" . | nindent 8 }}
app: {{ .Values.controller.name }}
{{- if .Values.workloadIdentity.clientID }}
azure.workload.identity/use: "true"
{{- end }}
{{- with .Values.controller.podLabels }}
{{ toYaml . | indent 8 }}
{{- end }}
{{- with .Values.controller.podAnnotations }}
annotations:
{{ toYaml . | indent 8 }}
{{- end }}
spec:
hostNetwork: {{ .Values.controller.hostNetwork }}
serviceAccountName: {{ .Values.serviceAccount.controller }}
nodeSelector:
kubernetes.io/os: linux
{{- with .Values.controller.nodeSelector }}
{{ toYaml . | indent 8 }}
{{- end }}
{{- if .Values.controller.runOnMaster}}
node-role.kubernetes.io/master: ""
{{- end}}
{{- if .Values.controller.runOnControlPlane}}
node-role.kubernetes.io/control-plane: ""
{{- end}}
priorityClassName: system-cluster-critical
{{- with .Values.controller.tolerations }}
tolerations:
{{ toYaml . | indent 8 }}
{{- end }}
{{- with .Values.controller.affinity }}
affinity:
{{ toYaml . | indent 8 }}
{{- end }}
{{- if .Values.imagePullSecrets }}
imagePullSecrets:
{{ toYaml .Values.imagePullSecrets | indent 8 }}
{{- end }}
containers:
- name: csi-provisioner
{{- if hasPrefix "/" .Values.image.csiProvisioner.repository }}
image: "{{ .Values.image.baseRepo }}{{ .Values.image.csiProvisioner.repository }}:{{ .Values.image.csiProvisioner.tag }}"
{{- else }}
image: "{{ .Values.image.csiProvisioner.repository }}:{{ .Values.image.csiProvisioner.tag }}"
{{- end }}
args:
- "-v=2"
- "--csi-address=$(ADDRESS)"
- "--leader-election"
- "--leader-election-namespace={{ .Release.Namespace }}"
- "--timeout=1200s"
- "--extra-create-metadata=true"
- "--kube-api-qps=50"
- "--kube-api-burst=100"
- "--feature-gates=HonorPVReclaimPolicy=true"
env:
- name: ADDRESS
value: /csi/csi.sock
imagePullPolicy: {{ .Values.image.csiProvisioner.pullPolicy }}
volumeMounts:
- mountPath: /csi
name: socket-dir
resources: {{- toYaml .Values.controller.resources.csiProvisioner | nindent 12 }}
- name: csi-snapshotter
{{- if hasPrefix "/" .Values.snapshot.image.csiSnapshotter.repository }}
image: "{{ .Values.image.baseRepo }}{{ .Values.snapshot.image.csiSnapshotter.repository }}:{{ .Values.snapshot.image.csiSnapshotter.tag }}"
{{- else }}
image: "{{ .Values.snapshot.image.csiSnapshotter.repository }}:{{ .Values.snapshot.image.csiSnapshotter.tag }}"
{{- end }}
args:
- "-csi-address=$(ADDRESS)"
- "-leader-election"
- "--leader-election-namespace={{ .Release.Namespace }}"
- "-v=2"
env:
- name: ADDRESS
value: /csi/csi.sock
volumeMounts:
- name: socket-dir
mountPath: /csi
resources: {{- toYaml .Values.controller.resources.csiSnapshotter | nindent 12 }}
securityContext:
capabilities:
drop:
- ALL
- name: csi-resizer
{{- if hasPrefix "/" .Values.image.csiResizer.repository }}
image: "{{ .Values.image.baseRepo }}{{ .Values.image.csiResizer.repository }}:{{ .Values.image.csiResizer.tag }}"
{{- else }}
image: "{{ .Values.image.csiResizer.repository }}:{{ .Values.image.csiResizer.tag }}"
{{- end }}
args:
- "-csi-address=$(ADDRESS)"
- "-v=2"
- "-leader-election"
- "--leader-election-namespace={{ .Release.Namespace }}"
- '-handle-volume-inuse-error=false'
- '-timeout=120s'
- '-feature-gates=RecoverVolumeExpansionFailure=true'
env:
- name: ADDRESS
value: /csi/csi.sock
imagePullPolicy: {{ .Values.image.csiResizer.pullPolicy }}
volumeMounts:
- name: socket-dir
mountPath: /csi
resources: {{- toYaml .Values.controller.resources.csiResizer | nindent 12 }}
securityContext:
capabilities:
drop:
- ALL
- name: liveness-probe
{{- if hasPrefix "/" .Values.image.livenessProbe.repository }}
image: "{{ .Values.image.baseRepo }}{{ .Values.image.livenessProbe.repository }}:{{ .Values.image.livenessProbe.tag }}"
{{- else }}
image: "{{ .Values.image.livenessProbe.repository }}:{{ .Values.image.livenessProbe.tag }}"
{{- end }}
args:
- --csi-address=/csi/csi.sock
- --probe-timeout=3s
{{- if eq .Values.controller.hostNetwork true }}
- --http-endpoint=localhost:{{ .Values.controller.livenessProbe.healthPort }}
{{- else }}
- --health-port={{ .Values.controller.livenessProbe.healthPort }}
{{- end }}
- --v=2
imagePullPolicy: {{ .Values.image.livenessProbe.pullPolicy }}
volumeMounts:
- name: socket-dir
mountPath: /csi
resources: {{- toYaml .Values.controller.resources.livenessProbe | nindent 12 }}
securityContext:
capabilities:
drop:
- ALL
- name: azurefile
{{- if hasPrefix "/" .Values.image.azurefile.repository }}
image: "{{ .Values.image.baseRepo }}{{ .Values.image.azurefile.repository }}:{{ .Values.image.azurefile.tag }}"
{{- else }}
image: "{{ .Values.image.azurefile.repository }}:{{ .Values.image.azurefile.tag }}"
{{- end }}
args:
- "--v={{ .Values.controller.logLevel }}"
- "--endpoint=$(CSI_ENDPOINT)"
- "--metrics-address=0.0.0.0:{{ .Values.controller.metricsPort }}"
- "--kubeconfig={{ .Values.controller.kubeconfig }}"
- "--drivername={{ .Values.driver.name }}"
- "--cloud-config-secret-name={{ .Values.controller.cloudConfigSecretName }}"
- "--cloud-config-secret-namespace={{ .Values.controller.cloudConfigSecretNamespace }}"
- "--custom-user-agent={{ .Values.driver.customUserAgent }}"
- "--user-agent-suffix={{ .Values.driver.userAgentSuffix }}"
- "--allow-empty-cloud-config={{ .Values.controller.allowEmptyCloudConfig }}"
ports:
- containerPort: {{ .Values.controller.metricsPort }}
name: metrics
protocol: TCP
{{- if ne .Values.controller.hostNetwork true }}
- containerPort: {{ .Values.controller.livenessProbe.healthPort }}
name: healthz
protocol: TCP
{{- end }}
livenessProbe:
failureThreshold: 5
httpGet:
path: /healthz
{{- if eq .Values.controller.hostNetwork true }}
host: localhost
port: {{ .Values.controller.livenessProbe.healthPort }}
{{- else }}
port: healthz
{{- end }}
initialDelaySeconds: 30
timeoutSeconds: 10
periodSeconds: 30
env:
- name: AZURE_CREDENTIAL_FILE
valueFrom:
configMapKeyRef:
name: {{ .Values.azureCredentialFileConfigMap }}
key: path
optional: true
- name: CSI_ENDPOINT
value: unix:///csi/csi.sock
{{- if ne .Values.driver.httpsProxy "" }}
- name: HTTPS_PROXY
value: {{ .Values.driver.httpsProxy }}
{{- end }}
{{- if ne .Values.driver.httpProxy "" }}
- name: HTTP_PROXY
value: {{ .Values.driver.httpProxy }}
{{- end }}
- name: AZURE_GO_SDK_LOG_LEVEL
value: {{ .Values.driver.azureGoSDKLogLevel }}
imagePullPolicy: {{ .Values.image.azurefile.pullPolicy }}
volumeMounts:
- mountPath: /csi
name: socket-dir
- mountPath: /root/.azcopy
name: azcopy-dir
- mountPath: /etc/kubernetes/
name: azure-cred
{{- if eq .Values.linux.distro "fedora" }}
- name: ssl
mountPath: /etc/ssl/certs
readOnly: true
- name: ssl-pki
mountPath: /etc/pki/ca-trust/extracted
readOnly: true
{{- end }}
resources: {{- toYaml .Values.controller.resources.azurefile | nindent 12 }}
securityContext:
capabilities:
drop:
- ALL
volumes:
- name: socket-dir
emptyDir: {}
- name: azcopy-dir
emptyDir: {}
- name: azure-cred
hostPath:
path: /etc/kubernetes/
type: DirectoryOrCreate
{{- if eq .Values.linux.distro "fedora" }}
- name: ssl
hostPath:
path: /etc/ssl/certs
- name: ssl-pki
hostPath:
path: /etc/pki/ca-trust/extracted
{{- end }}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
apiVersion: storage.k8s.io/v1
kind: CSIDriver
metadata:
name: {{ .Values.driver.name }}
labels:
{{- include "azurefile.labels" . | nindent 4 }}
annotations:
csiDriver: "{{ .Values.image.azurefile.tag }}"
snapshot: "{{ .Values.snapshot.image.csiSnapshotter.tag }}"
spec:
attachRequired: {{ .Values.controller.attachRequired }}
podInfoOnMount: true
volumeLifecycleModes:
- Persistent
- Ephemeral
fsGroupPolicy: {{ .Values.feature.fsGroupPolicy }}
tokenRequests:
- audience: api://AzureADTokenExchange
Loading

0 comments on commit 689a63e

Please sign in to comment.