diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/K3s.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/K3s.kt index caa9070..615df3a 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/K3s.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/K3s.kt @@ -10,8 +10,8 @@ import java.io.File // ----------------------------------- versions -------------------------------- -// when updating this version, it is recommended to update also file k3s-install.sh in this repo -// (under: src/main/resources/org/domaindrivenarchitecture/provs/server/infrastructure/k3s/k3s-install.sh) +// when updating this version, it is recommended to update also file k3s-install.sh as well as traefik.yaml in this repo +// (both files in: src/main/resources/org/domaindrivenarchitecture/provs/server/infrastructure/k3s/) const val K3S_VERSION = "v1.29.1+k3s2" // ----------------------------------- directories -------------------------------- diff --git a/src/main/resources/org/domaindrivenarchitecture/provs/server/infrastructure/k3s/traefik.yaml b/src/main/resources/org/domaindrivenarchitecture/provs/server/infrastructure/k3s/traefik.yaml index 96cd049..6f15517 100644 --- a/src/main/resources/org/domaindrivenarchitecture/provs/server/infrastructure/k3s/traefik.yaml +++ b/src/main/resources/org/domaindrivenarchitecture/provs/server/infrastructure/k3s/traefik.yaml @@ -6,7 +6,7 @@ metadata: name: traefik-crd namespace: kube-system spec: - chart: https://%{KUBERNETES_API}%/static/charts/traefik-crd-21.2.1+up21.2.0.tgz + chart: https://%{KUBERNETES_API}%/static/charts/traefik-crd-25.0.2+up25.0.0.tgz --- apiVersion: helm.cattle.io/v1 kind: HelmChart @@ -14,16 +14,10 @@ metadata: name: traefik namespace: kube-system spec: - chart: https://%{KUBERNETES_API}%/static/charts/traefik-21.2.1+up21.2.0.tgz + chart: https://%{KUBERNETES_API}%/static/charts/traefik-25.0.2+up25.0.0.tgz set: - global.systemDefaultRegistry: "" + global.systemDefaultRegistry: "%{SYSTEM_DEFAULT_REGISTRY_RAW}%" valuesContent: |- - rbac: - enabled: true - ports: - websecure: - tls: - enabled: true podAnnotations: prometheus.io/port: "8082" prometheus.io/scrape: "true" @@ -33,8 +27,8 @@ spec: enabled: true priorityClassName: "system-cluster-critical" image: - name: "rancher/mirrored-library-traefik" - tag: "2.6.2" + repository: "rancher/mirrored-library-traefik" + tag: "2.10.5" tolerations: - key: "CriticalAddonsOnly" operator: "Exists" @@ -45,11 +39,4 @@ spec: operator: "Exists" effect: "NoSchedule" service: - ipFamilyPolicy: "PreferDualStack" - annotations: - metallb.universe.tf/allow-shared-ip: "shared-ip-service-group" - metallb.universe.tf/address-pool: public - spec: - type: LoadBalancer - externalTrafficPolicy: Cluster - + ipFamilyPolicy: "PreferDualStack"