Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependency versions #682

Merged
merged 17 commits into from
Jan 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
30 changes: 19 additions & 11 deletions .github/workflows/coherence-matrix.yaml
Original file line number Diff line number Diff line change
@@ -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.

Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/compatibility-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/doc-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/istio-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/k3d-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 9 additions & 8 deletions .github/workflows/k8s-matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
24 changes: 11 additions & 13 deletions .github/workflows/minikube-matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/prometheus-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/tanzu-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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

# ----------------------------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -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)

# ----------------------------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -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.
Expand Down
Loading
Loading