fix(install): use bitnami/kubectl image for helm hooks (#7656)

also remove tools/kubectl Fix #6326 Signed-off-by: Charly Molter <[email protected]>
kumahq · Sep 12, 2023 · ace9c13 · ace9c13
1 parent 8a3776b
commit ace9c13
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 101 deletions.
diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.dump-values.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.dump-values.yaml
@@ -606,15 +606,13 @@ kumactl:
     tag:
 
 kubectl:
-  # kuma image that support v1.20.15 image */ } }
-  # see: https://hub.docker.com/r/kumahq/kubectl */ } }
   image:
     # -- The kubectl image registry
-    registry: kumahq
+    registry: docker.io
     # -- The kubectl image repository
-    repository: kubectl
+    repository: bitnami/kubectl
     # -- The kubectl image tag
-    tag: "v1.20.15"
+    tag: "1.27.5"
 hooks:
   # -- Node selector for the HELM hooks
   nodeSelector:

diff --git a/deployments/charts/kuma/README.md b/deployments/charts/kuma/README.md
@@ -174,9 +174,9 @@ A Helm chart for the Kuma Control Plane
 | egress.containerSecurityContext | object | `{"readOnlyRootFilesystem":true}` | Security context at the container level for egress |
 | kumactl.image.repository | string | `"kumactl"` | The kumactl image repository |
 | kumactl.image.tag | string | `nil` | The kumactl image tag. When not specified, the value is copied from global.tag |
-| kubectl.image.registry | string | `"kumahq"` | The kubectl image registry |
-| kubectl.image.repository | string | `"kubectl"` | The kubectl image repository |
-| kubectl.image.tag | string | `"v1.20.15"` | The kubectl image tag |
+| kubectl.image.registry | string | `"docker.io"` | The kubectl image registry |
+| kubectl.image.repository | string | `"bitnami/kubectl"` | The kubectl image repository |
+| kubectl.image.tag | string | `"1.27.5"` | The kubectl image tag |
 | hooks.nodeSelector | object | `{"kubernetes.io/os":"linux"}` | Node selector for the HELM hooks |
 | hooks.tolerations | list | `[]` | Tolerations for the HELM hooks |
 | hooks.podSecurityContext | object | `{"runAsNonRoot":true}` | Security context at the pod level for crd/webhook/ns |

diff --git a/deployments/charts/kuma/templates/_helpers.tpl b/deployments/charts/kuma/templates/_helpers.tpl
@@ -372,17 +372,3 @@ env:
 {{- end }}
 {{- end }}
 {{- end }}
-
-{{/*
-params: { image: { registry?, repository, tag? }, root: $ }
-returns: formatted image string
-*/}}
-{{- define "kubectl.formatImage" -}}
-{{- $img := .image }}
-{{- $tag := .tag }}
-{{- $root := .root }}
-{{- $registry := ($img.registry | default $root.Values.kubectl.image.registry) -}}
-{{- $repo := ($img.repository | default $root.Values.kubectl.image.repository) -}}
-{{- $imageTag := ($tag | default $root.Values.kubectl.image.tag) -}}
-{{- printf "%s/%s:%s" $registry $repo $imageTag -}}
-{{- end -}}
diff --git a/deployments/charts/kuma/templates/pre-delete-webhooks.yaml b/deployments/charts/kuma/templates/pre-delete-webhooks.yaml
@@ -90,7 +90,7 @@ spec:
       {{- toYaml .Values.hooks.podSecurityContext | trim | nindent 8 }}
       containers:
         - name: pre-delete-job
-          image: {{ include "kubectl.formatImage" (dict "image" .Values.kubectl.image "root" $) | quote }}
+          image: "{{ .Values.kubectl.image.registry }}/{{ .Values.kubectl.image.repository }}:{{ .Values.kubectl.image.tag }}"
           command:
             - 'kubectl'
             - 'delete'

diff --git a/deployments/charts/kuma/templates/pre-install-patch-namespace-job.yaml b/deployments/charts/kuma/templates/pre-install-patch-namespace-job.yaml
@@ -90,7 +90,7 @@ spec:
       {{- toYaml .Values.hooks.podSecurityContext | trim | nindent 8 }}
       containers:
         - name: pre-install-job
-          image: {{ include "kubectl.formatImage" (dict "image" .Values.kubectl.image "root" $) | quote }}
+          image: "{{ .Values.kubectl.image.registry }}/{{ .Values.kubectl.image.repository }}:{{ .Values.kubectl.image.tag }}"
           securityContext:
           {{- toYaml (mergeOverwrite (dict "runAsUser" 65534) .Values.hooks.containerSecurityContext) | trim | nindent 12 }}
           resources:

diff --git a/deployments/charts/kuma/templates/pre-upgrade-install-crds-job.yaml b/deployments/charts/kuma/templates/pre-upgrade-install-crds-job.yaml
@@ -123,7 +123,7 @@ spec:
       {{- toYaml .Values.hooks.podSecurityContext | trim | nindent 8 }}
       containers:
         - name: pre-upgrade-job
-          image: {{ include "kubectl.formatImage" (dict "image" .Values.kubectl.image "root" $) | quote }}
+          image: "{{ .Values.kubectl.image.registry }}/{{ .Values.kubectl.image.repository }}:{{ .Values.kubectl.image.tag }}"
           securityContext:
           {{- toYaml (mergeOverwrite (dict "runAsUser" 65534) .Values.hooks.containerSecurityContext) | trim | nindent 12 }}
           resources:

diff --git a/deployments/charts/kuma/values.yaml b/deployments/charts/kuma/values.yaml
@@ -606,15 +606,13 @@ kumactl:
     tag:
 
 kubectl:
-  # kuma image that support v1.20.15 image */ } }
-  # see: https://hub.docker.com/r/kumahq/kubectl */ } }
   image:
     # -- The kubectl image registry
-    registry: kumahq
+    registry: docker.io
     # -- The kubectl image repository
-    repository: kubectl
+    repository: bitnami/kubectl
     # -- The kubectl image tag
-    tag: "v1.20.15"
+    tag: "1.27.5"
 hooks:
   # -- Node selector for the HELM hooks
   nodeSelector:

diff --git a/docs/generated/raw/helm-values.yaml b/docs/generated/raw/helm-values.yaml
@@ -606,15 +606,13 @@ kumactl:
     tag:
 
 kubectl:
-  # kuma image that support v1.20.15 image */ } }
-  # see: https://hub.docker.com/r/kumahq/kubectl */ } }
   image:
     # -- The kubectl image registry
-    registry: kumahq
+    registry: docker.io
     # -- The kubectl image repository
-    repository: kubectl
+    repository: bitnami/kubectl
     # -- The kubectl image tag
-    tag: "v1.20.15"
+    tag: "1.27.5"
 hooks:
   # -- Node selector for the HELM hooks
   nodeSelector:

diff --git a/mk/k3d.mk b/mk/k3d.mk
@@ -147,11 +147,11 @@ k3d/deploy/kuma: build/kumactl k3d/load
 
 .PHONY: k3d/deploy/helm
 k3d/deploy/helm: k3d/load
-	@KUBECONFIG=$(KIND_KUBECONFIG) $(KUBECTL) delete namespace $(KUMA_NAMESPACE) | true
-	@KUBECONFIG=$(KIND_KUBECONFIG) $(KUBECTL) create namespace $(KUMA_NAMESPACE)
-	@KUBECONFIG=$(KIND_KUBECONFIG) helm install --namespace $(KUMA_NAMESPACE) \
+	KUBECONFIG=$(KIND_KUBECONFIG) $(KUBECTL) delete namespace $(KUMA_NAMESPACE) --wait | true
+	KUBECONFIG=$(KIND_KUBECONFIG) $(KUBECTL) create namespace $(KUMA_NAMESPACE)
+	KUBECONFIG=$(KIND_KUBECONFIG) helm upgrade --install --namespace $(KUMA_NAMESPACE) \
                 --set global.image.registry="$(DOCKER_REGISTRY)" \
-                --set global.image.tag="$(BUILD_INFO_VERSION)-${GOARCH}" \
+                --set global.image.tag="$(BUILD_INFO_VERSION)" \
                 --set cni.enabled=true \
                 --set cni.chained=true \
                 --set cni.netDir=/var/lib/rancher/k3s/agent/etc/cni/net.d/ \

diff --git a/tools/kubectl/Dockerfile b/tools/kubectl/Dockerfile
diff --git a/tools/kubectl/README.md b/tools/kubectl/README.md
diff --git a/tools/kubectl/docker-build-and-publish.sh b/tools/kubectl/docker-build-and-publish.sh