[sophora-webclient]: use standardized version tag (#127)

subshell · Oct 21, 2024 · f7284d6 · f7284d6
1 parent 447f4c9
commit f7284d6
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/charts/sophora-webclient/Chart.yaml b/charts/sophora-webclient/Chart.yaml
@@ -6,12 +6,12 @@ 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.2.2
+version: 1.3.0
 
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 4.8.0
+appVersion: 4.14.0
 
 maintainers:
 - name: Team Weasel

diff --git a/charts/sophora-webclient/README.md b/charts/sophora-webclient/README.md
@@ -19,14 +19,18 @@ You can use the following values to customize the deployment
 | `sophora.authentication.secret.passwordKey` | The key in the secret that contains the password                           | `password`                                      | no       |
 | `sophora.authentication.secret.usernameKey` | The key in the secret that contains the username                           | `username`                                      | no       |
 | `webclient.image.name`                      | The name of the docker image                                               | `docker.subshell.com/sophora/sophora-webclient` | no       |
-| `webclient.image.version`                   | The version of the docker image                                            | `master`                                        | no       |
+| `webclient.image.tag`                       | The tag of the docker image                                                | chart appVersion                                | no       |
 | `webclient.binaryFilesBase64`               | A map of filename to base64 encoded file contents                          | The logo (logo.png)                             | no       |
 | `webclient.configuration`                   | The Sophora webclient `application.yml` file                               |                                                 | **yes**  |
 | `ingress.hosts`                             | An array of ingress hosts                                                  |                                                 | **yes**  |
 | `ingress.annotations`                       | A map of additional ingress annotations                                    | `{}`                                            | no       |
 
 ## Changelog
 
+### Version 1.3.0
+
+* BREAKING: `image.version` was renamed to `image.tag`.
+
 ### Version 1.2.0
 
 * `webclient.binaryFilesBase64` now accepts a map instead of an array.  
diff --git a/charts/sophora-webclient/templates/deployment.yaml b/charts/sophora-webclient/templates/deployment.yaml
@@ -32,7 +32,7 @@ spec:
       {{- end }}
       containers:
         - name: webclient
-          image: "{{ .Values.image.name }}:{{ .Values.image.version }}"
+          image: "{{ .Values.image.name }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
           env:
           - name: SOPHORA_CLIENT_SERVERCONNECTION_USERNAME

diff --git a/charts/sophora-webclient/test-values.yaml b/charts/sophora-webclient/test-values.yaml
@@ -1,5 +1,8 @@
 fullnameOverride: "test-webclient"
 
+image:
+  tag: "latest"
+
 sophora:
   authentication:
     secret:

diff --git a/charts/sophora-webclient/values.yaml b/charts/sophora-webclient/values.yaml
@@ -3,7 +3,8 @@ fullnameOverride: ""
 
 image:
   name: docker.subshell.com/sophora/sophora-webclient
-  version: 4
+  # Overrides the image tag whose default is the chart appVersion.
+  tag: ""
   pullPolicy: IfNotPresent
 
 # - (object) k8s Pod host aliases which will be used to generate the /etc/hosts file.