Merge pull request #54 from stfc/Fix_chart_not_getting_version

Fix chart not getting version
stfc · Mar 23, 2023 · 4b01a22 · 4b01a22
2 parents c12da2a + 26c7058
commit 4b01a22
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/.github/workflows/rabbit_consumer_chart.yaml b/.github/workflows/rabbit_consumer_chart.yaml
@@ -6,7 +6,7 @@ on:
   pull_request:
     paths:
       - ".github/workflows/rabbit_consumer_chart.yaml"
-      - "OpenStack-Rabbit-Consumer-Chart/**"
+      - "charts/rabbit-consumer/**"
 
 jobs:
   helm-lint:

diff --git a/charts/rabbit-consumer/Chart.yaml b/charts/rabbit-consumer/Chart.yaml
@@ -6,7 +6,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.1
+version: 1.0.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/rabbit-consumer/staging-values.yaml b/charts/rabbit-consumer/staging-values.yaml
@@ -3,7 +3,6 @@ consumer:
 
   image:
     repository: harbor.stfc.ac.uk/stfc-cloud-staging/openstack-rabbit-consumer
-    tag: "latest"
     pullPolicy: Always
 
   aquilon:

diff --git a/charts/rabbit-consumer/templates/deployment.yaml b/charts/rabbit-consumer/templates/deployment.yaml
@@ -22,7 +22,7 @@ spec:
       containers:
         - name: consumer
 
-          image: "{{ .Values.consumer.image.repository }}:{{ .Values.consumer.image.tag }}"
+          image: "{{ .Values.consumer.image.repository }}:{{ default .Chart.AppVersion .Values.consumer.image.tag }}"
           imagePullPolicy: {{ .Values.consumer.image.pullPolicy }}
 
           envFrom: