adjust kustomize

resources/apply-resources-istio.sh

@@ -1,15 +1,18 @@
-if [ -z "$1" ] ; then  
+#!/bin/bash
+set -e
+
+if [ -z "$1" ] ; then
     echo "No domain passed as first argument, aborting." 
     exit 1
 fi
 
 export DOMAIN=$1
 export NAMESPACE=${2:-busola}
+export ENVIRONMENT=$3
+TMP_DIR="../temp/resources"
 
-mkdir -p ../temp/resources
-cp -rf . ../temp/resources
-
-envsubst < ../temp/resources/istio/virtualservice-busola-template.yaml > ../temp/resources/istio/virtualservice-busola.yaml
+./apply-resources.sh "$@"
 
-kubectl apply -k ../temp/resources/istio --namespace=$NAMESPACE
+envsubst < "${TMP_DIR}"/istio/virtualservice-busola.tpl.yaml > "${TMP_DIR}"/istio/virtualservice-busola.yaml
 
+kubectl apply -k "${TMP_DIR}"/istio --namespace=$NAMESPACE

resources/apply-resources.sh

@@ -1,16 +1,21 @@
-if [ -z "$1" ] ; then  
+#!/bin/bash
+set -e
+
+if [ -z "$1" ] ; then
     echo "No domain passed as first argument, aborting." 
     exit 1
 fi
 
-namespace=${2:-busola}
+export DOMAIN=$1
+NAMESPACE=${2:-busola}
+export ENVIRONMENT=$3
+TMP_DIR="../temp/resources"
 
-mkdir -p ../temp/resources 
 
-cp -rf . ../temp/resources
+mkdir -p "${TMP_DIR}"
+cp -rf . "${TMP_DIR}"
 
-for i in ../temp/resources/**{/*,}.yaml; do
-    sed -i'' "s/%DOMAIN%/$1/g" $i
-done
+envsubst < "${TMP_DIR}"/base/ingress.tpl.yaml > "${TMP_DIR}"/base/ingress.yaml
 
-kubectl apply -k ../temp/resources --namespace=$namespace
+kubectl create namespace "${NAMESPACE}" || true
+kubectl apply -k "${TMP_DIR}/environments/${ENVIRONMENT}" --namespace="${NAMESPACE}"

resources/base/environment.env

@@ -0,0 +1 @@
+ENVIRONMENT="test"

resources/ingress.yaml → resources/base/ingress.tpl.yaml

@@ -10,7 +10,7 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-    - host: %DOMAIN%
+    - host: $DOMAIN
       http:
         paths:
           - backend:

resources/kustomization.yaml → resources/base/kustomization.yaml

@@ -3,6 +3,5 @@ kind: Kustomization
 resources:
   - ingress.yaml
   - ingressClass.yaml
-bases:
   - backend
   - web

resources/web/deployment.yaml → resources/base/web/deployment.yaml

@@ -16,8 +16,14 @@ spec:
     spec:
       containers:
         - name: busola
-          image: europe-docker.pkg.dev/kyma-project/prod/busola-web:latest
+          image: europe-docker.pkg.dev/kyma-project/prod/busola-kyma-web:latest
           imagePullPolicy: Always
+          env:
+            - name: ENVIRONMENT
+              valueFrom:
+                configMapKeyRef:
+                  key: ENVIRONMENT
+                  name: environment
           resources:
             requests:
               cpu: 100m

resources/environments/dev/environment.env

@@ -0,0 +1 @@
+ENVIRONMENT=dev

resources/environments/dev/kustomization.yaml

@@ -0,0 +1,6 @@
+resources:
+  - ../../base
+configMapGenerator:
+  - name: environment
+    envs:
+      - environment.env

resources/environments/prod/environment.env

@@ -0,0 +1 @@
+ENVIRONMENT=prod

resources/environments/prod/kustomization.yaml

@@ -0,0 +1,6 @@
+resources:
+  - ../../base
+configMapGenerator:
+  - name: environment
+    envs:
+      - environment.env

resources/environments/stage/environment.env

@@ -0,0 +1 @@
+ENVIRONMENT=stage

resources/environments/stage/kustomization.yaml

@@ -0,0 +1,6 @@
+resources:
+  - ../../base
+configMapGenerator:
+  - name: environment
+    envs:
+      - environment.env

resources/istio/kustomization.yaml

@@ -6,7 +6,3 @@ resources:
   # This will tell the istio sidecar to use TLS to connect to the backend service.
   # For this to work, you need to enable TLS in the backend. See docs/install-kyma-dashboard-manually.md for more information.
   # - destinationrule-busola-backend.yaml
-
-bases:
-  - ../backend
-  - ../web