chore: change image tag retrieval

allow fallback to chat appVersion
eclipse-tractusx · Mar 18, 2024 · 49541c9 · 49541c9
1 parent e8dfdcb
commit 49541c9
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 18 deletions.
diff --git a/.github/workflows/chart-test.yml b/.github/workflows/chart-test.yml
@@ -121,7 +121,7 @@ jobs:
         run: ct lint --validate-maintainers=false --check-version-increment=false --target-branch ${{ github.event.repository.default_branch }}
 
       - name: Run service chart-testing (install)
-        run: ct install --charts charts/ssi-credential-issuer --config charts/chart-testing-config.yaml --helm-extra-set-args "--set=issuer.image=kind-registry:5000/credential-issuer-service:testing --set=issuermigrations.image=kind-registry:5000/credential-issuer-migrations:testing --set=processesworker.image=kind-registry:5000/credential-issuer-processes-worker --set=credentialExpiry.image=kind-registry:5000/credential-expiry-app"
+        run: ct install --charts charts/ssi-credential-issuer --config charts/chart-testing-config.yaml --helm-extra-set-args "--set=issuer.image.name=kind-registry:5000/credential-issuer-service --set=issuer.image.tag=testing --set=issuermigrations.image.name=kind-registry:5000/credential-issuer-migrations --set=issuermigrations.image.tag=testing --set=processesworker.image.name=kind-registry:5000/credential-issuer-processes-worker --set=processesworker.image.tag=testing --set=credentialExpiry.image.name=kind-registry:5000/credential-expiry-app --set=credentialExpiry.image.tag=testing"
         if: github.event_name != 'pull_request' || steps.list-changed.outputs.changed == 'true'
 
       # TODO: re-add the step after the first version release  
@@ -133,5 +133,5 @@ jobs:
       #     helm repo add tractusx-dev https://eclipse-tractusx.github.io/charts/dev
       #     helm install ssi-credential-issuer tractusx-dev/ssi-credential-issuer --version ${{ github.event.inputs.upgrade_from || 'tbd' }} --namespace upgrade --create-namespace
       #     helm dependency update charts/ssi-credential-issuer
-      #     helm upgrade ssi-credential-issuer charts/ssi-credential-issuer --set issuer.image=kind-registry:5000/service:testing --set=issuermigrations.image=kind-registry:5000/migrations:testing --namespace upgrade
+      #     helm upgrade ssi-credential-issuer charts/ssi-credential-issuer --set issuer.image.name=kind-registry:5000/service:testing --set=issuermigrations.image.name=kind-registry:5000/migrations:testing --namespace upgrade
       #   if: github.event_name != 'pull_request' || steps.list-changed.outputs.changed == 'true'
diff --git a/charts/ssi-credential-issuer/templates/cronjob-expiry-app.yaml b/charts/ssi-credential-issuer/templates/cronjob-expiry-app.yaml
@@ -43,7 +43,7 @@ spec:
                 - ALL
               readOnlyRootFilesystem: true
               runAsNonRoot: true
-            image: "{{ .Values.credentialExpiry.image }}"
+            image: "{{ .Values.credentialExpiry.image.name }}:{{ .Values.credentialExpiry.image.tag | default .Chart.AppVersion }}"
             imagePullPolicy: "{{ .Values.credentialExpiry.imagePullPolicy }}"
             env:
             - name: DOTNET_ENVIRONMENT

diff --git a/charts/ssi-credential-issuer/templates/cronjob-issuer-processes.yaml b/charts/ssi-credential-issuer/templates/cronjob-issuer-processes.yaml
@@ -43,7 +43,7 @@ spec:
                 - ALL
               readOnlyRootFilesystem: true
               runAsNonRoot: true
-            image: "{{ .Values.processesworker.image }}"
+            image: "{{ .Values.processesworker.image.name }}:{{ .Values.processesworker.image.tag | default .Chart.AppVersion }}"
             imagePullPolicy: "{{ .Values.processesworker.imagePullPolicy }}"
             env:
             - name: DOTNET_ENVIRONMENT

diff --git a/charts/ssi-credential-issuer/templates/deployment-issuer-service.yaml b/charts/ssi-credential-issuer/templates/deployment-issuer-service.yaml
@@ -45,7 +45,7 @@ spec:
             - ALL
           readOnlyRootFilesystem: true
           runAsNonRoot: true
-        image: "{{ .Values.issuer.image }}"
+        image: "{{ .Values.issuer.image.name }}:{{ .Values.issuer.image.tag | default .Chart.AppVersion }}"
         imagePullPolicy: "{{ .Values.issuer.imagePullPolicy }}"
         env:
         - name: DOTNET_ENVIRONMENT

diff --git a/charts/ssi-credential-issuer/templates/job-issuer-migrations.yaml b/charts/ssi-credential-issuer/templates/job-issuer-migrations.yaml
@@ -40,7 +40,7 @@ spec:
             - ALL
           readOnlyRootFilesystem: true
           runAsNonRoot: true
-        image: "{{ .Values.issuermigrations.image }}"
+        image: "{{ .Values.issuermigrations.image.name }}:{{ .Values.issuermigrations.image.tag | default .Chart.AppVersion }}"
         imagePullPolicy: "{{ .Values.issuermigrations.imagePullPolicy }}"
         env:
           - name: DOTNET_ENVIRONMENT

diff --git a/charts/ssi-credential-issuer/values.yaml b/charts/ssi-credential-issuer/values.yaml
@@ -18,7 +18,9 @@
 ###############################################################
 
 issuer:
-  image: "docker.io/tractusx/credential-issuer-service:0.1.0-rc.1"
+  image: 
+    name: "docker.io/tractusx/credential-issuer-service"
+    tag: ""
   imagePullPolicy: "IfNotPresent"
   # -- We recommend not to specify default resource limits and to leave this as a conscious choice for the user.
   # If you do want to specify resource limits, uncomment the following lines and adjust them as necessary.
@@ -64,7 +66,9 @@ issuer:
 
 issuermigrations:
   name: "migrations"
-  image: "docker.io/tractusx/credential-issuer-migrations:0.1.0-rc.1"
+  image: 
+    name: "docker.io/tractusx/credential-issuer-migrations"
+    tag: ""
   imagePullPolicy: "IfNotPresent"
   # -- We recommend not to specify default resource limits and to leave this as a conscious choice for the user.
   # If you do want to specify resource limits, uncomment the following lines and adjust them as necessary.
@@ -83,7 +87,9 @@ issuermigrations:
 
 processesworker:
   name: "processesworker"
-  image: "docker.io/tractusx/credential-issuer-processes-worker:0.1.0-rc.1"
+  image: 
+    name: "docker.io/tractusx/credential-issuer-processes-worker"
+    tag: ""
   imagePullPolicy: "IfNotPresent"
   # -- We recommend not to specify default resource limits and to leave this as a conscious choice for the user.
   # If you do want to specify resource limits, uncomment the following lines and adjust them as necessary.
@@ -124,7 +130,9 @@ processesworker:
 
 credentialExpiry:
   name: "expiry"
-  image: "docker.io/tractusx/credential-expiry-app:0.1.0-rc.1"
+  image: 
+    name: "docker.io/tractusx/credential-expiry-app"
+    tag: ""
   imagePullPolicy: "IfNotPresent"
   # -- We recommend not to specify default resource limits and to leave this as a conscious choice for the user.
   # If you do want to specify resource limits, uncomment the following lines and adjust them as necessary.

diff --git a/consortia/environments/values-dev.yaml b/consortia/environments/values-dev.yaml
@@ -38,24 +38,28 @@ ingress:
             port: 8080
 
 issuer:
-  image: "docker.io/tractusx/ssi-credential-issuer-service:dev"
+  image: 
+    tag: "dev"
   imagePullPolicy: "Always"
   swaggerEnabled: true
 
 issuermigrations:
-  image: "docker.io/tractusx/ssi-credential-issuer-migrations:dev"
+  image: 
+    tag: "dev"
   imagePullPolicy: "Always"
   logging:
     default: "Debug"
 
 processesworker:
-  image: "docker.io/tractusx/ssi-credential-issuer-processes-worker:dev"
+  image: 
+    tag: "dev"
   imagePullPolicy: "Always"
   logging:
     default: "Debug"
 
 credentialexpiry:
-  image: "docker.io/tractusx/ssi-credential-expiry-app:dev"
+  image: 
+    tag: "dev"
   imagePullPolicy: "Always"
   logging:
     default: "Debug"

diff --git a/consortia/environments/values-rc.yaml b/consortia/environments/values-rc.yaml
@@ -38,24 +38,28 @@ ingress:
             port: 8080
 
 issuer:
-  image: "docker.io/tractusx/ssi-credential-issuer-service:rc"
+  image: 
+    tag: "rc"
   imagePullPolicy: "Always"
   swaggerEnabled: true
 
 issuermigrations:
-  image: "docker.io/tractusx/ssi-credential-issuer-migrations:rc"
+  image: 
+    tag: "rc"
   imagePullPolicy: "Always"
   logging:
     default: "Debug"
 
 processesworker:
-  image: "docker.io/tractusx/ssi-credential-issuer-processes-worker:rc"
+  image: 
+    tag: "rc"
   imagePullPolicy: "Always"
   logging:
     default: "Debug"
 
 credentialexpiry:
-  image: "docker.io/tractusx/ssi-credential-expiry-app:rc"
+  image: 
+    tag: "rc"
   imagePullPolicy: "Always"
   logging:
     default: "Debug"