From c5b327f9baf4be04abe74c97a3a54b8cda350ce4 Mon Sep 17 00:00:00 2001
From: zhenyus <zhenyus@mathmast.com>
Date: Mon, 17 Feb 2025 22:13:52 +0800
Subject: [PATCH] ci(magicleaps): switch magicleaps alpha ci to develop branch

Signed-off-by: zhenyus <zhenyus@mathmast.com>
---
 .../freeleaps/devops/ArgoApplicationVersionUpdater.groovy | 8 +++++---
 .../magicleaps/templates/frontend/certificate.yaml        | 2 +-
 .../helm-pkg/magicleaps/templates/frontend/ingress.yaml   | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/first-class-pipeline/src/com/freeleaps/devops/ArgoApplicationVersionUpdater.groovy b/first-class-pipeline/src/com/freeleaps/devops/ArgoApplicationVersionUpdater.groovy
index f4cbe269..757e1f0f 100644
--- a/first-class-pipeline/src/com/freeleaps/devops/ArgoApplicationVersionUpdater.groovy
+++ b/first-class-pipeline/src/com/freeleaps/devops/ArgoApplicationVersionUpdater.groovy
@@ -3,15 +3,17 @@ package com.freeleaps.devops
 class ArgoApplicationVersionUpdater {
   def steps
   def workspace
+  def configurations
 
-  ArgoApplicationVersionUpdater(steps) {
+  ArgoApplicationVersionUpdater(steps, configurations) {
     this.steps = steps
+    this.configurations = configurations
     this.workspace = steps.env.WORKSPACE
   }
 
   def update(environmentSlug, component) {
-    steps.log.info("ArgoApplicationVersionUpdater", "[${environmentSlug}] Update Argo application image version for ${component.name}...")
-    def valuesFile = "${workspace}/helm/${component.name}/values-${environmentSlug}.yaml"
+    steps.log.info("ArgoApplicationVersionUpdater", "[${environmentSlug}] Update Argo application image version to ${steps.env.BUILD_IMAGE_VERSION} for ${component.name}...")
+    def valuesFile = "${workspace}/${configurations.serviceName}/helm-pkg/${configuration.serviceName}/values-${environmentSlug}.yaml"
     def data = steps.readYaml (file: valuesFile)
     data.${component.name}.image.registry = steps.env.BUILD_IMAGE_REGISTRY
     data.${component.name}.image.repository = steps.env.BUILD_IMAGE_REPOSITORY
diff --git a/magicleaps/helm-pkg/magicleaps/templates/frontend/certificate.yaml b/magicleaps/helm-pkg/magicleaps/templates/frontend/certificate.yaml
index 8faf528d..40ef77e3 100644
--- a/magicleaps/helm-pkg/magicleaps/templates/frontend/certificate.yaml
+++ b/magicleaps/helm-pkg/magicleaps/templates/frontend/certificate.yaml
@@ -1,6 +1,6 @@
 {{ $namespace := .Release.Namespace }}
 {{ $appVersion := .Chart.AppVersion | quote }}
-{{ $releaseCertificate := .Release.Certificate }}
+{{ $releaseCertificate := .Release.Service }}
 {{ $releaseName := .Release.Name }}
 {{- range $ingress := .Values.frontend.ingresses }}
 {{- if not $ingress.tls.exists  }}
diff --git a/magicleaps/helm-pkg/magicleaps/templates/frontend/ingress.yaml b/magicleaps/helm-pkg/magicleaps/templates/frontend/ingress.yaml
index 33b52993..6527dd57 100644
--- a/magicleaps/helm-pkg/magicleaps/templates/frontend/ingress.yaml
+++ b/magicleaps/helm-pkg/magicleaps/templates/frontend/ingress.yaml
@@ -1,6 +1,6 @@
 {{ $namespace := .Release.Namespace }}
 {{ $appVersion := .Chart.AppVersion | quote }}
-{{ $releaseIngress := .Release.Ingress }}
+{{ $releaseIngress := .Release.Service }}
 {{ $releaseName := .Release.Name }}
 {{- range $ingress := .Values.frontend.ingresses }}
 ---