From 1a76e9029f5d8ffeb32235f2357b6884f26634e8 Mon Sep 17 00:00:00 2001 From: Ibrahima COULIBALY Date: Fri, 11 Oct 2024 22:17:43 +0200 Subject: [PATCH 1/6] Add KUBEVIP_NAMESPACE, KUBEVIP_CONFIG_MAP environment variables and configmap-checksum to redeploy workload Signed-off-by: Ibrahima COULIBALY --- charts/kube-vip-cloud-provider/templates/deployment.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/charts/kube-vip-cloud-provider/templates/deployment.yaml b/charts/kube-vip-cloud-provider/templates/deployment.yaml index 4fe9d0a..db3b22b 100644 --- a/charts/kube-vip-cloud-provider/templates/deployment.yaml +++ b/charts/kube-vip-cloud-provider/templates/deployment.yaml @@ -12,6 +12,8 @@ spec: metadata: labels: {{- include "kube-vip-cloud-provider.selectorLabels" . | nindent 8 }} + annotations: + configmap-checksum: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} spec: containers: - command: @@ -19,6 +21,11 @@ spec: - --leader-elect-resource-name=kube-vip-cloud-controller image: {{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }} name: {{ include "kube-vip-cloud-provider.name" . }} + env: + - name: KUBEVIP_NAMESPACE + value: {{ .Release.Namespace | default "kube-system" }} + - name: KUBEVIP_CONFIG_MAP + value: {{ include "kube-vip-cloud-provider.name" . }}-cm imagePullPolicy: {{ .Values.image.pullPolicy }} resources: {{- toYaml .Values.resources | nindent 12 }} From 38dee77d3465ba07152cfe813a81a27d6d38f650 Mon Sep 17 00:00:00 2001 From: Ibrahima COULIBALY Date: Fri, 11 Oct 2024 22:26:46 +0200 Subject: [PATCH 2/6] Add KUBEVIP_NAMESPACE, KUBEVIP_CONFIG_MAP environment variables and configmap-checksum to redeploy workload Signed-off-by: Ibrahima COULIBALY --- charts/kube-vip-cloud-provider/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/kube-vip-cloud-provider/values.yaml b/charts/kube-vip-cloud-provider/values.yaml index a6fa46e..c4bec36 100644 --- a/charts/kube-vip-cloud-provider/values.yaml +++ b/charts/kube-vip-cloud-provider/values.yaml @@ -19,7 +19,7 @@ image: # cidr-default: 192.168.0.200/29 # CIDR-based IP range for use in the default Namespace # range-development: 192.168.0.210-192.168.0.219 # Range-based IP range for use in the development Namespace # cidr-finance: 192.168.0.220/29,192.168.0.230/29 # Multiple CIDR-based ranges for use in the finance Namespace -# cidr-global: 192.168.0.240/29 +# cidr-global: 192.168.0.240/29 cm: data: {} From f49ff3b63517e6730905d9e0018c318307c8745d Mon Sep 17 00:00:00 2001 From: Ibrahima COULIBALY Date: Fri, 11 Oct 2024 22:32:31 +0200 Subject: [PATCH 3/6] Add KUBEVIP_NAMESPACE, KUBEVIP_CONFIG_MAP environment variables and configmap-checksum to redeploy workload Signed-off-by: Ibrahima COULIBALY --- charts/kube-vip-cloud-provider/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/kube-vip-cloud-provider/values.yaml b/charts/kube-vip-cloud-provider/values.yaml index c4bec36..8a21ff6 100644 --- a/charts/kube-vip-cloud-provider/values.yaml +++ b/charts/kube-vip-cloud-provider/values.yaml @@ -16,9 +16,9 @@ image: # cm: # data: -# cidr-default: 192.168.0.200/29 # CIDR-based IP range for use in the default Namespace -# range-development: 192.168.0.210-192.168.0.219 # Range-based IP range for use in the development Namespace -# cidr-finance: 192.168.0.220/29,192.168.0.230/29 # Multiple CIDR-based ranges for use in the finance Namespace +# cidr-default: 192.168.0.200/29 +# range-development: 192.168.0.210-192.168.0.219 +# cidr-finance: 192.168.0.220/29,192.168.0.230/29 # cidr-global: 192.168.0.240/29 cm: From f221f601635927299bd456c546a8b122a9f3de84 Mon Sep 17 00:00:00 2001 From: Ibrahima COULIBALY Date: Fri, 11 Oct 2024 23:05:49 +0200 Subject: [PATCH 4/6] Set appVersion to v0.0.10 Signed-off-by: Ibrahima COULIBALY --- charts/kube-vip-cloud-provider/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/kube-vip-cloud-provider/Chart.yaml b/charts/kube-vip-cloud-provider/Chart.yaml index 5c33808..9aa5899 100644 --- a/charts/kube-vip-cloud-provider/Chart.yaml +++ b/charts/kube-vip-cloud-provider/Chart.yaml @@ -20,7 +20,7 @@ version: 0.2.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: v0.0.4 +appVersion: v0.0.10 icon: https://github.com/kube-vip/kube-vip/raw/main/kube-vip.png From 0269f0514e0353640b148749b2eb33e13fc58585 Mon Sep 17 00:00:00 2001 From: Ibrahima COULIBALY Date: Fri, 11 Oct 2024 23:13:38 +0200 Subject: [PATCH 5/6] remove kube-system dead code Signed-off-by: Ibrahima COULIBALY --- charts/kube-vip-cloud-provider/templates/configmap.yaml | 2 +- charts/kube-vip-cloud-provider/templates/deployment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/kube-vip-cloud-provider/templates/configmap.yaml b/charts/kube-vip-cloud-provider/templates/configmap.yaml index c3a53e0..78fe72f 100644 --- a/charts/kube-vip-cloud-provider/templates/configmap.yaml +++ b/charts/kube-vip-cloud-provider/templates/configmap.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ include "kube-vip-cloud-provider.name" . }}-cm - namespace: {{ .Release.Namespace | default "kube-system" }} + namespace: {{ .Release.Namespace }} data: {{- range $key, $value := .Values.cm.data }} {{ $key }}: {{ $value | quote }} diff --git a/charts/kube-vip-cloud-provider/templates/deployment.yaml b/charts/kube-vip-cloud-provider/templates/deployment.yaml index db3b22b..81c5ac6 100644 --- a/charts/kube-vip-cloud-provider/templates/deployment.yaml +++ b/charts/kube-vip-cloud-provider/templates/deployment.yaml @@ -23,7 +23,7 @@ spec: name: {{ include "kube-vip-cloud-provider.name" . }} env: - name: KUBEVIP_NAMESPACE - value: {{ .Release.Namespace | default "kube-system" }} + value: {{ .Release.Namespace }} - name: KUBEVIP_CONFIG_MAP value: {{ include "kube-vip-cloud-provider.name" . }}-cm imagePullPolicy: {{ .Values.image.pullPolicy }} From dbf3542df894d04b7f0205e4e73ed26d5743ba5e Mon Sep 17 00:00:00 2001 From: Ibrahima COULIBALY Date: Sat, 12 Oct 2024 09:39:16 +0200 Subject: [PATCH 6/6] kv-cp remove configmap-checksum annotations Signed-off-by: Ibrahima COULIBALY --- charts/kube-vip-cloud-provider/templates/deployment.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/charts/kube-vip-cloud-provider/templates/deployment.yaml b/charts/kube-vip-cloud-provider/templates/deployment.yaml index 81c5ac6..655debe 100644 --- a/charts/kube-vip-cloud-provider/templates/deployment.yaml +++ b/charts/kube-vip-cloud-provider/templates/deployment.yaml @@ -12,8 +12,6 @@ spec: metadata: labels: {{- include "kube-vip-cloud-provider.selectorLabels" . | nindent 8 }} - annotations: - configmap-checksum: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} spec: containers: - command: