Merge pull request #132 from openinfradev/tks-issues-305

AppServing: handle configmap and secrets
openinfradev · Jan 13, 2023 · cdffabd · cdffabd
2 parents 394fe00 + dcb7932
commit cdffabd
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 3 deletions.
diff --git a/app_serving/serve-java-app.yaml b/app_serving/serve-java-app.yaml
@@ -43,6 +43,12 @@ spec:
       value: "FILE_PATH_IN_THE_IMAGE"
     - name: profile
       value: "default"
+    - name: extra_env
+      value: ""
+    - name: app_config
+      value: ""
+    - name: app_secret
+      value: ""
     # resource_spec: possible values are tiny, medium, large
     - name: resource_spec
       value: "medium"
@@ -62,6 +68,8 @@ spec:
       value: "tks-info.tks"
     - name: git_repo_url
       value: "github.com/openinfradev"
+    - name: harbor_pw_secret
+      value: "harbor-core"
 
   templates:
   - name: exit-handler
@@ -256,7 +264,7 @@ spec:
         docker build --network host -t $image_name . 2> >(tee -a $BUILD_LOG >&2)
 
         # Get harbor admin password from secret
-        harbor_password=$(kubectl get secret -n harbor harbor-core -o jsonpath='{.data.HARBOR_ADMIN_PASSWORD}' | base64 -d)
+        harbor_password=$(kubectl get secret -n harbor {{workflow.parameters.harbor_pw_secret}} -o jsonpath='{.data.HARBOR_ADMIN_PASSWORD}' | base64 -d)
 
         # Extract registry URL from image URL
         registry_url=$(echo $image_name | awk -F/ '{ print $1 }')
@@ -296,6 +304,11 @@ spec:
         DEPLOY_LOG='/mnt/out/deploy_output.log'
         mkdir -p /apps/
 
+        # temporary debug
+        echo "===== Application Config =====\n"
+        echo "{{workflow.parameters.app_config}}"
+        echo "==============================\n"
+
         # fetch manifests from git
         cd /apps
         git clone https://{{workflow.parameters.git_repo_url}}/app-serve-template.git
@@ -350,10 +363,37 @@ spec:
           sed -i "s/PV_SIZE/{{workflow.parameters.pv_size}}/g" ./values.yaml
           sed -i "s#PV_MOUNT_PATH#{{workflow.parameters.pv_mount_path}}#g" ./values.yaml
 
+          # write app_config to file that is embedded into configmap by helm chart later
+          # the filename must be same as the one in the configmap.
+          if [[ -n "{{workflow.parameters.app_config}}" ]]; then
+            app_conf="{{workflow.parameters.app_config}}"
+            echo "$app_conf" > config_content.yaml
+
+            sed -i "s/CONFIGMAP_ENABLED/true/g" ./values.yaml
+          else
+            sed -i "s/CONFIGMAP_ENABLED/false/g" ./values.yaml
+          fi
+
+          # write secret data to file that is embedded into secret by helm chart later
+          if [[ -n "{{workflow.parameters.app_secret}}" ]]; then
+            app_secret="{{workflow.parameters.app_secret}}"
+            echo "$app_secret" > secret_data
+
+            sed -i "s/SECRET_ENABLED/true/g" ./values.yaml
+          else
+            sed -i "s/SECRET_ENABLED/false/g" ./values.yaml
+          fi
+
+          extra_env_str=""
+          if [[ -n "{{workflow.parameters.extra_env}}" ]]; then
+            extra_env_str="--set-json 'extraEnv={{workflow.parameters.extra_env}}'"
+          fi
+
           # TODO: parse image tag and use it as APP_VERSION in Chart.yaml?
           #
 
           # Debug
+          echo "===== values ====="
           cat values.yaml
         fi
 
@@ -380,9 +420,11 @@ spec:
           ## TODO: this might be temporary. Once everything is confirmed,
           ## the helm chart can be pulled from internal helm repo.
           helm upgrade --install --kubeconfig /etc/kubeconfig_temp -f /apps/app-serve-template/tomcat-vo.yaml -n {{workflow.parameters.namespace}} {{workflow.parameters.app_name}} . 2> >(tee -a $DEPLOY_LOG >&2)
+        ## For springboot app case ##
         else
           cd /apps/app-serve-template/chart
-          helm upgrade --install --kubeconfig /etc/kubeconfig_temp -f values-{{workflow.parameters.resource_spec}}.yaml -n {{workflow.parameters.namespace}} {{workflow.parameters.app_name}} . 2> >(tee -a $DEPLOY_LOG >&2)
+          helm template test . --debug
+          eval "helm upgrade --install --kubeconfig /etc/kubeconfig_temp -f values-{{workflow.parameters.resource_spec}}.yaml $extra_env_str -n {{workflow.parameters.namespace}} {{workflow.parameters.app_name}} ." 2> >(tee -a $DEPLOY_LOG >&2)
         fi
 
         # Just make sure helm release is deployed before status cmd

diff --git a/dockerfiles/Dockerfile.appserving-worker b/dockerfiles/Dockerfile.appserving-worker
@@ -2,7 +2,7 @@ FROM docker:20.10.16-git
 
 MAINTAINER Cloud Co, SK Telecom
 
-ENV HELM_VER v3.9.4
+ENV HELM_VER v3.10.1
 
 USER root