Merge pull request #1272 from mesosphere/jimmi/helm3-tweaks

Helm chart tidy up

Author: k8s-ci-robot

Makefile

@@ -166,4 +166,4 @@ controller-gen:
 	command -v controller-gen &> /dev/null || (cd tools && go install sigs.k8s.io/controller-tools/cmd/controller-gen)
 
 deploy.kind:
-	DOCKER_PUSH= KIND_LOAD_IMAGE=y ./scripts/deploy-kubefed.sh $(IMAGE_NAME)
+	DOCKER_PUSH=n KIND_LOAD_IMAGE=y FORCE_REDEPLOY=y ./scripts/deploy-kubefed.sh $(IMAGE_NAME)

charts/kubefed/Chart.yaml

@@ -2,3 +2,8 @@ apiVersion: v2
 description: KubeFed helm chart
 name: kubefed
 version: 0.0.3
+dependencies:
+- name: controllermanager
+  version: 0.0.3
+  repository: "https://localhost/" # Required but unused.
+  condition: controllermanager.enabled

charts/kubefed/charts/controllermanager/templates/deployments.yaml

@@ -15,6 +15,10 @@ spec:
     metadata:
       labels:
         kubefed-control-plane: controller-manager
+      {{- if .Values.controller.forceRedeployment }}
+      annotations:
+        rollme: {{ randAlphaNum 5 | quote }}
+      {{- end }}
     spec:
       securityContext:
         runAsUser: 1001
@@ -65,6 +69,10 @@ spec:
     metadata:
       labels:
         kubefed-admission-webhook: "true"
+      {{- if .Values.webhook.forceRedeployment }}
+      annotations:
+        rollme: {{ randAlphaNum 5 | quote }}
+      {{- end }}
     spec:
       securityContext:
         runAsUser: 1001

charts/kubefed/requirements.yaml

@@ -33,6 +33,7 @@ controllermanager:
     tag: canary
     imagePullPolicy: IfNotPresent
     logLevel: 2
+    forceRedeployment: false
     env: {}
     resources:
       limits:
@@ -47,6 +48,7 @@ controllermanager:
     tag: canary
     imagePullPolicy: IfNotPresent
     logLevel: 8
+    forceRedeployment: false
     env: {}
     resources:
       limits:

charts/kubefed/values.yaml

@@ -45,10 +45,10 @@ function deploy-with-helm() {
 
   local cmd
   if [[ "${NAMESPACED}" ]]; then
-    cmd="$(helm-deploy-cmd kubefed-${NS} ${NS} ${repository} ${image} ${tag}) --create-namespace"
+    cmd="$(helm-deploy-cmd kubefed-${NS} ${NS} ${repository} ${image} ${tag})"
     cmd="${cmd} --set global.scope=Namespaced"
   else
-    cmd="$(helm-deploy-cmd kubefed ${NS} ${repository} ${image} ${tag}) --create-namespace"
+    cmd="$(helm-deploy-cmd kubefed ${NS} ${repository} ${image} ${tag})"
   fi
 
   if [[ "${IMAGE_PULL_POLICY:-}" ]]; then
@@ -68,18 +68,20 @@ function helm-deploy-cmd {
   local repo="${3}"
   local image="${4}"
   local tag="${5}"
-  local commonFlags="--namespace ${ns} \
-                     --set controllermanager.controller.repository=${repo} \
-                     --set controllermanager.controller.image=${image} \
-                     --set controllermanager.controller.tag=${tag} \
-                     --set controllermanager.webhook.repository=${repo} \
-                     --set controllermanager.webhook.image=${image} \
-                     --set controllermanager.webhook.tag=${tag}"
-  if [ -z "$(helm list ${name} --deployed -q)" ]; then
-    echo "helm install ${name} charts/kubefed ${commonFlags} --create-namespace"
-  else
-    echo "helm upgrade ${name} charts/kubefed --recreate-pods ${commonFlags}"
+  if [[ "${FORCE_REDEPLOY:-}" == "y" ]]; then
+    local force_redeploy_values="--set controllermanager.controller.forceRedeployment=true --set controllermanager.webhook.forceRedeployment=true"
   fi
+  echo "helm upgrade -i ${name} charts/kubefed \
+        --namespace ${ns} \
+        --set controllermanager.controller.repository=${repo} \
+        --set controllermanager.controller.image=${image} \
+        --set controllermanager.controller.tag=${tag} \
+        --set controllermanager.webhook.repository=${repo} \
+        --set controllermanager.webhook.image=${image} \
+        --set controllermanager.webhook.tag=${tag} \
+        ${force_redeploy_values:-} \
+        --create-namespace \
+        --wait"
 }
 
 function kubefed-admission-webhook-ready() {
@@ -112,7 +114,7 @@ IMAGE_NAME="${1:-}"
 NAMESPACED="${NAMESPACED:-}"
 
 LATEST_IMAGE_NAME=quay.io/kubernetes-multicluster/kubefed:latest
-if [[ "${IMAGE_NAME}" == "$LATEST_IMAGE_NAME" ]]; then
+if [[ "${IMAGE_NAME}" == "${LATEST_IMAGE_NAME}" ]]; then
   USE_LATEST=y
 else
   USE_LATEST=
@@ -147,20 +149,16 @@ JOIN_CLUSTERS="${*-}"
 check-command-installed kubectl
 check-command-installed helm
 
-# Use DOCKER_PUSH= ./scripts/deploy-kubefed.sh <image> to skip docker
-# push on container image when not using latest image.
-DOCKER_PUSH="${DOCKER_PUSH-y}"
-DOCKER_PUSH_CMD="docker push ${IMAGE_NAME}"
-if [[ ! "${DOCKER_PUSH}" ]]; then
-    DOCKER_PUSH_CMD=
-fi
-
 # Build KubeFed binaries and image
-if [[ ! "${USE_LATEST}" ]]; then
+if [[ "${USE_LATEST:-}" != "y" ]]; then
   cd "$(dirname "$0")/.."
   make container IMAGE_NAME=${IMAGE_NAME}
   cd -
-  ${DOCKER_PUSH_CMD}
+  # Use DOCKER_PUSH=n ./scripts/deploy-kubefed.sh <image> to skip docker
+  # push on container image when not using latest image.
+  if [[ "${DOCKER_PUSH:-y}" == "y" ]]; then
+    docker push ${IMAGE_NAME}
+  fi
 fi
 
 # Use KIND_LOAD_IMAGE=y DOCKER_PUSH= ./scripts/deploy-kubefed.sh <image> to load
@@ -176,9 +174,6 @@ cd -
 # Deploy KubeFed resources
 deploy-with-helm
 
-# Wait for admission webhook server to be ready
-util::wait-for-condition "kubefed admission webhook to be ready" "kubefed-admission-webhook-ready ${NS}" 120
-
 # Join the host cluster
 CONTEXT="$(kubectl config current-context)"
 ./bin/kubefedctl join "${CONTEXT}" --host-cluster-context "${CONTEXT}" --v=2 ${KF_NS_ARGS} --error-on-existing=false