Merge pull request #153 from vertigobr/stage

Stage
vertigobr · Sep 11, 2023 · 2ab21fa · 2ab21fa
2 parents 27b5a29 + be9f310
commit 2ab21fa
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/lib/versions.sh b/lib/versions.sh
@@ -17,7 +17,7 @@ export VKPR_EXTERNAL_DNS_VERSION="1.10.1" \
       VKPR_ARGOCD_EVENTS_VERSION="2.0.5" \
       VKPR_ARGOCD_WORKFLOWS_VERSION="0.19.6" \
       VKPR_JAEGER_VERSION="0.69.1" \
-      VKPR_MOCKSERVER_VERSION="5.14.0" \
+      VKPR_MOCKSERVER_VERSION="5.15.0" \
       VKPR_DEVPORTAL_VERSION="0.9.0" \
       VKPR_NEXUS_VERSION="4.14.0" \
       VKPR_EXTERNAL_SECRETS_VERSION="0.6.0" \

diff --git a/vkpr/apply/src/unix/formula/formula.sh b/vkpr/apply/src/unix/formula/formula.sh
@@ -73,6 +73,9 @@ applyConfig(){
 #17
   installTempo
 
+#18
+  installDevportal
+
 }
 
 installArgoCD(){
@@ -234,4 +237,12 @@ installTempo(){
   if [ "$TEMPO_EXISTS" == true ]; then
     rit vkpr tempo install --default
   fi
+}
+
+installDevportal(){
+  DEVPORTAL_EXISTS=$($VKPR_YQ eval .devportal.enabled "$VKPR_GLOBAL_CONFIG")
+  if [ "$DEVPORTAL_EXISTS" == true ]; then
+    rit vkpr devportal install --default
+  fi
+
 }
diff --git a/vkpr/mockserver/install/src/unix/formula/formula.sh b/vkpr/mockserver/install/src/unix/formula/formula.sh
@@ -49,8 +49,10 @@ validateInputs() {
 }
 
 settingMockServer() {
-  YQ_VALUES=".ingress.hosts[0] = \"$VKPR_ENV_MOCKSERVER_DOMAIN\" |
-    .ingress.ingressClass.name = \"$VKPR_ENV_MOCKSERVER_INGRESS_CLASS_NAME\"
+  YQ_VALUES=".ingress.hosts[0].host = \"$VKPR_ENV_MOCKSERVER_DOMAIN\" |
+    .ingress.hosts[0].paths[0].path = \"/\" |
+    .ingress.hosts[0].paths[0].pathType = \"ImplementationSpecific\" |
+    .ingress.className = \"$VKPR_ENV_MOCKSERVER_INGRESS_CLASS_NAME\"
   "
 
   if [[ "$VKPR_ENV_GLOBAL_SECURE" == true ]]; then

diff --git a/vkpr/mockserver/install/src/utils/mockserver.yaml b/vkpr/mockserver/install/src/utils/mockserver.yaml
@@ -2,5 +2,5 @@ service:
   type: ClusterIP
 ingress:
   enabled: true
-  ingressClass:
-    enabled: true
+  className: nginx
+  path: /