Pull in CSI chart from release tag (#757)

Signed-off-by: Daniel Weiße <dw@edgeless.systems>
This commit is contained in:
Daniel Weiße 2022-12-09 08:32:58 +01:00 committed by GitHub
parent 1709da0085
commit d356a40bc3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 139 additions and 43 deletions

View File

@ -1,5 +1,5 @@
apiVersion: v2
appVersion: "v1.0.1"
appVersion: "v1.1.0"
description: Azure disk Container Storage Interface (CSI) Storage Plugin with on-node encryption support
name: azuredisk-csi-driver
version: v1.0.1
version: v1.1.0

View File

@ -4,6 +4,13 @@ metadata:
name: {{ .Values.controller.name }}
namespace: {{ .Release.Namespace }}
{{ include "azuredisk.labels" . | indent 2 }}
{{- with .Values.controller.labels }}
{{ . | toYaml | indent 4 }}
{{- end }}
{{- with .Values.controller.annotations }}
annotations:
{{ . | toYaml | indent 4 }}
{{- end }}
spec:
replicas: {{ .Values.controller.replicas }}
selector:
@ -15,15 +22,23 @@ spec:
app: {{ .Values.controller.name }}
{{- with .Values.controller.podLabels }}
{{ toYaml . | indent 8 }}
{{- end }}
{{- with .Values.controller.podAnnotations }}
annotations:
{{ toYaml . | indent 8 }}
{{- end }}
spec:
{{- if .Values.imagePullSecrets }}
imagePullSecrets:
{{ toYaml .Values.imagePullSecrets | indent 8 }}
{{- end }}
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}}
@ -57,6 +72,8 @@ spec:
- "--worker-threads={{ .Values.controller.provisionerWorkerThreads }}"
- "--extra-create-metadata=true"
- "--strict-topology=true"
- "--kube-api-qps=50"
- "--kube-api-burst=100"
env:
- name: ADDRESS
value: /csi/csi.sock
@ -73,10 +90,12 @@ spec:
args:
- "-v=2"
- "-csi-address=$(ADDRESS)"
- "-timeout=600s"
- "-timeout=1200s"
- "-leader-election"
- "--leader-election-namespace={{ .Release.Namespace }}"
- "-worker-threads={{ .Values.controller.attacherWorkerThreads }}"
- "-kube-api-qps=50"
- "-kube-api-burst=100"
env:
- name: ADDRESS
value: /csi/csi.sock
@ -181,6 +200,18 @@ spec:
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 }}
{{- if ne .Values.driver.noProxy "" }}
- name: NO_PROXY
value: {{ .Values.driver.noProxy }}
{{- end }}
- name: AZURE_GO_SDK_LOG_LEVEL
value: {{ .Values.driver.azureGoSDKLogLevel }}
{{- if eq .Values.cloud "AzureStackCloud" }}

View File

@ -5,6 +5,13 @@ metadata:
name: {{ .Values.linux.dsName }}
namespace: {{ .Release.Namespace }}
{{ include "azuredisk.labels" . | indent 2 }}
{{- with .Values.linux.labels }}
{{ . | toYaml | indent 4 }}
{{- end }}
{{- with .Values.linux.annotations }}
annotations:
{{ . | toYaml | indent 4 }}
{{- end }}
spec:
updateStrategy:
rollingUpdate:
@ -19,16 +26,27 @@ spec:
app: {{ .Values.linux.dsName }}
{{- with .Values.linux.podLabels }}
{{ toYaml . | indent 8 }}
{{- end }}
{{- with .Values.linux.podAnnotations }}
annotations:
{{ toYaml . | indent 8 }}
{{- end }}
spec:
{{- if .Values.imagePullSecrets }}
imagePullSecrets:
{{ toYaml .Values.imagePullSecrets | indent 8 }}
{{- end }}
hostNetwork: {{ .Values.linux.hostNetwork }}
serviceAccountName: {{ .Values.serviceAccount.node }}
nodeSelector:
kubernetes.io/os: linux
{{- with .Values.linux.nodeSelector }}
{{ toYaml . | indent 8 }}
{{- end }}
affinity:
{{- with .Values.linux.affinity }}
{{ toYaml . | indent 8 }}
{{- end }}
nodeAffinity:
{{ toYaml .Values.linux.nodeAffinity | indent 10 }}
priorityClassName: system-node-critical
@ -125,6 +143,18 @@ spec:
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 }}
{{- if ne .Values.driver.noProxy "" }}
- name: NO_PROXY
value: {{ .Values.driver.noProxy }}
{{- end }}
- name: KUBE_NODE_NAME
valueFrom:
fieldRef:

View File

@ -5,6 +5,13 @@ metadata:
name: {{ .Values.snapshot.snapshotController.name }}
namespace: {{ .Release.Namespace }}
{{ include "azuredisk.labels" . | indent 2 }}
{{- with .Values.snapshot.snapshotController.labels }}
{{ . | toYaml | indent 4 }}
{{- end }}
{{- with .Values.snapshot.snapshotController.annotations }}
annotations:
{{ . | toYaml | indent 4 }}
{{- end }}
spec:
replicas: {{ .Values.snapshot.snapshotController.replicas }}
selector:
@ -16,6 +23,10 @@ spec:
app: {{ .Values.snapshot.snapshotController.name }}
{{- with .Values.snapshot.snapshotController.podLabels }}
{{ toYaml . | indent 8 }}
{{- end }}
{{- with .Values.snapshot.snapshotController.podAnnotations }}
annotations:
{{ toYaml . | indent 8 }}
{{- end }}
spec:
serviceAccountName: {{ .Values.serviceAccount.snapshotController }}

View File

@ -181,7 +181,7 @@ metadata:
rules:
- apiGroups: [""]
resources: ["secrets"]
verbs: ["get", "list"]
verbs: ["get"]
---
kind: ClusterRoleBinding

View File

@ -7,7 +7,7 @@ metadata:
rules:
- apiGroups: [""]
resources: ["secrets"]
verbs: ["get", "list"]
verbs: ["get"]
- apiGroups: [""]
resources: ["nodes"]
verbs: ["get"]

View File

@ -2,7 +2,7 @@ image:
baseRepo: mcr.microsoft.com
azuredisk:
repository: ghcr.io/edgelesssys/constellation/azure-csi-driver
tag: v1.0.1
tag: v1.1.0
pullPolicy: IfNotPresent
csiProvisioner:
repository: /oss/kubernetes-csi/csi-provisioner
@ -48,7 +48,7 @@ controller:
runOnControlPlane: true
disableAvailabilitySetNodes: false
vmType: ""
provisionerWorkerThreads: 40
provisionerWorkerThreads: 100
attacherWorkerThreads: 500
vmssCacheTTLInSeconds: -1
logLevel: 5
@ -68,7 +68,13 @@ controller:
- key: "node.kubernetes.io/not-ready"
effect: NoSchedule
operator: Exists
hostNetwork: false
labels: {}
annotations: {}
podLabels: {}
podAnnotations: {}
nodeSelector: {}
affinity: {}
resources:
csiProvisioner:
limits:
@ -135,7 +141,10 @@ snapshot:
snapshotController:
name: csi-snapshot-controller
replicas: 2
labels: {}
annotations: {}
podLabels: {}
podAnnotations: {}
resources:
limits:
memory: 100Mi
@ -154,6 +163,9 @@ driver:
customUserAgent: ""
userAgentSuffix: "OSS-helm"
azureGoSDKLogLevel: "" # available values: ""(no logs), DEBUG, INFO, WARNING, ERROR
httpsProxy: ""
httpProxy: ""
noProxy: ""
linux:
enabled: true
@ -163,8 +175,14 @@ linux:
enablePerfOptimization: true
tolerations:
- operator: "Exists"
hostNetwork: false # this setting could be disabled if perfProfile is `none`
getNodeInfoFromLabels: false # get node info from node labels instead of IMDS
labels: {}
annotations: {}
podLabels: {}
podAnnotations: {}
nodeSelector: {}
affinity: {}
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:

View File

@ -7,8 +7,8 @@ metadata:
app.kubernetes.io/instance: "testRelease"
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/name: "azuredisk-csi-driver"
app.kubernetes.io/version: "v1.0.1"
helm.sh/chart: "azuredisk-csi-driver-v1.0.1"
app.kubernetes.io/version: "v1.1.0"
helm.sh/chart: "azuredisk-csi-driver-v1.1.0"
spec:
replicas: 1
selector:
@ -20,11 +20,12 @@ spec:
app.kubernetes.io/instance: "testRelease"
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/name: "azuredisk-csi-driver"
app.kubernetes.io/version: "v1.0.1"
helm.sh/chart: "azuredisk-csi-driver-v1.0.1"
app.kubernetes.io/version: "v1.1.0"
helm.sh/chart: "azuredisk-csi-driver-v1.1.0"
app: csi-azuredisk-controller
spec:
serviceAccountName: csi-azuredisk-controller-sa
hostNetwork: false
nodeSelector:
kubernetes.io/os: linux
node-role.kubernetes.io/control-plane: ""
@ -55,9 +56,11 @@ spec:
- "--timeout=15s"
- "--leader-election"
- "--leader-election-namespace=testNamespace"
- "--worker-threads=40"
- "--worker-threads=100"
- "--extra-create-metadata=true"
- "--strict-topology=true"
- "--kube-api-qps=50"
- "--kube-api-burst=100"
env:
- name: ADDRESS
value: /csi/csi.sock
@ -75,10 +78,12 @@ spec:
args:
- "-v=2"
- "-csi-address=$(ADDRESS)"
- "-timeout=600s"
- "-timeout=1200s"
- "-leader-election"
- "--leader-election-namespace=testNamespace"
- "-worker-threads=500"
- "-kube-api-qps=50"
- "-kube-api-burst=100"
env:
- name: ADDRESS
value: /csi/csi.sock
@ -149,7 +154,7 @@ spec:
cpu: 10m
memory: 20Mi
- name: azuredisk
image: "ghcr.io/edgelesssys/constellation/azure-csi-driver:v1.0.1"
image: "ghcr.io/edgelesssys/constellation/azure-csi-driver:v1.1.0"
args:
- "--v=5"
- "--endpoint=$(CSI_ENDPOINT)"

View File

@ -3,7 +3,7 @@ kind: CSIDriver
metadata:
name: azuredisk.csi.confidential.cloud
annotations:
csiDriver: "v1.0.1"
csiDriver: "v1.1.0"
snapshot: "v5.0.1"
spec:
attachRequired: true

View File

@ -7,8 +7,8 @@ metadata:
app.kubernetes.io/instance: "testRelease"
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/name: "azuredisk-csi-driver"
app.kubernetes.io/version: "v1.0.1"
helm.sh/chart: "azuredisk-csi-driver-v1.0.1"
app.kubernetes.io/version: "v1.1.0"
helm.sh/chart: "azuredisk-csi-driver-v1.1.0"
spec:
updateStrategy:
rollingUpdate:
@ -23,11 +23,12 @@ spec:
app.kubernetes.io/instance: "testRelease"
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/name: "azuredisk-csi-driver"
app.kubernetes.io/version: "v1.0.1"
helm.sh/chart: "azuredisk-csi-driver-v1.0.1"
app.kubernetes.io/version: "v1.1.0"
helm.sh/chart: "azuredisk-csi-driver-v1.1.0"
app: csi-azuredisk-node
spec:
serviceAccountName: csi-azuredisk-node-sa
hostNetwork: false
nodeSelector:
kubernetes.io/os: linux
affinity:
@ -90,7 +91,7 @@ spec:
cpu: 10m
memory: 20Mi
- name: azuredisk
image: "ghcr.io/edgelesssys/constellation/azure-csi-driver:v1.0.1"
image: "ghcr.io/edgelesssys/constellation/azure-csi-driver:v1.1.0"
args:
- "--v=5"
- "--endpoint=$(CSI_ENDPOINT)"

View File

@ -6,8 +6,8 @@ metadata:
app.kubernetes.io/instance: "testRelease"
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/name: "azuredisk-csi-driver"
app.kubernetes.io/version: "v1.0.1"
helm.sh/chart: "azuredisk-csi-driver-v1.0.1"
app.kubernetes.io/version: "v1.1.0"
helm.sh/chart: "azuredisk-csi-driver-v1.1.0"
rules:
- apiGroups: [""]
resources: ["persistentvolumes"]
@ -47,8 +47,8 @@ metadata:
app.kubernetes.io/instance: "testRelease"
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/name: "azuredisk-csi-driver"
app.kubernetes.io/version: "v1.0.1"
helm.sh/chart: "azuredisk-csi-driver-v1.0.1"
app.kubernetes.io/version: "v1.1.0"
helm.sh/chart: "azuredisk-csi-driver-v1.1.0"
subjects:
- kind: ServiceAccount
name: csi-azuredisk-controller-sa
@ -68,8 +68,8 @@ metadata:
app.kubernetes.io/instance: "testRelease"
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/name: "azuredisk-csi-driver"
app.kubernetes.io/version: "v1.0.1"
helm.sh/chart: "azuredisk-csi-driver-v1.0.1"
app.kubernetes.io/version: "v1.1.0"
helm.sh/chart: "azuredisk-csi-driver-v1.1.0"
rules:
- apiGroups: [""]
resources: ["persistentvolumes"]
@ -99,8 +99,8 @@ metadata:
app.kubernetes.io/instance: "testRelease"
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/name: "azuredisk-csi-driver"
app.kubernetes.io/version: "v1.0.1"
helm.sh/chart: "azuredisk-csi-driver-v1.0.1"
app.kubernetes.io/version: "v1.1.0"
helm.sh/chart: "azuredisk-csi-driver-v1.1.0"
subjects:
- kind: ServiceAccount
name: csi-azuredisk-controller-sa
@ -120,8 +120,8 @@ metadata:
app.kubernetes.io/instance: "testRelease"
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/name: "azuredisk-csi-driver"
app.kubernetes.io/version: "v1.0.1"
helm.sh/chart: "azuredisk-csi-driver-v1.0.1"
app.kubernetes.io/version: "v1.1.0"
helm.sh/chart: "azuredisk-csi-driver-v1.1.0"
rules:
- apiGroups: [""]
resources: ["events"]
@ -151,8 +151,8 @@ metadata:
app.kubernetes.io/instance: "testRelease"
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/name: "azuredisk-csi-driver"
app.kubernetes.io/version: "v1.0.1"
helm.sh/chart: "azuredisk-csi-driver-v1.0.1"
app.kubernetes.io/version: "v1.1.0"
helm.sh/chart: "azuredisk-csi-driver-v1.1.0"
subjects:
- kind: ServiceAccount
name: csi-azuredisk-controller-sa
@ -171,8 +171,8 @@ metadata:
app.kubernetes.io/instance: "testRelease"
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/name: "azuredisk-csi-driver"
app.kubernetes.io/version: "v1.0.1"
helm.sh/chart: "azuredisk-csi-driver-v1.0.1"
app.kubernetes.io/version: "v1.1.0"
helm.sh/chart: "azuredisk-csi-driver-v1.1.0"
rules:
- apiGroups: [""]
resources: ["persistentvolumes"]
@ -201,8 +201,8 @@ metadata:
app.kubernetes.io/instance: "testRelease"
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/name: "azuredisk-csi-driver"
app.kubernetes.io/version: "v1.0.1"
helm.sh/chart: "azuredisk-csi-driver-v1.0.1"
app.kubernetes.io/version: "v1.1.0"
helm.sh/chart: "azuredisk-csi-driver-v1.1.0"
subjects:
- kind: ServiceAccount
name: csi-azuredisk-controller-sa
@ -220,7 +220,7 @@ metadata:
rules:
- apiGroups: [""]
resources: ["secrets"]
verbs: ["get", "list"]
verbs: ["get"]
---
kind: ClusterRoleBinding

View File

@ -6,7 +6,7 @@ metadata:
rules:
- apiGroups: [""]
resources: ["secrets"]
verbs: ["get", "list"]
verbs: ["get"]
- apiGroups: [""]
resources: ["nodes"]
verbs: ["get"]

View File

@ -7,5 +7,5 @@ metadata:
app.kubernetes.io/instance: "testRelease"
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/name: "azuredisk-csi-driver"
app.kubernetes.io/version: "v1.0.1"
helm.sh/chart: "azuredisk-csi-driver-v1.0.1"
app.kubernetes.io/version: "v1.1.0"
helm.sh/chart: "azuredisk-csi-driver-v1.1.0"

View File

@ -7,5 +7,5 @@ metadata:
app.kubernetes.io/instance: "testRelease"
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/name: "azuredisk-csi-driver"
app.kubernetes.io/version: "v1.0.1"
helm.sh/chart: "azuredisk-csi-driver-v1.0.1"
app.kubernetes.io/version: "v1.1.0"
helm.sh/chart: "azuredisk-csi-driver-v1.1.0"

View File

@ -52,4 +52,4 @@ download_chart "https://github.com/edgelesssys/constellation-gcp-compute-persist
## Azure CSI Driver
# TODO: clone from main branch once we rebase on upstream
download_chart "https://github.com/edgelesssys/constellation-azuredisk-csi-driver" "develop" "charts/edgeless" "azuredisk-csi-driver"
download_chart "https://github.com/edgelesssys/constellation-azuredisk-csi-driver" "v1.1.0" "charts/edgeless" "azuredisk-csi-driver"