Merge pull request #113 from appuio/version-bump-and-cleanup

Version Maintenance
appuio · Sep 9, 2024 · a705a23 · a705a23
2 parents 1ebb503 + 6cf2ceb
commit a705a23
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 31 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,11 +14,11 @@ jobs:
     strategy:
       matrix:
         oc:
-          - "4.11"
           - "4.12"
           - "4.13"
           - "4.14"
           - "4.15"
+          - "4.16"
     steps:
       - uses: actions/checkout@v4
       - name: Set up Docker Buildx

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 # For supported versions see:
 # https://access.redhat.com/support/policy/updates/openshift/#dates
-VERSIONS = v4.11 v4.12 v4.13 v4.14 v4.15
+VERSIONS = v4.12 v4.13 v4.14 v4.15 v4.16
 # Also update in `.github/workflows/build.yml`!
 
 all: clean $(addsuffix /Dockerfile, $(VERSIONS))

diff --git a/README.md b/README.md
@@ -17,6 +17,8 @@ Also ships the binaries for `helm`, `kustomize`, `kubeval`, `sops`, `yq` and Pyt
 
 The built images are available from [Docker Hub][hub] and [Red Hat Quay.io][quay]
 
+- `docker.io/appuio/oc:v4.16`
+- `quay.io/appuio/oc:v4.16`
 - `docker.io/appuio/oc:v4.15`
 - `quay.io/appuio/oc:v4.15`
 - `docker.io/appuio/oc:v4.14`
@@ -25,8 +27,6 @@ The built images are available from [Docker Hub][hub] and [Red Hat Quay.io][quay
 - `quay.io/appuio/oc:v4.13`
 - `docker.io/appuio/oc:v4.12`
 - `quay.io/appuio/oc:v4.12`
-- `docker.io/appuio/oc:v4.11`
-- `quay.io/appuio/oc:v4.11`
 
 ## Development
 

diff --git a/src/Dockerfile b/src/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi9-minimal:9.4-1194
+FROM registry.access.redhat.com/ubi9-minimal:9.4-1227
 
 ENV VERSION=%%VERSION%% \
     HELM3_VERSION=%%HELM3_VERSION%% \

diff --git a/v4.12/Dockerfile b/v4.12/Dockerfile
@@ -1,19 +1,19 @@
-FROM registry.access.redhat.com/ubi9-minimal:9.4-1194
+FROM registry.access.redhat.com/ubi9-minimal:9.4-1227
 
 ENV VERSION=latest-4.12 \
-    HELM3_VERSION=v3.15.3 \
+    HELM3_VERSION=v3.15.4 \
     KUBEVAL_VERSION=v0.16.1 \
     KUSTOMIZE_VERSION=v5.4.3 \
     SEISO_VERSION=v1.0.0 \
     SOPS_VERSION=v3.9.0 \
-    YQ_VERSION=v4.44.2 \
+    YQ_VERSION=v4.44.3 \
     ARCHIVE=openshift-client-linux \
-    HELM3_SHA256SUM=ad871aecb0c9fd96aa6702f6b79e87556c8998c2e714a4959bf71ee31282ac9c \
+    HELM3_SHA256SUM=11400fecfc07fd6f034863e4e0c4c4445594673fd2a129e701fe41f31170cfa9 \
     KUBEVAL_SHA256SUM=2d6f9bda1423b93787fa05d9e8dfce2fc1190fefbcd9d0936b9635f3f78ba790 \
     KUSTOMIZE_SHA256SUM=3669470b454d865c8184d6bce78df05e977c9aea31c30df3c669317d43bcc7a7 \
     SEISO_SHA256SUM=40484059c23993b4e8d6b0add3debebb31ed1155b49a5ebdae987698b3176202 \
     SHA256SUM= \
-    YQ_SHA256SUM=246b781828353a59fb04ffaada241f78a8f3f25c623047b40306def1f6806e71 \
+    YQ_SHA256SUM=a2c097180dd884a8d50c956ee16a9cec070f30a7947cf4ebf87d5f36213e9ed7 \
     HELM_RELEASES_URL="https://get.helm.sh" \
     KUBEVAL_RELEASES_URL="https://github.com/instrumenta/kubeval/releases/download" \
     KUSTOMIZE_RELEASES_URL="https://github.com/kubernetes-sigs/kustomize/releases/download" \

diff --git a/v4.13/Dockerfile b/v4.13/Dockerfile
@@ -1,19 +1,19 @@
-FROM registry.access.redhat.com/ubi9-minimal:9.4-1194
+FROM registry.access.redhat.com/ubi9-minimal:9.4-1227
 
 ENV VERSION=latest-4.13 \
-    HELM3_VERSION=v3.15.3 \
+    HELM3_VERSION=v3.15.4 \
     KUBEVAL_VERSION=v0.16.1 \
     KUSTOMIZE_VERSION=v5.4.3 \
     SEISO_VERSION=v1.0.0 \
     SOPS_VERSION=v3.9.0 \
-    YQ_VERSION=v4.44.2 \
+    YQ_VERSION=v4.44.3 \
     ARCHIVE=openshift-client-linux \
-    HELM3_SHA256SUM=ad871aecb0c9fd96aa6702f6b79e87556c8998c2e714a4959bf71ee31282ac9c \
+    HELM3_SHA256SUM=11400fecfc07fd6f034863e4e0c4c4445594673fd2a129e701fe41f31170cfa9 \
     KUBEVAL_SHA256SUM=2d6f9bda1423b93787fa05d9e8dfce2fc1190fefbcd9d0936b9635f3f78ba790 \
     KUSTOMIZE_SHA256SUM=3669470b454d865c8184d6bce78df05e977c9aea31c30df3c669317d43bcc7a7 \
     SEISO_SHA256SUM=40484059c23993b4e8d6b0add3debebb31ed1155b49a5ebdae987698b3176202 \
     SHA256SUM= \
-    YQ_SHA256SUM=246b781828353a59fb04ffaada241f78a8f3f25c623047b40306def1f6806e71 \
+    YQ_SHA256SUM=a2c097180dd884a8d50c956ee16a9cec070f30a7947cf4ebf87d5f36213e9ed7 \
     HELM_RELEASES_URL="https://get.helm.sh" \
     KUBEVAL_RELEASES_URL="https://github.com/instrumenta/kubeval/releases/download" \
     KUSTOMIZE_RELEASES_URL="https://github.com/kubernetes-sigs/kustomize/releases/download" \

diff --git a/v4.14/Dockerfile b/v4.14/Dockerfile
@@ -1,19 +1,19 @@
-FROM registry.access.redhat.com/ubi9-minimal:9.4-1194
+FROM registry.access.redhat.com/ubi9-minimal:9.4-1227
 
 ENV VERSION=latest-4.14 \
-    HELM3_VERSION=v3.15.3 \
+    HELM3_VERSION=v3.15.4 \
     KUBEVAL_VERSION=v0.16.1 \
     KUSTOMIZE_VERSION=v5.4.3 \
     SEISO_VERSION=v1.0.0 \
     SOPS_VERSION=v3.9.0 \
-    YQ_VERSION=v4.44.2 \
+    YQ_VERSION=v4.44.3 \
     ARCHIVE=openshift-client-linux \
-    HELM3_SHA256SUM=ad871aecb0c9fd96aa6702f6b79e87556c8998c2e714a4959bf71ee31282ac9c \
+    HELM3_SHA256SUM=11400fecfc07fd6f034863e4e0c4c4445594673fd2a129e701fe41f31170cfa9 \
     KUBEVAL_SHA256SUM=2d6f9bda1423b93787fa05d9e8dfce2fc1190fefbcd9d0936b9635f3f78ba790 \
     KUSTOMIZE_SHA256SUM=3669470b454d865c8184d6bce78df05e977c9aea31c30df3c669317d43bcc7a7 \
     SEISO_SHA256SUM=40484059c23993b4e8d6b0add3debebb31ed1155b49a5ebdae987698b3176202 \
     SHA256SUM= \
-    YQ_SHA256SUM=246b781828353a59fb04ffaada241f78a8f3f25c623047b40306def1f6806e71 \
+    YQ_SHA256SUM=a2c097180dd884a8d50c956ee16a9cec070f30a7947cf4ebf87d5f36213e9ed7 \
     HELM_RELEASES_URL="https://get.helm.sh" \
     KUBEVAL_RELEASES_URL="https://github.com/instrumenta/kubeval/releases/download" \
     KUSTOMIZE_RELEASES_URL="https://github.com/kubernetes-sigs/kustomize/releases/download" \

diff --git a/v4.15/Dockerfile b/v4.15/Dockerfile
@@ -1,19 +1,19 @@
-FROM registry.access.redhat.com/ubi9-minimal:9.4-1194
+FROM registry.access.redhat.com/ubi9-minimal:9.4-1227
 
 ENV VERSION=latest-4.15 \
-    HELM3_VERSION=v3.15.3 \
+    HELM3_VERSION=v3.15.4 \
     KUBEVAL_VERSION=v0.16.1 \
     KUSTOMIZE_VERSION=v5.4.3 \
     SEISO_VERSION=v1.0.0 \
     SOPS_VERSION=v3.9.0 \
-    YQ_VERSION=v4.44.2 \
+    YQ_VERSION=v4.44.3 \
     ARCHIVE=openshift-client-linux \
-    HELM3_SHA256SUM=ad871aecb0c9fd96aa6702f6b79e87556c8998c2e714a4959bf71ee31282ac9c \
+    HELM3_SHA256SUM=11400fecfc07fd6f034863e4e0c4c4445594673fd2a129e701fe41f31170cfa9 \
     KUBEVAL_SHA256SUM=2d6f9bda1423b93787fa05d9e8dfce2fc1190fefbcd9d0936b9635f3f78ba790 \
     KUSTOMIZE_SHA256SUM=3669470b454d865c8184d6bce78df05e977c9aea31c30df3c669317d43bcc7a7 \
     SEISO_SHA256SUM=40484059c23993b4e8d6b0add3debebb31ed1155b49a5ebdae987698b3176202 \
     SHA256SUM= \
-    YQ_SHA256SUM=246b781828353a59fb04ffaada241f78a8f3f25c623047b40306def1f6806e71 \
+    YQ_SHA256SUM=a2c097180dd884a8d50c956ee16a9cec070f30a7947cf4ebf87d5f36213e9ed7 \
     HELM_RELEASES_URL="https://get.helm.sh" \
     KUBEVAL_RELEASES_URL="https://github.com/instrumenta/kubeval/releases/download" \
     KUSTOMIZE_RELEASES_URL="https://github.com/kubernetes-sigs/kustomize/releases/download" \

diff --git a/v4.11/Dockerfile → v4.16/Dockerfile b/v4.11/Dockerfile → v4.16/Dockerfile
@@ -1,19 +1,19 @@
-FROM registry.access.redhat.com/ubi9-minimal:9.4-1194
+FROM registry.access.redhat.com/ubi9-minimal:9.4-1227
 
-ENV VERSION=latest-4.11 \
-    HELM3_VERSION=v3.15.3 \
+ENV VERSION=latest-4.16 \
+    HELM3_VERSION=v3.15.4 \
     KUBEVAL_VERSION=v0.16.1 \
     KUSTOMIZE_VERSION=v5.4.3 \
     SEISO_VERSION=v1.0.0 \
     SOPS_VERSION=v3.9.0 \
-    YQ_VERSION=v4.44.2 \
+    YQ_VERSION=v4.44.3 \
     ARCHIVE=openshift-client-linux \
-    HELM3_SHA256SUM=ad871aecb0c9fd96aa6702f6b79e87556c8998c2e714a4959bf71ee31282ac9c \
+    HELM3_SHA256SUM=11400fecfc07fd6f034863e4e0c4c4445594673fd2a129e701fe41f31170cfa9 \
     KUBEVAL_SHA256SUM=2d6f9bda1423b93787fa05d9e8dfce2fc1190fefbcd9d0936b9635f3f78ba790 \
     KUSTOMIZE_SHA256SUM=3669470b454d865c8184d6bce78df05e977c9aea31c30df3c669317d43bcc7a7 \
     SEISO_SHA256SUM=40484059c23993b4e8d6b0add3debebb31ed1155b49a5ebdae987698b3176202 \
     SHA256SUM= \
-    YQ_SHA256SUM=246b781828353a59fb04ffaada241f78a8f3f25c623047b40306def1f6806e71 \
+    YQ_SHA256SUM=a2c097180dd884a8d50c956ee16a9cec070f30a7947cf4ebf87d5f36213e9ed7 \
     HELM_RELEASES_URL="https://get.helm.sh" \
     KUBEVAL_RELEASES_URL="https://github.com/instrumenta/kubeval/releases/download" \
     KUSTOMIZE_RELEASES_URL="https://github.com/kubernetes-sigs/kustomize/releases/download" \
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,11 +14,11 @@ jobs: @@
         strategy:
           matrix:
             oc:
-              - "4.11"
               - "4.12"
               - "4.13"
               - "4.14"
               - "4.15"
+              - "4.16"
         steps:
           - uses: actions/checkout@v4
           - name: Set up Docker Buildx
@@ Expand Down @@