tjo-cloud/infrastructure
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

feat(kubernetes): wip
Some checks failed
/ lint (push) Has been cancelled
Details

Browse source
This commit is contained in:
Tine 2024-12-05 19:13:22 +01:00
parent b0b3a3b116
commit bea62d62de
Signed by: mentos1386
SSH key fingerprint: SHA256:MNtTsLbihYaWF8j1fkOHfkKNlnN1JQfxEU/rBU8nCGw
2 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
k8s.tjo.cloud/modules/cluster/components.tf
View file

@ -4,7 +4,7 @@ data "helm_template" "cilium" {
name = "cilium" name = "cilium"
chart = "cilium" chart = "cilium"
repository = "https://helm.cilium.io/" repository = "https://helm.cilium.io/"
version = "1.15.6" version = "1.16.4"
namespace = "kube-system" namespace = "kube-system"
kube_version = var.talos.kubernetes kube_version = var.talos.kubernetes
@ -50,8 +50,8 @@ data "helm_template" "cilium" {
autoMount: autoMount:
enabled: false enabled: false
k8sServiceHost: ${var.cluster.api.internal.domain} k8sServiceHost: localhost
k8sServicePort: ${var.cluster.api.internal.port} k8sServicePort: 7445
hubble: hubble:
ui: ui:
@ -77,7 +77,7 @@ data "helm_template" "proxmox-csi" {
name = "proxmox-csi-plugin" name = "proxmox-csi-plugin"
chart = "proxmox-csi-plugin" chart = "proxmox-csi-plugin"
repository = "oci://ghcr.io/sergelogvinov/charts" repository = "oci://ghcr.io/sergelogvinov/charts"
version = "0.2.5" version = "0.2.14"
namespace = "kube-system" namespace = "kube-system"
kube_version = var.talos.kubernetes kube_version = var.talos.kubernetes
@ -120,7 +120,7 @@ data "helm_template" "proxmox-ccm" {
name = "proxmox-cloud-controller-manager" name = "proxmox-cloud-controller-manager"
chart = "proxmox-cloud-controller-manager" chart = "proxmox-cloud-controller-manager"
repository = "oci://ghcr.io/sergelogvinov/charts" repository = "oci://ghcr.io/sergelogvinov/charts"
version = "0.2.3" version = "0.2.8"
namespace = "kube-system" namespace = "kube-system"
kube_version = var.talos.kubernetes kube_version = var.talos.kubernetes
@ -146,7 +146,7 @@ data "helm_template" "talos-ccm" {
name = "talos-cloud-controller-manager" name = "talos-cloud-controller-manager"
chart = "talos-cloud-controller-manager" chart = "talos-cloud-controller-manager"
repository = "oci://ghcr.io/siderolabs/charts" repository = "oci://ghcr.io/siderolabs/charts"
version = "0.3.1" version = "0.4.3"
namespace = "kube-system" namespace = "kube-system"
kube_version = var.talos.kubernetes kube_version = var.talos.kubernetes

8
k8s.tjo.cloud/modules/cluster/main.tf
View file

@ -35,6 +35,7 @@ locals {
certSANs = [ certSANs = [
local.public_domain, local.public_domain,
local.internal_domain, local.internal_domain,
"localhost:7445",
] ]
extraArgs = { extraArgs = {
"oidc-issuer-url" = "https://id.tjo.space/application/o/k8stjocloud/", "oidc-issuer-url" = "https://id.tjo.space/application/o/k8stjocloud/",
@ -92,10 +93,6 @@ locals {
externalCloudProvider = { externalCloudProvider = {
enabled = true enabled = true
} }
controlPlane = {
endpoint = local.cluster_internal_endpoint
localAPIServerPort = var.cluster.api.internal.port
}
network = { network = {
cni = { cni = {
name = "none" name = "none"
@ -127,9 +124,6 @@ locals {
machine = { machine = {
network = { network = {
hostname = node.name hostname = node.name
kubespan = {
enabled = false
}
} }
nodeLabels = { nodeLabels = {
"k8s.tjo.cloud/host" = node.host "k8s.tjo.cloud/host" = node.host