From 8b0e0666ef19071985e2d43915f4ae60ff470ad4 Mon Sep 17 00:00:00 2001 From: Karim Naufal Date: Fri, 14 Jan 2022 09:33:34 +0100 Subject: [PATCH] removed kustomization of CCM and CSI images, now more vanilla --- hetzner/ccm/patch.yaml | 4 +-- hetzner/csi/patch.yaml | 54 ---------------------------------- templates/hetzner_csi.yaml.tpl | 3 -- 3 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 hetzner/csi/patch.yaml diff --git a/hetzner/ccm/patch.yaml b/hetzner/ccm/patch.yaml index a631620..179b775 100644 --- a/hetzner/ccm/patch.yaml +++ b/hetzner/ccm/patch.yaml @@ -7,9 +7,7 @@ spec: template: spec: containers: - - image: hetznercloud/hcloud-cloud-controller-manager:latest - imagePullPolicy: Always - name: hcloud-cloud-controller-manager + - name: hcloud-cloud-controller-manager command: - "/bin/hcloud-cloud-controller-manager" - "--cloud-provider=hcloud" diff --git a/hetzner/csi/patch.yaml b/hetzner/csi/patch.yaml deleted file mode 100644 index 743d655..0000000 --- a/hetzner/csi/patch.yaml +++ /dev/null @@ -1,54 +0,0 @@ -kind: StatefulSet -apiVersion: apps/v1 -metadata: - name: hcloud-csi-controller - namespace: kube-system -spec: - template: - metadata: - labels: - app: hcloud-csi-controller - spec: - containers: - - name: csi-attacher - image: quay.io/k8scsi/csi-attacher:canary - imagePullPolicy: Always - - name: csi-resizer - image: quay.io/k8scsi/csi-resizer:canary - imagePullPolicy: Always - - name: csi-provisioner - image: quay.io/k8scsi/csi-provisioner:canary - imagePullPolicy: Always - - name: hcloud-csi-driver - image: hetznercloud/hcloud-csi-driver:latest - imagePullPolicy: Always - - name: liveness-probe - image: quay.io/k8scsi/livenessprobe:canary - imagePullPolicy: Always - volumes: - - name: socket-dir - emptyDir: {} ---- -kind: DaemonSet -apiVersion: apps/v1 -metadata: - name: hcloud-csi-node - namespace: kube-system - labels: - app: hcloud-csi -spec: - selector: - matchLabels: - app: hcloud-csi - template: - spec: - containers: - - name: csi-node-driver-registrar - image: quay.io/k8scsi/csi-node-driver-registrar:canary - imagePullPolicy: Always - - name: hcloud-csi-driver - image: hetznercloud/hcloud-csi-driver:latest - imagePullPolicy: Always - - name: liveness-probe - image: quay.io/k8scsi/livenessprobe:canary - imagePullPolicy: Always \ No newline at end of file diff --git a/templates/hetzner_csi.yaml.tpl b/templates/hetzner_csi.yaml.tpl index 8a91b8d..5b0d45d 100644 --- a/templates/hetzner_csi.yaml.tpl +++ b/templates/hetzner_csi.yaml.tpl @@ -3,6 +3,3 @@ kind: Kustomization resources: - "https://raw.githubusercontent.com/hetznercloud/csi-driver/${csi_version}/deploy/kubernetes/hcloud-csi.yml" - -patchesStrategicMerge: -- patch.yaml