Use csi chart from release tag (#727)

Signed-off-by: Daniel Weiße <dw@edgeless.systems>
This commit is contained in:
Daniel Weiße 2022-12-07 08:19:44 +01:00 committed by GitHub
parent 63f74f0d65
commit dea05c45bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 33 deletions

View File

@ -34,13 +34,6 @@ spec:
mountPath: /csi mountPath: /csi
- name: registration-dir - name: registration-dir
mountPath: /registration mountPath: /registration
livenessProbe:
initialDelaySeconds: 3
exec:
command:
- /csi-node-driver-registrar
- --kubelet-registration-path=/var/lib/kubelet/plugins/gcp.csi.confidential.cloud/csi.sock
- --mode=kubelet-registration-probe
- name: gce-pd-driver - name: gce-pd-driver
image: {{ .Values.image.gcepdDriver.repo }}:{{ .Values.image.gcepdDriver.tag }} image: {{ .Values.image.gcepdDriver.repo }}:{{ .Values.image.gcepdDriver.tag }}
imagePullPolicy: {{ .Values.image.gcepdDriver.pullPolicy }} imagePullPolicy: {{ .Values.image.gcepdDriver.pullPolicy }}
@ -62,16 +55,14 @@ spec:
# The following mounts are required to trigger host udevadm from # The following mounts are required to trigger host udevadm from
# container # container
# But we don't want that, because it breaks cryptsetup # But we don't want that, because it breaks cryptsetup
# Also, the task done by manually triggering udevadm are already
# performed by having the correct udev rules configured
# - name: udev-rules-etc # - name: udev-rules-etc
# mountPath: /etc/udev # mountPath: /etc/udev
# - name: udev-rules-lib # - name: udev-rules-lib
# mountPath: /lib/udev # mountPath: /lib/udev
# - name: udev-socket # - name: udev-socket
# mountPath: /run/udev # mountPath: /run/udev
# - name: sys - name: sys
# mountPath: /sys mountPath: /sys
- name: cryptsetup - name: cryptsetup
mountPath: /run/cryptsetup mountPath: /run/cryptsetup
volumes: volumes:
@ -94,8 +85,6 @@ spec:
# The following mounts are required to trigger host udevadm from # The following mounts are required to trigger host udevadm from
# container # container
# But we don't want that, because it breaks cryptsetup # But we don't want that, because it breaks cryptsetup
# Also, the task done by manually triggering udevadm are already
# performed by having the correct udev rules configured
# - name: udev-rules-etc # - name: udev-rules-etc
# hostPath: # hostPath:
# path: /etc/udev # path: /etc/udev

View File

@ -1,28 +1,28 @@
image: image:
csiProvisioner: csiProvisioner:
repo: k8s.gcr.io/sig-storage/csi-provisioner repo: k8s.gcr.io/sig-storage/csi-provisioner
tag: "v3.1.0" tag: "v3.1.1"
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
csiAttacher: csiAttacher:
repo: k8s.gcr.io/sig-storage/csi-attacher repo: k8s.gcr.io/sig-storage/csi-attacher
tag: "v3.4.0" tag: "v3.5.0"
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
csiResizer: csiResizer:
repo: k8s.gcr.io/sig-storage/csi-resizer repo: k8s.gcr.io/sig-storage/csi-resizer
tag: "v1.4.0" tag: "v1.5.0"
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
csiSnapshotter: csiSnapshotter:
repo: k8s.gcr.io/sig-storage/csi-snapshotter repo: k8s.gcr.io/sig-storage/csi-snapshotter
tag: "v4.0.1" tag: "v6.0.1"
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
csiNodeRegistrar: csiNodeRegistrar:
repo: k8s.gcr.io/sig-storage/csi-node-driver-registrar repo: k8s.gcr.io/sig-storage/csi-node-driver-registrar
tag: "v2.5.0" tag: "v2.5.1"
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
gcepdDriver: gcepdDriver:
repo: ghcr.io/edgelesssys/constellation/gcp-csi-driver repo: ghcr.io/edgelesssys/constellation/gcp-csi-driver
# CSI driver version is independent of Constellation releases # CSI driver version is independent of Constellation releases
tag: "v1.0.0" tag: "v1.1.0"
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
csiController: csiController:

View File

@ -34,13 +34,6 @@ spec:
mountPath: /csi mountPath: /csi
- name: registration-dir - name: registration-dir
mountPath: /registration mountPath: /registration
livenessProbe:
initialDelaySeconds: 3
exec:
command:
- /csi-node-driver-registrar
- --kubelet-registration-path=/var/lib/kubelet/plugins/gcp.csi.confidential.cloud/csi.sock
- --mode=kubelet-registration-probe
- name: gce-pd-driver - name: gce-pd-driver
image: csi-driver:v0.0.0 image: csi-driver:v0.0.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
@ -62,16 +55,14 @@ spec:
# The following mounts are required to trigger host udevadm from # The following mounts are required to trigger host udevadm from
# container # container
# But we don't want that, because it breaks cryptsetup # But we don't want that, because it breaks cryptsetup
# Also, the task done by manually triggering udevadm are already
# performed by having the correct udev rules configured
# - name: udev-rules-etc # - name: udev-rules-etc
# mountPath: /etc/udev # mountPath: /etc/udev
# - name: udev-rules-lib # - name: udev-rules-lib
# mountPath: /lib/udev # mountPath: /lib/udev
# - name: udev-socket # - name: udev-socket
# mountPath: /run/udev # mountPath: /run/udev
# - name: sys - name: sys
# mountPath: /sys mountPath: /sys
- name: cryptsetup - name: cryptsetup
mountPath: /run/cryptsetup mountPath: /run/cryptsetup
volumes: volumes:
@ -94,8 +85,6 @@ spec:
# The following mounts are required to trigger host udevadm from # The following mounts are required to trigger host udevadm from
# container # container
# But we don't want that, because it breaks cryptsetup # But we don't want that, because it breaks cryptsetup
# Also, the task done by manually triggering udevadm are already
# performed by having the correct udev rules configured
# - name: udev-rules-etc # - name: udev-rules-etc
# hostPath: # hostPath:
# path: /etc/udev # path: /etc/udev

View File

@ -48,7 +48,7 @@ download_chart() {
## GCP CSI Driver ## GCP CSI Driver
# TODO: clone from main branch once we rebase on upstream # TODO: clone from main branch once we rebase on upstream
download_chart "https://github.com/edgelesssys/constellation-gcp-compute-persistent-disk-csi-driver" "develop" "charts" "gcp-compute-persistent-disk-csi-driver" download_chart "https://github.com/edgelesssys/constellation-gcp-compute-persistent-disk-csi-driver" "v1.1.0" "charts" "gcp-compute-persistent-disk-csi-driver"
## Azure CSI Driver ## Azure CSI Driver
# TODO: clone from main branch once we rebase on upstream # TODO: clone from main branch once we rebase on upstream