From 01bb03d90358298548af29fb1533163afc96cc86 Mon Sep 17 00:00:00 2001 From: Serge Logvinov Date: Mon, 5 Sep 2022 17:35:50 +0300 Subject: [PATCH] Update version --- scaleway/Makefile | 2 +- scaleway/deployments/ingress-result.yaml | 65 +++++++++++++++++------- scaleway/outputs.tf | 2 +- scaleway/templates/controlplane.yaml.tpl | 2 + scaleway/templates/worker.yaml.tpl | 2 + scaleway/versions.tf | 2 +- 6 files changed, 53 insertions(+), 22 deletions(-) diff --git a/scaleway/Makefile b/scaleway/Makefile index d9cb355..854f6ba 100644 --- a/scaleway/Makefile +++ b/scaleway/Makefile @@ -55,5 +55,5 @@ create-kubeconfig: ## Prepare kubeconfig create-deployments: helm template --namespace=kube-system --version=1.12.1 -f deployments/cilium.yaml cilium \ cilium/cilium > deployments/cilium-result.yaml - helm template --namespace=ingress-nginx --version=4.2.1 -f deployments/ingress.yaml ingress-nginx \ + helm template --namespace=ingress-nginx --version=4.2.4 -f deployments/ingress.yaml ingress-nginx \ ingress-nginx/ingress-nginx > deployments/ingress-result.yaml diff --git a/scaleway/deployments/ingress-result.yaml b/scaleway/deployments/ingress-result.yaml index cd5fdf7..da5416f 100644 --- a/scaleway/deployments/ingress-result.yaml +++ b/scaleway/deployments/ingress-result.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: ingress-nginx-4.1.4 + helm.sh/chart: ingress-nginx-4.2.4 app.kubernetes.io/name: ingress-nginx app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/version: "1.2.1" + app.kubernetes.io/version: "1.3.1" app.kubernetes.io/part-of: ingress-nginx app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: controller @@ -20,10 +20,10 @@ apiVersion: v1 kind: ConfigMap metadata: labels: - helm.sh/chart: ingress-nginx-4.1.4 + helm.sh/chart: ingress-nginx-4.2.4 app.kubernetes.io/name: ingress-nginx app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/version: "1.2.1" + app.kubernetes.io/version: "1.3.1" app.kubernetes.io/part-of: ingress-nginx app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: controller @@ -66,10 +66,10 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - helm.sh/chart: ingress-nginx-4.1.4 + helm.sh/chart: ingress-nginx-4.2.4 app.kubernetes.io/name: ingress-nginx app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/version: "1.2.1" + app.kubernetes.io/version: "1.3.1" app.kubernetes.io/part-of: ingress-nginx app.kubernetes.io/managed-by: Helm name: ingress-nginx @@ -86,6 +86,13 @@ rules: verbs: - list - watch + - apiGroups: + - coordination.k8s.io + resources: + - leases + verbs: + - list + - watch - apiGroups: - "" resources: @@ -135,10 +142,10 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - helm.sh/chart: ingress-nginx-4.1.4 + helm.sh/chart: ingress-nginx-4.2.4 app.kubernetes.io/name: ingress-nginx app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/version: "1.2.1" + app.kubernetes.io/version: "1.3.1" app.kubernetes.io/part-of: ingress-nginx app.kubernetes.io/managed-by: Helm name: ingress-nginx @@ -156,10 +163,10 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: labels: - helm.sh/chart: ingress-nginx-4.1.4 + helm.sh/chart: ingress-nginx-4.2.4 app.kubernetes.io/name: ingress-nginx app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/version: "1.2.1" + app.kubernetes.io/version: "1.3.1" app.kubernetes.io/part-of: ingress-nginx app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: controller @@ -213,6 +220,11 @@ rules: - get - list - watch + # TODO(Jintao Zhang) + # Once we release a new version of the controller, + # we will be able to remove the configmap related permissions + # We have used the Lease API for selection + # ref: https://github.com/kubernetes/ingress-nginx/pull/8921 - apiGroups: - "" resources: @@ -228,6 +240,21 @@ rules: - configmaps verbs: - create + - apiGroups: + - coordination.k8s.io + resources: + - leases + resourceNames: + - ingress-controller-leader + verbs: + - get + - update + - apiGroups: + - coordination.k8s.io + resources: + - leases + verbs: + - create - apiGroups: - "" resources: @@ -241,10 +268,10 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: labels: - helm.sh/chart: ingress-nginx-4.1.4 + helm.sh/chart: ingress-nginx-4.2.4 app.kubernetes.io/name: ingress-nginx app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/version: "1.2.1" + app.kubernetes.io/version: "1.3.1" app.kubernetes.io/part-of: ingress-nginx app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: controller @@ -265,10 +292,10 @@ kind: Service metadata: annotations: labels: - helm.sh/chart: ingress-nginx-4.1.4 + helm.sh/chart: ingress-nginx-4.2.4 app.kubernetes.io/name: ingress-nginx app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/version: "1.2.1" + app.kubernetes.io/version: "1.3.1" app.kubernetes.io/part-of: ingress-nginx app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: controller @@ -302,10 +329,10 @@ apiVersion: apps/v1 kind: DaemonSet metadata: labels: - helm.sh/chart: ingress-nginx-4.1.4 + helm.sh/chart: ingress-nginx-4.2.4 app.kubernetes.io/name: ingress-nginx app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/version: "1.2.1" + app.kubernetes.io/version: "1.3.1" app.kubernetes.io/part-of: ingress-nginx app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: controller @@ -336,7 +363,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: controller - image: "registry.k8s.io/ingress-nginx/controller:v1.2.1@sha256:5516d103a9c2ecc4f026efbd4b40662ce22dc1f824fb129ed121460aaa5c47f8" + image: "registry.k8s.io/ingress-nginx/controller:v1.3.0@sha256:d1707ca76d3b044ab8a28277a2466a02100ee9f58a86af1535a3edf9323ea1b5" imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -428,10 +455,10 @@ apiVersion: networking.k8s.io/v1 kind: IngressClass metadata: labels: - helm.sh/chart: ingress-nginx-4.1.4 + helm.sh/chart: ingress-nginx-4.2.4 app.kubernetes.io/name: ingress-nginx app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/version: "1.2.1" + app.kubernetes.io/version: "1.3.1" app.kubernetes.io/part-of: ingress-nginx app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: controller diff --git a/scaleway/outputs.tf b/scaleway/outputs.tf index 393a368..0c77beb 100644 --- a/scaleway/outputs.tf +++ b/scaleway/outputs.tf @@ -1,7 +1,7 @@ output "controlplane_endpoint" { description = "Kubernetes controlplane endpoint" - value = try(flatten(scaleway_lb_ip.lb[0].ip_address), try(flatten([for c in scaleway_instance_ip.controlplane : c.address])[0], "none")) + value = try(flatten(scaleway_lb_ip.lb[0].ip_address), try(flatten([for c in scaleway_instance_ip.controlplane : c.address])[0], "")) } output "controlplanes" { diff --git a/scaleway/templates/controlplane.yaml.tpl b/scaleway/templates/controlplane.yaml.tpl index 528edf5..6a5d513 100644 --- a/scaleway/templates/controlplane.yaml.tpl +++ b/scaleway/templates/controlplane.yaml.tpl @@ -66,6 +66,8 @@ cluster: discovery: enabled: true registries: + kubernetes: + disabled: false service: disabled: true network: diff --git a/scaleway/templates/worker.yaml.tpl b/scaleway/templates/worker.yaml.tpl index 13989d5..7457c85 100644 --- a/scaleway/templates/worker.yaml.tpl +++ b/scaleway/templates/worker.yaml.tpl @@ -72,6 +72,8 @@ cluster: discovery: enabled: true registries: + kubernetes: + disabled: false service: disabled: true network: diff --git a/scaleway/versions.tf b/scaleway/versions.tf index 6a5c70a..6e3c0a4 100644 --- a/scaleway/versions.tf +++ b/scaleway/versions.tf @@ -3,7 +3,7 @@ terraform { required_providers { scaleway = { source = "scaleway/scaleway" - version = "~> 2.2.7" + version = "~> 2.2.9" } } required_version = ">= 1.0"