Helm chat and CI changes for upstreaming (#519)

cloudfoundry · Oct 5, 2020 · a9d8639 · a9d8639
1 parent f511c5f
commit a9d8639
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 44 deletions.
diff --git a/deploy/ci/console-dev-releases.yml b/deploy/ci/console-dev-releases.yml
@@ -1,3 +1,4 @@
+# This pipeline creates an Alpha, Beta or RC release
 ---
 resource_types:
 - name: docker-image
@@ -46,7 +47,19 @@ resources:
     username: ((docker-username))
     password: ((docker-password))
     repository: ((docker-repository))/stratos-console
-
+- name: kube-terminal-image
+  type: docker-image
+  source:
+    username: ((docker-username))
+    password: ((docker-password))
+    repository: ((docker-repository))/stratos-kube-terminal
+- name: analyzers-image
+  type: docker-image
+  source:
+    username: ((docker-username))
+    password: ((docker-password))
+    repository: ((docker-repository))/stratos-analyzers
+
 # Artifacts
 - name: image-tag
   type: s3
@@ -129,23 +142,39 @@ jobs:
           tag: image-tag/v2-alpha-tag
           patch_base_reg: ((patch-base-reg))
           patch_base_tag: ((patch-base-tag))
-    - do:
+    - do: 
+      - put: ui-image
+        params:
+          dockerfile: stratos/deploy/Dockerfile.ui
+          build: stratos/
+          target_name: prod-build
+          tag: image-tag/v2-alpha-tag
+          build_args_file: image-tag/ui-build-args
+          patch_base_reg: ((patch-base-reg))
+          patch_base_tag: ((patch-base-tag))
       - put: config-init-image
         params:
           dockerfile: stratos/deploy/Dockerfile.init
           build: stratos/
           tag: image-tag/v2-alpha-tag
           patch_base_reg: ((patch-base-reg))
           patch_base_tag: ((patch-base-tag))
-      - put: ui-image
+    - do:
+      - put: analyzers-image
         params:
-          dockerfile: stratos/deploy/Dockerfile.ui
-          build: stratos/
-          target_name: prod-build
+          dockerfile: stratos/src/jetstream/plugins/analysis/container/Dockerfile
+          build: stratos/src/jetstream/plugins/analysis/container/
           tag: image-tag/v2-alpha-tag
-          build_args_file: image-tag/ui-build-args
           patch_base_reg: ((patch-base-reg))
           patch_base_tag: ((patch-base-tag))
+      - put: kube-terminal-image
+        params:
+          dockerfile: stratos/deploy/containers/kube-terminal/Dockerfile.kubeterminal
+          build: stratos/deploy/containers/kube-terminal
+          tag: image-tag/v2-alpha-tag
+          patch_base_reg: ((patch-base-reg))
+          patch_base_tag: ((patch-base-tag))
+
 - name: create-chart
   plan:
   - get: stratos

diff --git a/deploy/kubernetes/build.sh b/deploy/kubernetes/build.sh
@@ -214,6 +214,14 @@ if [ "${CHART_ONLY}" == "false" ]; then
   log "-- Building/publishing the runtime container image for the Console web server (frontend)"
   patchAndPushImage stratos-console deploy/Dockerfile.ui "${STRATOS_PATH}" prod-build
 
+  # Build and push an image for the Kubernetes Terminal
+  log "-- Building/publishing Kubernetes Terminal"
+  patchAndPushImage stratos-kube-terminal Dockerfile.kubeterminal "${STRATOS_PATH}/deploy/containers/kube-terminal"
+
+  # Analzyers container
+  log "-- Building/publishing Stratos Analyzers"
+  patchAndPushImage stratos-analyzers Dockerfile "${STRATOS_PATH}/src/jetstream/plugins/analysis/container"
+
   # Build any custom images added by a fork
   if [ "${HAS_CUSTOM_BUILD}" == "true" ]; then
     custom_image_build

diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
@@ -294,6 +294,14 @@ spec:
         - name: UI_LIST_ALLOW_LOAD_MAXED
           value: {{ default "false" .Values.console.ui.listAllowLoadMaxed | quote }}
         {{- end }}
+        - name: ANALYSIS_SERVICES_API
+          value: "http://{{ .Release.Name }}-analyzers:8090"
+        - name: STRATOS_KUBERNETES_NAMESPACE
+          value: "{{ .Release.Namespace }}"
+        - name: STRATOS_KUBERNETES_TERMINAL_IMAGE
+          value: "{{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/stratos-kube-terminal:{{.Values.consoleVersion}}"
+        - name: STRATOS_KUBERNETES_DASHBOARD_IMAGE
+          value: "{{.Values.console.kubeDashboardImage}}"        
         {{- include "stratosJetstreamEnv" . | indent 8 }}
         readinessProbe:
           httpGet:

diff --git a/deploy/kubernetes/custom/__stratos.tpl b/deploy/kubernetes/custom/__stratos.tpl
diff --git a/deploy/kubernetes/custom/custom-build.sh b/deploy/kubernetes/custom/custom-build.sh
diff --git a/deploy/kubernetes/custom/customize-helm.sh b/deploy/kubernetes/custom/customize-helm.sh
@@ -15,10 +15,11 @@ echo "Customizations folder: ${DIR}"
 echo "Chart folder         : ${CHART_PATH}"
 echo ""
 
+# Kubernetes has been upstreamed, so no customizations at this time
 # ===========================================================================================
 # Copy our customization helper over the default, empty one
 # ===========================================================================================
-cp "${DIR}/__stratos.tpl" "${CHART_PATH}/templates/__stratos.tpl"
+#cp "${DIR}/__stratos.tpl" "${CHART_PATH}/templates/__stratos.tpl"
 
 # ===========================================================================================
 # Chart.yaml changes