add(Makefile): setup and k9s commands, minor fixes

Author: Trik16

.gitignore

@@ -5,5 +5,7 @@ kubeconfig*.yaml
 kubeconfig*.yml
 kubeconfig*.conf
 
+.env
+
 cache.yaml
 default.log

Makefile

@@ -4,7 +4,7 @@
 
 .ONESHELL:
 expose-services:
-	kubectl --kubeconfig=$(KUBECONFIG) -n $(NAMESPACE) port-forward service/ecde-webapp 8080:$(WEBAPP_PORT) & \
+	kubectl --kubeconfig=$(KUBECONFIG) -n $(NAMESPACE) port-forward service/ecde-webapp 8080:80 & \
 	kubectl --kubeconfig=$(KUBECONFIG) -n $(NAMESPACE) port-forward service/ecde-api $(APISERVER_PORT):$(APISERVER_PORT) & \
 	kubectl --kubeconfig=$(KUBECONFIG) -n $(NAMESPACE) port-forward service/skinny-wms $(SKINNYWMS_PORT):$(SKINNYWMS_PORT) & \
 	echo "Press CTRL-C to stop port forwarding and exit the script"
@@ -13,6 +13,16 @@ expose-services:
 dev:
 	devspace --kubeconfig=$(KUBECONFIG) -n $(NAMESPACE) run-pipeline deploy
 
+k9s:
+	k9s --kubeconfig=$(KUBECONFIG)
+
+.env:
+	@echo "KUBECONFIG=./kubeconfig.yaml\nNAMESPACE=${USER}-ecde-dev\n\nAPISERVER_PORT=5000\nSKINNYWMS_PORT=5001" > $@
+
+SILENT:
+setup: .env
+	@echo "\e[1;32mDone!\e[0m\n\e[1;3;33mPlease edit the values in the '.env' file and then run 'make dev' to deploy the application\e[0m"
+
 purge:
 	devspace --kubeconfig=$(KUBECONFIG) -n $(NAMESPACE) purge \
 	kubectl delete pv ${USER}-pv-wms

devspace.yaml

@@ -24,6 +24,10 @@ deployments:
           pvName: ${USER}-pv-wms
           storage: 10Gi
           storageclass: nfs-csi
+        apiServer:
+          port: ${APISERVER_PORT}
+        skinnyWms:
+          port: ${SKINNYWMS_PORT}
 
 dev:
   api-server:

ecde-application/templates/api.yaml

@@ -26,8 +26,10 @@ spec:
               value: {{ .Values.apiServer.env.rootPath }}
             - name: MODE
               value: {{ .Values.apiServer.env.mode }}
+            {{- if .Values.apiServer.env.allowedOrigin }}
             - name: ALLOWED_ORIGIN
               value: {{ .Values.apiServer.env.allowedOrigin }}
+            {{- end }}
             - name: WMS_SERVER
               value: {{ .Values.apiServer.env.wmsServer }}:$(SKINNY_WMS_SERVICE_PORT_WMS_PORT)
             - name: WMS_DATA_DIR

ecde-application/templates/ingress.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.ingress.enabled }}
+{{- if .Values.ingress.enable }}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:

ecde-application/values.yaml

@@ -13,14 +13,14 @@ apiServer:
   env:
     rootPath: /c3s-apps/ecde/api
     mode: production
-    wmsServer: http://ecds-dev-cci2.copernicus-climate.eu/ecde-wms
+    wmsServer: http://ecds-dev.bopen.compute.cci2.ecmwf.int/ecde-wms
     wmsDataDir: /skinnywms/appdata
     wmsStyleDir: /skinnywms/styles
 skinnyWms:
   image: ecmwf/skinnywms  # image for application
   tag: 0.10.0  # image tag to use (this )
   port: 5000  # Port exposed by the application
-  replicas: 0
+  replicas: 1
   env:
     skinnywmsUwsgiWorkers: $(SKINNYWMS_UWSGI_WORKERS:-4)
     skinnywmsDataPath: /skinnywms/appdata
@@ -35,11 +35,11 @@ sharedPvc:
 ingress:
   enable: true
   # Hostname where the app will be published, this must be mapped to the cluster described by the KUBECONFIG
-  hostname: ecds-dev-cci2.copernicus-climate.eu  
+  hostname: ecds-dev.bopen.compute.cci2.ecmwf.int  
   # Path to the application, this must be included in the env when building a JS application
   webappPath: /c3s-apps/ecde/
   apiPath: /c3s-apps/ecde/api/ 
   # SSL certificate secret name:
   secretName: star.copernicus-climate.eu
-  ingressclass: nginx-dev
+  ingressclass: nginx-c3s