diff --git a/locals.tf b/locals.tf index 7e9b3e7..4cb851a 100644 --- a/locals.tf +++ b/locals.tf @@ -15,9 +15,7 @@ locals { ssh_args = "-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${local.ssh_identity_file}" ccm_version = var.hetzner_ccm_version != null ? var.hetzner_ccm_version : data.github_release.hetzner_ccm.release_tag - ccm_latest = var.hetzner_ccm_containers_latest csi_version = var.hetzner_csi_version != null ? var.hetzner_csi_version : data.github_release.hetzner_csi.release_tag - csi_latest = var.hetzner_csi_containers_latest kured_version = data.github_release.kured.release_tag MicroOS_install_commands = [ diff --git a/master.tf b/master.tf index cdadbf3..48a1d4c 100644 --- a/master.tf +++ b/master.tf @@ -112,8 +112,7 @@ resource "hcloud_server" "first_control_plane" { ] patchesStrategicMerge = [ file("${path.module}/patches/kured.yaml"), - local.ccm_latest ? file("${path.module}/patches/ccm_latest.yaml") : file("${path.module}/patches/ccm.yaml"), - local.csi_latest ? file("${path.module}/patches/csi_latest.yaml") : null, + file("${path.module}/patches/ccm.yaml") ] }) destination = "/tmp/post_install/kustomization.yaml" diff --git a/patches/ccm_latest.yaml b/patches/ccm_latest.yaml deleted file mode 100644 index b461aa7..0000000 --- a/patches/ccm_latest.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: hcloud-cloud-controller-manager - namespace: kube-system -spec: - template: - spec: - containers: - - name: hcloud-cloud-controller-manager - command: - - "/bin/hcloud-cloud-controller-manager" - - "--cloud-provider=hcloud" - - "--leader-elect=false" - - "--allow-untagged-cloud" - - "--allocate-node-cidrs=true" - - "--cluster-cidr=10.42.0.0/16" - image: hetznercloud/hcloud-cloud-controller-manager:latest - imagePullPolicy: Always diff --git a/patches/csi_latest.yaml b/patches/csi_latest.yaml deleted file mode 100644 index a5e6f74..0000000 --- a/patches/csi_latest.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 diff --git a/terraform.tfvars.example b/terraform.tfvars.example index b8ce795..d0bd3a1 100644 --- a/terraform.tfvars.example +++ b/terraform.tfvars.example @@ -23,12 +23,6 @@ agents_num = 2 # hetzner_ccm_version = "" # hetzner_csi_version = "" -# If you want to kustomize the Hetzner CCM and CSI containers with the "latest" tags and imagePullPolicy Always, -# to have them automatically update when the node themselve get updated via the rancher system upgrade controller, the default is "true". -# Instead, if you choose false, it will give you the versions that Hetzner uses at the time of install. -# hetzner_ccm_containers_latest = false -# hetzner_csi_containers_latest = false - # If you want to use letsencrypt with tls Challenge, the email address is used to send you certificates expiration notices # traefik_acme_tls = true # traefik_acme_email = "mail@example.com" diff --git a/variables.tf b/variables.tf index 6adc6f0..e8734df 100644 --- a/variables.tf +++ b/variables.tf @@ -67,18 +67,6 @@ variable "hetzner_csi_version" { description = "Version of Container Storage Interface driver for Hetzner Cloud" } -variable "hetzner_ccm_containers_latest" { - type = bool - default = true - description = "Whether to kustomize the Hetzner CCM manifest with the latest or canary tags for containers and imagePullPolicy of Always" -} - -variable "hetzner_csi_containers_latest" { - type = bool - default = true - description = "Whether to kustomize the Hetzner CSI manifest with the latest or canary tags for containers and imagePullPolicy of Always" -} - variable "traefik_acme_tls" { type = bool default = false