diff --git a/clank_kustomization_backup.yaml b/clank_kustomization_backup.yaml new file mode 100644 index 0000000..d632240 --- /dev/null +++ b/clank_kustomization_backup.yaml @@ -0,0 +1,50 @@ +"apiVersion": "kustomize.config.k8s.io/v1beta1" +"kind": "Kustomization" +"patchesStrategicMerge": +- | + apiVersion: apps/v1 + kind: DaemonSet + metadata: + name: kured + namespace: kube-system + spec: + selector: + matchLabels: + name: kured + template: + metadata: + labels: + name: kured + spec: + serviceAccountName: kured + containers: + - name: kured + command: + - /usr/bin/kured + - --reboot-command=/usr/bin/systemctl reboot +- | + apiVersion: apps/v1 + kind: Deployment + metadata: + name: system-upgrade-controller + namespace: system-upgrade + spec: + template: + spec: + containers: + - name: system-upgrade-controller + volumeMounts: + - name: ca-certificates + mountPath: /var/lib/ca-certificates + volumes: + - name: ca-certificates + hostPath: + path: /var/lib/ca-certificates + type: Directory +- "ccm.yaml" +"resources": +- "https://github.com/hetznercloud/hcloud-cloud-controller-manager/releases/download/v1.12.1/ccm-networks.yaml" +- "https://github.com/weaveworks/kured/releases/download/1.9.2/kured-1.9.2-dockerhub.yaml" +- "https://raw.githubusercontent.com/rancher/system-upgrade-controller/master/manifests/system-upgrade-controller.yaml" +- "https://raw.githubusercontent.com/hetznercloud/csi-driver/v1.6.0/deploy/kubernetes/hcloud-csi.yml" +- "traefik_config.yaml" diff --git a/main.tf b/main.tf index a5d81ed..68a5011 100644 --- a/main.tf +++ b/main.tf @@ -1,10 +1,28 @@ +terraform { + required_version = ">= 1.2.0" + required_providers { + hcloud = { + source = "hetznercloud/hcloud" + version = ">= 1.0.0" + } + } +} + +provider "hcloud" { + token = var.hcloud_token +} + module "kube-hetzner" { + providers = { + hcloud = hcloud + } + source = "kube-hetzner/kube-hetzner/hcloud" hcloud_token = var.hcloud_token - public_key = ".keys/id_ed25519.pub" - private_key = ".keys/id_ed25519" + ssh_public_key = file(".keys/id_ed25519.pub") + ssh_private_key = file(".keys/id_ed25519") network_region = "eu-central" # change to `us-east` if location is ash control_plane_nodepools = [ @@ -49,7 +67,7 @@ module "kube-hetzner" { location = "nbg1", labels = [], taints = [], - count = 1 + count = 0 }, { name = "storage1", @@ -61,13 +79,14 @@ module "kube-hetzner" { taints = [ "server-usage=storage:NoSchedule" ], - count = 2 + count = 1 } ] load_balancer_type = "lb11" load_balancer_location = "fsn1" traefik_enabled = true + traefik_additional_options = ["--log.level=DEBUG", "--tracing=true"] metrics_server_enabled = true automatically_upgrade_k3s = true initial_k3s_channel = "stable" @@ -95,10 +114,7 @@ module "kube-hetzner" { } ] - # If you want to configure additional Arguments for traefik, enter them here as a list and in the form of traefik CLI arguments; see https://doc.traefik.io/traefik/reference/static-configuration/cli/ - # Example: traefik_additional_options = ["--log.level=DEBUG", "--tracing=true"] - traefik_additional_options = ["--tracing=true"] - enable_cert_manager = true + enable_cert_manager = false } module "dns" { @@ -121,13 +137,13 @@ module "dns" { ] } -module "flux" { - source = "./modules/flux" - path = "clank" - namespace = "flux-system" - url = "ssh://git@git.front.kjuulh.io/clank/kubernetes-state.git" - branch = "main" - - ssh_private_key_pem = file(".keys/id_clank") - ssh_public_key_pem = file(".keys/id_clank.pub") -} +#module "flux" { +# source = "./modules/flux" +# path = "clank" +# namespace = "flux-system" +# url = "ssh://git@git.front.kjuulh.io/clank/kubernetes-state.git" +# branch = "main" +# +# ssh_private_key_pem = file(".keys/id_clank") +# ssh_public_key_pem = file(".keys/id_clank.pub") +#} diff --git a/modules/flux/main.tf b/modules/flux/main.tf index 3b74386..72c15ed 100644 --- a/modules/flux/main.tf +++ b/modules/flux/main.tf @@ -1,116 +1,128 @@ # Install -data "flux_install" "main" { - target_path = var.path - network_policy = false - version = "latest" -} - -resource "kubernetes_namespace" "flux_system" { - metadata { - name = var.namespace - } - - lifecycle { - ignore_changes = [ - metadata[0].labels, - ] - } -} - -resource "kubernetes_namespace" "prod" { - metadata { - name = "prod" - } - - lifecycle { - ignore_changes = [ - metadata[0].labels, - ] - } -} - -data "kubectl_file_documents" "apply" { - content = data.flux_install.main.content -} - -# Convert documents list to include parsed yaml data -locals { - apply = [for v in data.kubectl_file_documents.apply.documents : { - data : yamldecode(v) - content : v - } - ] -} - -# Apply manifests on the cluster -resource "kubectl_manifest" "apply" { - for_each = { for v in local.apply : lower(join("/", compact([v.data.apiVersion, v.data.kind, lookup(v.data.metadata, "namespace", ""), v.data.metadata.name]))) => v.content } - depends_on = [kubernetes_namespace.flux_system] - yaml_body = each.value -} - -# Sync - -data "flux_sync" "main" { - target_path = var.path - url = var.url - branch = var.branch -} - -# Split multi-doc YAML with -# https://registry.terraform.io/providers/gavinbunney/kubectl/latest -data "kubectl_file_documents" "sync" { - content = data.flux_sync.main.content -} - -# Convert documents list to include parsed yaml data -locals { - sync = [for v in data.kubectl_file_documents.sync.documents : { - data : yamldecode(v) - content : v - } - ] -} - -# Apply manifests on the cluster -resource "kubectl_manifest" "sync" { - for_each = { for v in local.sync : lower(join("/", compact([v.data.apiVersion, v.data.kind, lookup(v.data.metadata, "namespace", ""), v.data.metadata.name]))) => v.content } - depends_on = [kubernetes_namespace.flux_system] - yaml_body = each.value -} - -locals { - known_hosts = < v.content } +# depends_on = [kubernetes_namespace.flux_system] +# yaml_body = each.value +#} +# +## Sync +# +#data "flux_sync" "main" { +# target_path = var.path +# url = var.url +# branch = var.branch +#} +# +## Split multi-doc YAML with +## https://registry.terraform.io/providers/gavinbunney/kubectl/latest +#data "kubectl_file_documents" "sync" { +# content = data.flux_sync.main.content +#} +# +## Convert documents list to include parsed yaml data +#locals { +# sync = [for v in data.kubectl_file_documents.sync.documents : { +# data : yamldecode(v) +# content : v +# } +# ] +#} +# +## Apply manifests on the cluster +#resource "kubectl_manifest" "sync" { +# for_each = { for v in local.sync : lower(join("/", compact([v.data.apiVersion, v.data.kind, lookup(v.data.metadata, "namespace", ""), v.data.metadata.name]))) => v.content } +# depends_on = [kubernetes_namespace.flux_system] +# yaml_body = each.value +#} +# +#locals { +# known_hosts = <