Update dependency versions (#682)

* Build against K8s 1.32 * Build with Go 1.23 * Update dependencies * Use Java 17 for Spring base images * Update Coherence versions * Fix Prometheus doc links
oracle · Jan 7, 2025 · fa72cad · fa72cad
1 parent c5b7aba
commit fa72cad
Show file tree

Hide file tree

Showing 40 changed files with 327 additions and 293 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -110,6 +110,7 @@ jobs:
         docker pull gcr.io/distroless/java
         docker pull gcr.io/distroless/java11-debian11
         docker pull gcr.io/distroless/java17-debian11
+        docker pull gcr.io/distroless/java17-debian12
 
     - name: Build
       shell: bash

diff --git a/.github/workflows/coherence-matrix.yaml b/.github/workflows/coherence-matrix.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021, 2024, Oracle Corporation and/or its affiliates.  All rights reserved.
+# Copyright 2021, 2025, Oracle Corporation and/or its affiliates.  All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at
 # http://oss.oracle.com/licenses/upl.
 
@@ -37,8 +37,9 @@ jobs:
           - "15.1.1-0-SNAPSHOT-Graal"
           - "24.09"
           - "24.09-Graal"
-          - "22.06"
+          - "14.1.2-0"
           - "14.1.2-0-SNAPSHOT"
+          - "22.06"
           - "14.1.1-2206-SNAPSHOT"
           - "14.1.1-0-SNAPSHOT"
           - "14.1.1-0"
@@ -70,27 +71,33 @@ jobs:
             javaVersion: 17
             baseImage: "gcr.io/distroless/java17-debian12"
 
+          - matrixName: "14.1.2-0-SNAPSHOT"
+            coherenceVersion: "14.1.2-0-1-SNAPSHOT"
+            coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:14.1.2-0-1-SNAPSHOT"
+            javaVersion: 17
+            baseImage: "gcr.io/distroless/java17-debian12"
+
+          - matrixName: "14.1.2-0"
+            coherenceVersion: "14.1.2-0-0"
+            javaVersion: 8
+            coherenceImage: "ghcr.io/oracle/coherence-ce:14.1.2-0-0"
+            baseImage: "gcr.io/distroless/java17-debian12"
+
           - matrixName: "22.06"
             coherenceVersion: "22.06.10"
             coherenceImage: "ghcr.io/oracle/coherence-ce:22.06.10"
             javaVersion: 11
             baseImage: "gcr.io/distroless/java11-debian11"
 
-          - matrixName: "14.1.2-0-SNAPSHOT"
-            coherenceVersion: "14.1.2-0-0-SNAPSHOT"
-            coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:14.1.2-0-0-SNAPSHOT"
-            javaVersion: 17
-            baseImage: "gcr.io/distroless/java17-debian12"
-
           - matrixName: "14.1.1-2206-SNAPSHOT"
-            coherenceVersion: "14.1.1-2206-10-SNAPSHOT"
-            coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:14.1.1-2206-10-SNAPSHOT"
+            coherenceVersion: "14.1.1-2206-11-SNAPSHOT"
+            coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:14.1.1-2206-11-SNAPSHOT"
             javaVersion: 11
             baseImage: "gcr.io/distroless/java11-debian11"
 
           - matrixName: "14.1.1-0-SNAPSHOT"
             coherenceVersion: "14.1.1-0-20-SNAPSHOT"
-            coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:14.1.1-0-19-SNAPSHOT"
+            coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:14.1.1-0-20-SNAPSHOT"
             javaVersion: 8
             baseImage: "gcr.io/distroless/java11-debian11"
 
@@ -189,6 +196,7 @@ jobs:
         docker pull gcr.io/distroless/java
         docker pull gcr.io/distroless/java11-debian11
         docker pull gcr.io/distroless/java17-debian11
+        docker pull gcr.io/distroless/java17-debian12
         docker pull ${{ matrix.coherenceImage }}
 
     - name: Coherence Certification Tests

diff --git a/.github/workflows/compatibility-tests.yaml b/.github/workflows/compatibility-tests.yaml
@@ -170,6 +170,7 @@ jobs:
         docker pull gcr.io/distroless/java
         docker pull gcr.io/distroless/java11-debian11
         docker pull gcr.io/distroless/java17-debian11
+        docker pull gcr.io/distroless/java17-debian12
         docker pull ${{ matrix.coherence-image }}
 
     - name: Build

diff --git a/.github/workflows/doc-check.yaml b/.github/workflows/doc-check.yaml
@@ -72,6 +72,7 @@ jobs:
         docker pull gcr.io/distroless/java
         docker pull gcr.io/distroless/java11-debian11
         docker pull gcr.io/distroless/java17-debian11
+        docker pull gcr.io/distroless/java17-debian12
 
     - name: Documentation Link Check
       shell: bash

diff --git a/.github/workflows/istio-tests.yaml b/.github/workflows/istio-tests.yaml
@@ -111,6 +111,7 @@ jobs:
         docker pull gcr.io/distroless/java
         docker pull gcr.io/distroless/java11-debian11
         docker pull gcr.io/distroless/java17-debian11
+        docker pull gcr.io/distroless/java17-debian12
 
     - name: Build
       shell: bash

diff --git a/.github/workflows/k3d-tests.yaml b/.github/workflows/k3d-tests.yaml
@@ -105,6 +105,7 @@ jobs:
         docker pull gcr.io/distroless/java
         docker pull gcr.io/distroless/java11-debian11
         docker pull gcr.io/distroless/java17-debian11
+        docker pull gcr.io/distroless/java17-debian12
 
     - name: K3d Tests
       shell: bash

diff --git a/.github/workflows/k8s-matrix.yaml b/.github/workflows/k8s-matrix.yaml
@@ -40,24 +40,28 @@ jobs:
       fail-fast: false
       matrix:
         matrixName:
+          - v1.32
           - v1.31
           - v1.30
           - v1.29
           - v1.28
           - v1.27
           - v1.26
-          - v1.25
         include:
+          - matrixName: v1.32
+            k8s: kindest/node:v1.32.0@sha256:c48c62eac5da28cdadcf560d1d8616cfa6783b58f0d94cf63ad1bf49600cb027
+            kindCommand: kind-calico
+            runNetTests: true
           - matrixName: v1.31
-            k8s: kindest/node:v1.31.0@sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865
+            k8s: kindest/node:v1.31.4@sha256:2cb39f7295fe7eafee0842b1052a599a4fb0f8bcf3f83d96c7f4864c357c6c30
             kindCommand: kind-calico
             runNetTests: true
           - matrixName: v1.30
-            k8s: kindest/node:v1.30.4@sha256:976ea815844d5fa93be213437e3ff5754cd599b040946b5cca43ca45c2047114
+            k8s: kindest/node:v1.30.8@sha256:17cd608b3971338d9180b00776cb766c50d0a0b6b904ab4ff52fd3fc5c6369bf
             kindCommand: kind-calico
             runNetTests: true
           - matrixName: v1.29
-            k8s: kindest/node:v1.29.8@sha256:d46b7aa29567e93b27f7531d258c372e829d7224b25e3fc6ffdefed12476d3aa
+            k8s: kindest/node:v1.29.12@sha256:62c0672ba99a4afd7396512848d6fc382906b8f33349ae68fb1dbfe549f70dec
             kindCommand: kind-calico
             runNetTests: true
           - matrixName: v1.28
@@ -72,10 +76,6 @@ jobs:
             k8s: kindest/node:v1.26.15@sha256:84333e26cae1d70361bb7339efb568df1871419f2019c80f9a12b7e2d485fe19
             kindCommand: kind-calico
             runNetTests: true
-          - matrixName: v1.25
-            k8s: kindest/node:v1.25.16@sha256:5da57dfc290ac3599e775e63b8b6c49c0c85d3fec771cd7d55b45fae14b38d3b
-            kindCommand: kind-calico
-            runNetTests: true
 
     steps:
     - uses: actions/checkout@v4
@@ -146,6 +146,7 @@ jobs:
         docker pull gcr.io/distroless/java
         docker pull gcr.io/distroless/java11-debian11
         docker pull gcr.io/distroless/java17-debian11
+        docker pull gcr.io/distroless/java17-debian12
 
     - name: Certification Tests
       shell: bash

diff --git a/.github/workflows/minikube-matrix.yaml b/.github/workflows/minikube-matrix.yaml
@@ -40,22 +40,19 @@ jobs:
       fail-fast: false
       matrix:
         matrixName:
+          - v1.32
+          - v1.31
+          - v1.30
           - v1.29
-          - v1.28
-          - v1.27
-          - v1.26
-          - v1.25
         include:
+          - matrixName: v1.32
+            k8s: v1.32.0
+          - matrixName: v1.31
+            k8s: v1.31.4
+          - matrixName: v1.30
+            k8s: v1.30.8
           - matrixName: v1.29
-            k8s: v1.29.2
-          - matrixName: v1.28
-            k8s: v1.28.6
-          - matrixName: v1.27
-            k8s: v1.27.11
-          - matrixName: v1.26
-            k8s: v1.26.14
-          - matrixName: v1.25
-            k8s: 1.25.16
+            k8s: v1.29.12
 
     steps:
     - uses: actions/checkout@v4
@@ -131,6 +128,7 @@ jobs:
         docker pull gcr.io/distroless/java
         docker pull gcr.io/distroless/java11-debian11
         docker pull gcr.io/distroless/java17-debian11
+        docker pull gcr.io/distroless/java17-debian12
         ./hack/k8s-certification.sh
 
     - uses: actions/upload-artifact@v4

diff --git a/.github/workflows/prometheus-tests.yaml b/.github/workflows/prometheus-tests.yaml
@@ -104,6 +104,7 @@ jobs:
         docker pull gcr.io/distroless/java
         docker pull gcr.io/distroless/java11-debian11
         docker pull gcr.io/distroless/java17-debian11
+        docker pull gcr.io/distroless/java17-debian12
 
     - name: E2E Prometheus Tests
       shell: bash

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -58,6 +58,7 @@ jobs:
         docker pull gcr.io/distroless/java
         docker pull gcr.io/distroless/java11-debian11
         docker pull gcr.io/distroless/java17-debian11
+        docker pull gcr.io/distroless/java17-debian12
         make get-tanzu
 
     - name: Release

diff --git a/.github/workflows/tanzu-tests.yaml b/.github/workflows/tanzu-tests.yaml
@@ -111,6 +111,7 @@ jobs:
         docker pull gcr.io/distroless/java
         docker pull gcr.io/distroless/java11-debian11
         docker pull gcr.io/distroless/java17-debian11
+        docker pull gcr.io/distroless/java17-debian12
 
     - name: Build
       shell: bash

diff --git a/Makefile b/Makefile
@@ -39,7 +39,7 @@ KUBERNETES_DOC_VERSION=v1.30
 # ----------------------------------------------------------------------------------------------------------------------
 # The Coherence version to build against - must be a Java 8 compatible version
 COHERENCE_VERSION     ?= 21.12.5
-COHERENCE_VERSION_LTS ?= 22.06.10
+COHERENCE_VERSION_LTS ?= 14.1.2-0-0
 # The default Coherence image the Operator will run if no image is specified
 COHERENCE_IMAGE_REGISTRY ?= ghcr.io/oracle
 COHERENCE_IMAGE_NAME     ?= coherence-ce
@@ -48,8 +48,8 @@ COHERENCE_IMAGE          ?= $(COHERENCE_IMAGE_REGISTRY)/$(COHERENCE_IMAGE_NAME):
 COHERENCE_GROUP_ID       ?= com.oracle.coherence.ce
 # The Java version that tests will be compiled to.
 # This should match the version required by the COHERENCE_IMAGE version
-BUILD_JAVA_VERSION        ?= 11
-COHERENCE_TEST_BASE_IMAGE ?= gcr.io/distroless/java11-debian11
+BUILD_JAVA_VERSION        ?= 17
+COHERENCE_TEST_BASE_IMAGE ?= gcr.io/distroless/java17-debian12
 
 # This is the Coherence image that will be used in tests.
 # Changing this variable will allow test builds to be run against different Coherence versions
@@ -1639,7 +1639,7 @@ create-ssl-secrets: $(BUILD_OUTPUT)/certs
 ##@ KinD
 
 KIND_CLUSTER   ?= operator
-KIND_IMAGE     ?= "kindest/node:v1.31.0@sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865"
+KIND_IMAGE     ?= "kindest/node:v1.32.0@sha256:c48c62eac5da28cdadcf560d1d8616cfa6783b58f0d94cf63ad1bf49600cb027"
 CALICO_TIMEOUT ?= 300s
 
 # ----------------------------------------------------------------------------------------------------------------------
@@ -2000,7 +2000,7 @@ controller-gen: $(TOOLS_BIN)/controller-gen ## Download controller-gen locally i
 
 $(TOOLS_BIN)/controller-gen:
 	@echo "Downloading controller-gen"
-	test -s $(TOOLS_BIN)/controller-gen || GOBIN=$(TOOLS_BIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.2
+	test -s $(TOOLS_BIN)/controller-gen || GOBIN=$(TOOLS_BIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.17.0
 	ls -al $(TOOLS_BIN)
 
 # ----------------------------------------------------------------------------------------------------------------------
@@ -2306,7 +2306,7 @@ get-istio: $(BUILD_PROPS)
 # ----------------------------------------------------------------------------------------------------------------------
 $(TOOLS_BIN)/golangci-lint:
 	@mkdir -p $(TOOLS_BIN)
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh --header $(GH_AUTH) | sh -s -- -b $(TOOLS_BIN) v1.55.2
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh --header $(GH_AUTH) | sh -s -- -b $(TOOLS_BIN) v1.63.1
 
 # ----------------------------------------------------------------------------------------------------------------------
 # Display the full version string for the artifacts that would be built.