Merge pull request #101 from Cray-HPE/release/2.4.0

Release v2.4.0

CHANGELOG.md

@@ -7,7 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [2.3.1] - 2024-09-05
+## [2.4.0] - 2024-09-05
+### Changed
+- CASMCMS-9147 - stop using alpine:latest base image.
+- CASMTRIAGE-7345 - fix inclusion of ps utility after upgrade to sp5.
+
 ### Dependencies
 - CASMCMS-9136: Bump `cray-services` base chart to 11.0
 

Dockerfile

@@ -79,7 +79,7 @@ COPY zypper-docker-build.sh /
 # The above script calls the following script, so we need to copy it as well
 COPY zypper-refresh-patch-clean.sh /
 RUN --mount=type=secret,id=ARTIFACTORY_READONLY_USER --mount=type=secret,id=ARTIFACTORY_READONLY_TOKEN \
-    ./zypper-docker-build.sh conman less vi openssh jq curl tar --remove polkit && \
+    ./zypper-docker-build.sh conman less vi openssh jq curl tar procps --remove polkit && \
     rm /zypper-docker-build.sh /zypper-refresh-patch-clean.sh
 
 # Copy in the needed files

kubernetes/cray-console-node/Chart.yaml

@@ -44,5 +44,5 @@ annotations:
     - name: cray-console-node
       image: artifactory.algol60.net/csm-docker/S-T-A-B-L-E/cray-console-node:0.0.0-image
     - name: alpine
-      image: alpine:latest
+      image: artifactory.algol60.net/csm-docker/stable/docker.io/library/alpine:3
   artifacthub.io/license: MIT

kubernetes/cray-console-node/values.yaml

@@ -99,8 +99,8 @@ cray-service:
     log-forwarding:
       name: log-forwarding
       image:
-        repository: alpine
-        tag: latest
+        repository: artifactory.algol60.net/csm-docker/stable/docker.io/library/alpine
+        tag: 3
       args: [/bin/sh, -c, 'tail -n 0 -F /tmp/consoleAgg/consoleAgg-${MY_POD_NAME}.log']
       env:
       - name: MY_POD_NAME
@@ -151,6 +151,6 @@ cray-service:
 
 alpine:
   image:
-    repository: alpine
-    tag: latest
+    repository: artifactory.algol60.net/csm-docker/stable/docker.io/library/alpine
+    tag: 3
     pullPolicy: IfNotPresent