diff --git a/CHANGELOG.md b/CHANGELOG.md index e2448c51..582bf3b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Changed + +- Bump to flatcar `3227.2.1`. +- Bump to kubernetes `1.23.9`. +- Bump to cilium app version `0.2.6`. +- Bump to coredns app version `1.11.0`. +- Bump to nginx-ingress-controller app version `2.15.1`. +- [AWS] Bump to aws-cloud-controller-manager app version `1.23.2-gs2`. +- [AWS] Bump to aws-ebs-csi-driver app version `2.16.1`. +- [Azure] Bump azure-cloud-controller-manager app to version `1.23.17-gs2`. +- [Azure] Bump azure-cloud-node-manager app to version `1.23.17-gs1`. +- [Azure] Bump azuredisk-ebs-driver app to version `1.21.0-gs1`. - Enable `--allocate-node-cidrs` to controller-manager flags. - Bump `azure-cloud-controller-manager` to `1.1.17-gs2`. diff --git a/platforms/aws/giantnetes/variables.tf b/platforms/aws/giantnetes/variables.tf index c3ac3fa9..67d52b5e 100644 --- a/platforms/aws/giantnetes/variables.tf +++ b/platforms/aws/giantnetes/variables.tf @@ -130,7 +130,7 @@ variable "flatcar_linux_channel" { variable "flatcar_linux_version" { description = "Flatcar linux version." type = string - default = "3139.2.3" + default = "3227.2.1" } variable "flatcar_ami_owner" { @@ -150,7 +150,7 @@ variable "docker_registry_mirror" { variable "hyperkube_version" { type = string - default = "1.22.11" + default = "1.23.9" } ### DNS ### diff --git a/platforms/azure/giantnetes/variables.tf b/platforms/azure/giantnetes/variables.tf index 406196ad..76395c5e 100644 --- a/platforms/azure/giantnetes/variables.tf +++ b/platforms/azure/giantnetes/variables.tf @@ -138,7 +138,7 @@ variable "flatcar_linux_channel" { variable "flatcar_linux_version" { description = "Flatcar linux version." type = string - default = "3139.2.3" + default = "3227.2.1" } variable "vault_image_publisher" { @@ -168,7 +168,7 @@ variable "docker_registry_mirror" { variable "hyperkube_version" { type = string - default = "1.22.11" + default = "1.23.9" } variable "pod_infra_image" { diff --git a/templates/files/apps/aws/aws-cloud-controller-manager-app.yaml b/templates/files/apps/aws/aws-cloud-controller-manager-app.yaml index bdafe34c..04511f63 100644 --- a/templates/files/apps/aws/aws-cloud-controller-manager-app.yaml +++ b/templates/files/apps/aws/aws-cloud-controller-manager-app.yaml @@ -33,4 +33,4 @@ spec: secret: name: "" namespace: "" - version: 1.22.4-gs1 + version: 1.23.2-gs2 diff --git a/templates/files/apps/aws/aws-ebs-csi-driver-app.yaml b/templates/files/apps/aws/aws-ebs-csi-driver-app.yaml index 076fb97a..ffda9ffa 100644 --- a/templates/files/apps/aws/aws-ebs-csi-driver-app.yaml +++ b/templates/files/apps/aws/aws-ebs-csi-driver-app.yaml @@ -53,4 +53,4 @@ spec: secret: name: "" namespace: "" - version: 2.15.0 + version: 2.16.1 diff --git a/templates/files/apps/azure/azure-cloud-controller-manager.yaml b/templates/files/apps/azure/azure-cloud-controller-manager.yaml index a0e37454..8971956d 100644 --- a/templates/files/apps/azure/azure-cloud-controller-manager.yaml +++ b/templates/files/apps/azure/azure-cloud-controller-manager.yaml @@ -5,6 +5,8 @@ metadata: namespace: giantswarm data: values: | + image: + registry: {{ .DockerRegistry }} cluster: calico: CIDR: {{ .PodCIDR }} @@ -41,5 +43,5 @@ spec: secret: name: "" namespace: "" - version: 1.1.17-gs2 + version: v1.23.17-gs2 diff --git a/templates/files/apps/azure/azure-cloud-node-manager.yaml b/templates/files/apps/azure/azure-cloud-node-manager.yaml index 90edbb37..a8d6f488 100644 --- a/templates/files/apps/azure/azure-cloud-node-manager.yaml +++ b/templates/files/apps/azure/azure-cloud-node-manager.yaml @@ -1,3 +1,13 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: azure-cloud-node-manager-user-values + namespace: giantswarm +data: + values: | + image: + registry: {{ .DockerRegistry }} +--- apiVersion: application.giantswarm.io/v1alpha1 kind: App metadata: @@ -25,10 +35,10 @@ spec: namespaceConfig: {} userConfig: configMap: - name: "" - namespace: "" + name: "azure-cloud-node-manager-user-values" + namespace: "giantswarm" secret: name: "" namespace: "" - version: 1.1.17-gs1 + version: v1.23.17-gs1 diff --git a/templates/files/apps/azure/azure-scheduled-events.yaml b/templates/files/apps/azure/azure-scheduled-events.yaml index 3557320b..06cf6531 100644 --- a/templates/files/apps/azure/azure-scheduled-events.yaml +++ b/templates/files/apps/azure/azure-scheduled-events.yaml @@ -1,3 +1,15 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: azure-scheduled-events-user-values + namespace: giantswarm +data: + values: | + Installation: + V1: + Registry: + Domain: {{ .DockerRegistry }} +--- apiVersion: application.giantswarm.io/v1alpha1 kind: App metadata: @@ -25,8 +37,8 @@ spec: namespaceConfig: {} userConfig: configMap: - name: "" - namespace: "" + name: "azure-scheduled-events-user-values" + namespace: "giantswarm" secret: name: "" namespace: "" diff --git a/templates/files/apps/azure/azuredisk-csi-driver.yaml b/templates/files/apps/azure/azuredisk-csi-driver.yaml index 18bd032f..90b34966 100644 --- a/templates/files/apps/azure/azuredisk-csi-driver.yaml +++ b/templates/files/apps/azure/azuredisk-csi-driver.yaml @@ -1,3 +1,13 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: azuredisk-csi-driver-user-values + namespace: giantswarm +data: + values: | + image: + baseRepo: {{ .DockerRegistry }}/giantswarm/ +--- apiVersion: application.giantswarm.io/v1alpha1 kind: App metadata: @@ -25,10 +35,10 @@ spec: namespaceConfig: {} userConfig: configMap: - name: "" - namespace: "" + name: "azuredisk-csi-driver-user-values" + namespace: "giantswarm" secret: name: "" namespace: "" - version: v1.19.0-gs1 + version: v1.21.0-gs1 diff --git a/templates/files/apps/common/cilium-app.yaml b/templates/files/apps/common/cilium-app.yaml index 5060fdb2..49254c1c 100644 --- a/templates/files/apps/common/cilium-app.yaml +++ b/templates/files/apps/common/cilium-app.yaml @@ -89,4 +89,4 @@ spec: secret: name: "" namespace: "" - version: 0.2.3 + version: 0.2.6 diff --git a/templates/files/apps/common/coredns-app.yaml b/templates/files/apps/common/coredns-app.yaml index b94f2db1..0fd0561f 100644 --- a/templates/files/apps/common/coredns-app.yaml +++ b/templates/files/apps/common/coredns-app.yaml @@ -5,6 +5,8 @@ metadata: namespace: giantswarm data: values: | + image: + registry: {{ .DockerRegistry }} cluster: kubernetes: clusterDomain: {{ .ClusterDomain }} @@ -49,4 +51,4 @@ spec: secret: name: "" namespace: "" - version: 1.10.1 + version: 1.11.0 diff --git a/templates/files/apps/common/ingress-controller-app.yaml b/templates/files/apps/common/ingress-controller-app.yaml index 5e77faec..fc2e0ced 100644 --- a/templates/files/apps/common/ingress-controller-app.yaml +++ b/templates/files/apps/common/ingress-controller-app.yaml @@ -5,6 +5,8 @@ metadata: namespace: giantswarm data: configmap-values.yaml: | + image: + registry: {{ .DockerRegistry }} configmap: use-forwarded-headers: "false" {{- if eq .Provider "aws" }} @@ -50,4 +52,4 @@ spec: secret: name: "" namespace: "" - version: 2.14.0 + version: 2.15.1 diff --git a/templates/files/config/scheduler.yaml b/templates/files/config/scheduler.yaml index 74455c78..1412a1a9 100644 --- a/templates/files/config/scheduler.yaml +++ b/templates/files/config/scheduler.yaml @@ -1,4 +1,4 @@ kind: KubeSchedulerConfiguration -apiVersion: kubescheduler.config.k8s.io/v1beta1 +apiVersion: kubescheduler.config.k8s.io/v1beta3 clientConnection: kubeconfig: /etc/kubernetes/kubeconfig/scheduler.yaml diff --git a/templates/files/manifests/controller-manager.yaml b/templates/files/manifests/controller-manager.yaml index 41e16320..d2d3dabb 100644 --- a/templates/files/manifests/controller-manager.yaml +++ b/templates/files/manifests/controller-manager.yaml @@ -36,7 +36,8 @@ spec: httpGet: host: 127.0.0.1 path: /healthz - port: 10251 + port: 10257 + scheme: HTTPS initialDelaySeconds: 15 timeoutSeconds: 15 volumeMounts: diff --git a/templates/files/manifests/scheduler.yaml b/templates/files/manifests/scheduler.yaml index 7385a20a..de5269ad 100644 --- a/templates/files/manifests/scheduler.yaml +++ b/templates/files/manifests/scheduler.yaml @@ -26,7 +26,8 @@ spec: httpGet: host: 127.0.0.1 path: /healthz - port: 10251 + port: 10257 + scheme: HTTPS initialDelaySeconds: 15 timeoutSeconds: 15 volumeMounts: diff --git a/templates/master.yaml.tmpl b/templates/master.yaml.tmpl index e836e9d5..a5367e12 100644 --- a/templates/master.yaml.tmpl +++ b/templates/master.yaml.tmpl @@ -670,8 +670,13 @@ systemd: [Service] Type=oneshot RemainAfterExit=yes - EnvironmentFile=/etc/network-environment - ExecStart=/bin/bash -c '/usr/bin/envsubst /etc/kubernetes/config/kubelet.yaml' + TimeoutStartSec=0 + Environment=IMAGE={{.DockerRegistry}}/giantswarm/alpine:3.16.1-envsubst + ExecStart=docker run --rm \ + --env-file /etc/network-environment \ + -v /etc/kubernetes/config/:/etc/kubernetes/config/ \ + $IMAGE \ + ash -c "cat /etc/kubernetes/config/kubelet.yaml.tmpl |envsubst >/etc/kubernetes/config/kubelet.yaml" [Install] WantedBy=multi-user.target diff --git a/templates/worker.yaml.tmpl b/templates/worker.yaml.tmpl index abed90be..f48a9ab0 100644 --- a/templates/worker.yaml.tmpl +++ b/templates/worker.yaml.tmpl @@ -353,8 +353,13 @@ systemd: [Service] Type=oneshot RemainAfterExit=yes - EnvironmentFile=/etc/network-environment - ExecStart=/bin/bash -c '/usr/bin/envsubst /etc/kubernetes/config/kubelet.yaml' + TimeoutStartSec=0 + Environment=IMAGE={{.DockerRegistry}}/giantswarm/alpine:3.16.1-envsubst + ExecStart=docker run --rm \ + --env-file /etc/network-environment \ + -v /etc/kubernetes/config/:/etc/kubernetes/config/ \ + $IMAGE \ + ash -c "cat /etc/kubernetes/config/kubelet.yaml.tmpl |envsubst >/etc/kubernetes/config/kubelet.yaml" [Install] WantedBy=multi-user.target