From 0e3107ce1cadb0e117808d88885eebbc5fe9f9b4 Mon Sep 17 00:00:00 2001 From: Jonathan Knight Date: Wed, 26 Jun 2024 15:33:04 +0300 Subject: [PATCH 01/14] Bump version to 3.4.0 --- .github/workflows/compatibility-tests.yaml | 5 ++++ Makefile | 11 +++---- config/crd/kustomization.yaml | 2 +- config/manager/kustomization.yaml | 2 +- config/manager/manager.yaml | 14 ++++----- config/manager/service.yaml | 8 ++--- ...erence-operator.clusterserviceversion.yaml | 6 ++-- docs/about/03_quickstart.adoc | 2 +- docs/installation/01_installation.adoc | 2 +- docs/installation/07_webhooks.adoc | 2 +- docs/installation/09_RBAC.adoc | 2 +- docs/other/041_global_labels.adoc | 2 +- examples/015_simple_image/README.adoc | 2 +- examples/015_simple_image/build.gradle | 2 +- .../manifests/net-test-client.yaml | 2 +- .../manifests/net-test-coherence-server.yaml | 2 +- .../manifests/net-test-coherence.yaml | 2 +- .../manifests/net-test-operator-server.yaml | 6 ++-- .../manifests/net-test-operator.yaml | 6 ++-- .../manifests/net-test-webhook.yaml | 2 +- examples/300_helm/chart/values.yaml | 2 +- examples/400_Istio/README.adoc | 2 +- examples/no-operator/04_istio/Dockerfile | 2 +- examples/no-operator/04_istio/README.adoc | 2 +- java/coherence-operator/pom.xml | 4 +-- java/operator-compatibility/pom.xml | 4 +-- java/operator-test-client/pom.xml | 4 +-- java/operator-test-helidon/pom.xml | 12 ++++---- java/operator-test-spring/pom.xml | 4 +-- java/operator-test/pom.xml | 29 ++++++++++++++++--- java/pom.xml | 29 +++++++++---------- 31 files changed, 101 insertions(+), 75 deletions(-) diff --git a/.github/workflows/compatibility-tests.yaml b/.github/workflows/compatibility-tests.yaml index f7e5481ce..b6872cbe1 100644 --- a/.github/workflows/compatibility-tests.yaml +++ b/.github/workflows/compatibility-tests.yaml @@ -37,6 +37,7 @@ jobs: fail-fast: false matrix: compatibilityVersion: + - 3.3.5 - 3.3.4 - 3.3.3 - 3.3.2 @@ -48,6 +49,10 @@ jobs: - 3.2.7 - 3.2.6 include: + - compatibilityVersion: 3.3.5 + coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7" + compatibilitySelector: control-plane=coherence + k8s: kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245 - compatibilityVersion: 3.3.4 coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7" compatibilitySelector: control-plane=coherence diff --git a/Makefile b/Makefile index c23ded602..b2364a6f6 100644 --- a/Makefile +++ b/Makefile @@ -15,17 +15,17 @@ # ====================================================================================================================== # The version of the Operator being build - this should be a valid SemVer format -VERSION ?= 3.3.6 +VERSION ?= 3.4.0 MVN_VERSION ?= $(VERSION) # The version number to be replaced by this release -PREV_VERSION ?= 3.3.4 +PREV_VERSION ?= 3.3.5 # The operator version to use to run certification tests against CERTIFICATION_VERSION ?= $(VERSION) # The previous Operator version used to run the compatibility tests. -COMPATIBLE_VERSION ?= 3.3.4 +COMPATIBLE_VERSION ?= 3.3.5 # The selector to use to find Operator Pods of the COMPATIBLE_VERSION (do not put in double quotes!!) COMPATIBLE_SELECTOR ?= control-plane=coherence @@ -39,12 +39,13 @@ KUBERNETES_DOC_VERSION=v1.29 # ---------------------------------------------------------------------------------------------------------------------- # The Coherence version to build against - must be a Java 8 compatible version COHERENCE_VERSION ?= 21.12.5 -COHERENCE_VERSION_LTS ?= 22.06.7 +COHERENCE_VERSION_LTS ?= 22.06.8 # The default Coherence image the Operator will run if no image is specified COHERENCE_IMAGE_REGISTRY ?= ghcr.io/oracle COHERENCE_IMAGE_NAME ?= coherence-ce COHERENCE_IMAGE_TAG ?= $(COHERENCE_VERSION_LTS) COHERENCE_IMAGE ?= $(COHERENCE_IMAGE_REGISTRY)/$(COHERENCE_IMAGE_NAME):$(COHERENCE_IMAGE_TAG) +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 @@ -93,7 +94,7 @@ OPERATOR_SDK_VERSION := v1.9.0 # Options to append to the Maven command # ---------------------------------------------------------------------------------------------------------------------- MAVEN_OPTIONS ?= -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3 -MAVEN_BUILD_OPTS :=$(USE_MAVEN_SETTINGS) -Drevision=$(MVN_VERSION) -Dcoherence.version=$(COHERENCE_VERSION) -Dcoherence.version.2206=$(COHERENCE_VERSION_LTS) -Dcoherence.test.base.image=$(COHERENCE_TEST_BASE_IMAGE) -Dbuild.java.version=$(BUILD_JAVA_VERSION) $(MAVEN_OPTIONS) +MAVEN_BUILD_OPTS :=$(USE_MAVEN_SETTINGS) -Drevision=$(MVN_VERSION) -Dcoherence.version=$(COHERENCE_VERSION) -Dcoherence.version=$(COHERENCE_VERSION_LTS) -Dcoherence.groupId=$(COHERENCE_GROUP_ID) -Dcoherence.test.base.image=$(COHERENCE_TEST_BASE_IMAGE) -Dbuild.java.version=$(BUILD_JAVA_VERSION) $(MAVEN_OPTIONS) # ---------------------------------------------------------------------------------------------------------------------- # Operator image names diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index cc089d38b..7cd6ff82d 100644 --- a/config/crd/kustomization.yaml +++ b/config/crd/kustomization.yaml @@ -41,4 +41,4 @@ commonLabels: app.kubernetes.io/instance: coherence-operator-crd app.kubernetes.io/name: coherence-operator app.kubernetes.io/part-of: coherence-operator - app.kubernetes.io/version: 3.3.6 + app.kubernetes.io/version: 3.4.0 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index b625bda56..c26887a74 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -9,4 +9,4 @@ resources: images: - name: controller newName: ghcr.io/oracle/coherence-operator - newTag: 3.3.6 + newTag: 3.4.0 diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index bbade8e6e..702c69b52 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -8,8 +8,8 @@ metadata: app.kubernetes.io/name: coherence-operator app: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.3.6" - version: "3.3.6" + app.kubernetes.io/version: "3.4.0" + version: "3.4.0" app.kubernetes.io/component: manager app.kubernetes.io/part-of: coherence-operator spec: @@ -24,8 +24,8 @@ spec: app.kubernetes.io/name: coherence-operator app: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.3.6" - version: "3.3.6" + app.kubernetes.io/version: "3.4.0" + version: "3.4.0" app.kubernetes.io/component: manager app.kubernetes.io/part-of: coherence-operator spec: @@ -107,7 +107,7 @@ spec: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.3.6" + app.kubernetes.io/version: "3.4.0" weight: 50 - podAffinityTerm: topologyKey: "oci.oraclecloud.com/fault-domain" @@ -116,7 +116,7 @@ spec: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.3.6" + app.kubernetes.io/version: "3.4.0" weight: 10 - podAffinityTerm: topologyKey: "kubernetes.io/hostname" @@ -125,5 +125,5 @@ spec: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.3.6" + app.kubernetes.io/version: "3.4.0" weight: 1 diff --git a/config/manager/service.yaml b/config/manager/service.yaml index dc090e152..ba53f7e1c 100644 --- a/config/manager/service.yaml +++ b/config/manager/service.yaml @@ -7,7 +7,7 @@ metadata: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-webhook - app.kubernetes.io/version: "3.3.6" + app.kubernetes.io/version: "3.4.0" app.kubernetes.io/component: webhook app.kubernetes.io/part-of: coherence-operator spec: @@ -18,7 +18,7 @@ spec: selector: app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.3.6" + app.kubernetes.io/version: "3.4.0" app.kubernetes.io/component: manager --- apiVersion: v1 @@ -30,7 +30,7 @@ metadata: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-rest - app.kubernetes.io/version: "3.3.6" + app.kubernetes.io/version: "3.4.0" app.kubernetes.io/component: rest app.kubernetes.io/part-of: coherence-operator spec: @@ -41,5 +41,5 @@ spec: selector: app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.3.6" + app.kubernetes.io/version: "3.4.0" app.kubernetes.io/component: manager diff --git a/config/manifests/bases/coherence-operator.clusterserviceversion.yaml b/config/manifests/bases/coherence-operator.clusterserviceversion.yaml index 74fa02bc2..4f5db5286 100644 --- a/config/manifests/bases/coherence-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/coherence-operator.clusterserviceversion.yaml @@ -11,12 +11,12 @@ metadata: description: >- Coherence Operator implements features to assist with deploying and managing Coherence clusters in a Kubernetes environment. - containerImage: 'ghcr.io/oracle/coherence-operator:3.3.6' + containerImage: 'ghcr.io/oracle/coherence-operator:3.4.0' support: '' repository: 'https://github.com/oracle/coherence-operator' operators.operatorframework.io/builder: operator-sdk-v1.0.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v2 - name: coherence-operator.v3.3.6 + name: coherence-operator.v3.4.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -65,4 +65,4 @@ spec: provider: name: Oracle url: https://oracle.github.io/coherence-operator/docs/latest - version: 3.3.6 + version: 3.4.0 diff --git a/docs/about/03_quickstart.adoc b/docs/about/03_quickstart.adoc index 8d72b4649..7b817b793 100644 --- a/docs/about/03_quickstart.adoc +++ b/docs/about/03_quickstart.adoc @@ -21,7 +21,7 @@ If you want the default Coherence Operator installation then the simplest soluti [source,bash] ---- -kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.3.6/coherence-operator.yaml +kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.4.0/coherence-operator.yaml ---- This will create a namespace called `coherence` and install the Operator into it along with all the required `ClusterRole` and `RoleBinding` resources. The `coherence` namespace can be changed by downloading and editing the yaml file. diff --git a/docs/installation/01_installation.adoc b/docs/installation/01_installation.adoc index eb73a397e..adad23df4 100644 --- a/docs/installation/01_installation.adoc +++ b/docs/installation/01_installation.adoc @@ -149,7 +149,7 @@ If you want the default Coherence Operator installation then the simplest soluti [source,bash] ---- -kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.3.6/coherence-operator.yaml +kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.4.0/coherence-operator.yaml ---- This will create a namespace called `coherence` and install the Operator into it along with all the required `ClusterRole` and `RoleBinding` resources. The `coherence` namespace can be changed by downloading and editing the yaml file. diff --git a/docs/installation/07_webhooks.adoc b/docs/installation/07_webhooks.adoc index eb84a3ebf..081c2231d 100644 --- a/docs/installation/07_webhooks.adoc +++ b/docs/installation/07_webhooks.adoc @@ -63,7 +63,7 @@ If installing the operator using the manifest yaml file first replace the occurr For example: [source,bash] ---- -curl -L https://github.com/oracle/coherence-operator/releases/download/v3.3.6/coherence-operator.yaml \ +curl -L https://github.com/oracle/coherence-operator/releases/download/v3.4.0/coherence-operator.yaml \ -o coherence-operator.yaml sed -i s/self-signed/cert-manager/g coherence-operator.yaml kubectl apply -f coherence-operator.yaml diff --git a/docs/installation/09_RBAC.adoc b/docs/installation/09_RBAC.adoc index 6ecdb2f68..068850fdf 100644 --- a/docs/installation/09_RBAC.adoc +++ b/docs/installation/09_RBAC.adoc @@ -36,7 +36,7 @@ The two methods of installing the Operator discussed in the < - com.oracle.coherence.ce + ${coherence.legacy.groupId} coherence - ${coherence.version} + ${coherence.legacy.version} provided diff --git a/java/operator-compatibility/pom.xml b/java/operator-compatibility/pom.xml index d1f33d83a..bf564528e 100644 --- a/java/operator-compatibility/pom.xml +++ b/java/operator-compatibility/pom.xml @@ -26,9 +26,9 @@ - ${coherence.test.groupId} + ${coherence.groupId} coherence - ${coherence.test.version} + ${coherence.version} diff --git a/java/operator-test-client/pom.xml b/java/operator-test-client/pom.xml index 7c9925195..4741ee805 100644 --- a/java/operator-test-client/pom.xml +++ b/java/operator-test-client/pom.xml @@ -28,11 +28,11 @@ - com.oracle.coherence.ce + ${coherence.groupId} coherence - com.oracle.coherence.ce + ${coherence.groupId} coherence-java-client ${coherence.version} diff --git a/java/operator-test-helidon/pom.xml b/java/operator-test-helidon/pom.xml index 2fef63d53..6887cfb1c 100644 --- a/java/operator-test-helidon/pom.xml +++ b/java/operator-test-helidon/pom.xml @@ -26,19 +26,19 @@ - com.oracle.coherence.ce + ${coherence.groupId} coherence - ${coherence.version.2206} + ${coherence.version} - com.oracle.coherence.ce + ${coherence.groupId} coherence-cdi-server - ${coherence.version.2206} + ${coherence.version} - com.oracle.coherence.ce + ${coherence.groupId} coherence-management - ${coherence.version.2206} + ${coherence.version} diff --git a/java/operator-test-spring/pom.xml b/java/operator-test-spring/pom.xml index ab66c5037..5d678643d 100644 --- a/java/operator-test-spring/pom.xml +++ b/java/operator-test-spring/pom.xml @@ -28,9 +28,9 @@ - com.oracle.coherence.ce + ${coherence.groupId} coherence - ${coherence.version.2206} + ${coherence.version} org.springframework.boot diff --git a/java/operator-test/pom.xml b/java/operator-test/pom.xml index e338af6e2..27715943e 100644 --- a/java/operator-test/pom.xml +++ b/java/operator-test/pom.xml @@ -26,22 +26,43 @@ - com.oracle.coherence.ce + ${coherence.groupId} coherence + ${coherence.version} - com.oracle.coherence.ce + ${coherence.groupId} coherence-grpc-proxy + ${coherence.version} - com.oracle.coherence.ce + ${coherence.groupId} coherence-management ${coherence.version} - com.oracle.coherence.ce + ${coherence.groupId} coherence-metrics ${coherence.version} + + + + + com.google.cloud.tools + jib-maven-plugin + ${version.plugin.jib} + + + docker://${coherence.test.base.image} + + + com.tangosol.net.Coherence + OCI + + + + + diff --git a/java/pom.xml b/java/pom.xml index 69669ae90..4842efa51 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -29,7 +29,7 @@ - 3.3.6 + 3.4.0 ${project.version} 17 @@ -39,15 +39,14 @@ ${build.java.version} - 21.12.4 - 22.06.7 - - com.oracle.coherence.ce - ${coherence.version} + com.oracle.coherence.ce + 21.12.5 + + 22.06.8 + com.oracle.coherence.ce gcr.io/distroless/java11-debian11 - ghcr.io/oracle/coherence-ce:${coherence.version} - + ghcr.io/oracle/coherence-ce:${coherence.version} ghcr.io/oracle/${project.artifactId}:${project.version} @@ -82,7 +81,7 @@ 3.0.0 2.0.0-M3 3.1.1 - 3.4.2 + 3.4.3 3.1.1 3.7.0 3.2.0 @@ -102,32 +101,32 @@ - com.oracle.coherence.ce + ${coherence.groupId} coherence ${coherence.version} - com.oracle.coherence.ce + ${coherence.groupId} coherence-management ${coherence.version} - com.oracle.coherence.ce + ${coherence.groupId} coherence-metrics ${coherence.version} - com.oracle.coherence.ce + ${coherence.groupId} coherence-cdi-server ${coherence.version} - com.oracle.coherence.ce + ${coherence.groupId} coherence-java-client ${coherence.version} - com.oracle.coherence.ce + ${coherence.groupId} coherence-grpc-proxy ${coherence.version} From 12f1f6e42e5a699b91f1637645142ad71aa0446a Mon Sep 17 00:00:00 2001 From: Jonathan Knight Date: Wed, 26 Jun 2024 16:29:42 +0300 Subject: [PATCH 02/14] Add k8s 1.30 to test matrix --- .github/workflows/k8s-matrix.yaml | 25 ++++++++++--------------- .github/workflows/minikube-matrix.yaml | 1 + 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/.github/workflows/k8s-matrix.yaml b/.github/workflows/k8s-matrix.yaml index 89e9a0f60..c87e619a8 100644 --- a/.github/workflows/k8s-matrix.yaml +++ b/.github/workflows/k8s-matrix.yaml @@ -40,40 +40,35 @@ jobs: fail-fast: false matrix: matrixName: + - v1.30 - v1.29 - v1.28 - v1.27 - v1.26 - v1.25 - - v1.24 - - v1.23 include: + - matrixName: v1.30 + k8s: kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e + kindCommand: kind-calico + runNetTests: true - matrixName: v1.29 - k8s: kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245 + k8s: kindest/node:v1.29.4@sha256:3abb816a5b1061fb15c6e9e60856ec40d56b7b52bcea5f5f1350bc6e2320b6f8 kindCommand: kind-calico runNetTests: true - matrixName: v1.28 - k8s: kindest/node:v1.28.7@sha256:9bc6c451a289cf96ad0bbaf33d416901de6fd632415b076ab05f5fa7e4f65c58 + k8s: kindest/node:v1.28.9@sha256:dca54bc6a6079dd34699d53d7d4ffa2e853e46a20cd12d619a09207e35300bd0 kindCommand: kind-calico runNetTests: true - matrixName: v1.27 - k8s: kindest/node:v1.27.11@sha256:681253009e68069b8e01aad36a1e0fa8cf18bb0ab3e5c4069b2e65cafdd70843 + k8s: kindest/node:v1.27.13@sha256:17439fa5b32290e3ead39ead1250dca1d822d94a10d26f1981756cd51b24b9d8 kindCommand: kind-calico runNetTests: true - matrixName: v1.26 - k8s: kindest/node:v1.26.14@sha256:5d548739ddef37b9318c70cb977f57bf3e5015e4552be4e27e57280a8cbb8e4f + k8s: kindest/node:v1.26.15@sha256:84333e26cae1d70361bb7339efb568df1871419f2019c80f9a12b7e2d485fe19 kindCommand: kind-calico runNetTests: true - matrixName: v1.25 - k8s: kindest/node:v1.25.16@sha256:e8b50f8e06b44bb65a93678a65a26248fae585b3d3c2a669e5ca6c90c69dc519 - kindCommand: kind-calico - runNetTests: true - - matrixName: v1.24 - k8s: kindest/node:v1.24.17@sha256:bad10f9b98d54586cba05a7eaa1b61c6b90bfc4ee174fdc43a7b75ca75c95e51 - kindCommand: kind-calico - runNetTests: true - - matrixName: v1.23 - k8s: kindest/node:v1.23.17@sha256:14d0a9a892b943866d7e6be119a06871291c517d279aedb816a4b4bc0ec0a5b3 + k8s: kindest/node:v1.25.16@sha256:5da57dfc290ac3599e775e63b8b6c49c0c85d3fec771cd7d55b45fae14b38d3b kindCommand: kind-calico runNetTests: true diff --git a/.github/workflows/minikube-matrix.yaml b/.github/workflows/minikube-matrix.yaml index 488887dd1..a69d38faf 100644 --- a/.github/workflows/minikube-matrix.yaml +++ b/.github/workflows/minikube-matrix.yaml @@ -40,6 +40,7 @@ jobs: fail-fast: false matrix: matrixName: + - v1.29 - v1.28 - v1.27 - v1.26 From afc2c37830ee9d2b8086e1abe499a02ef101058b Mon Sep 17 00:00:00 2001 From: Jonathan Knight Date: Wed, 26 Jun 2024 17:39:14 +0300 Subject: [PATCH 03/14] Update controller-gen and Kubstomize versions --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b2364a6f6..3a3174615 100644 --- a/Makefile +++ b/Makefile @@ -1844,14 +1844,14 @@ 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.10.0 + test -s $(TOOLS_BIN)/controller-gen || GOBIN=$(TOOLS_BIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.15.0 ls -al $(TOOLS_BIN) # ---------------------------------------------------------------------------------------------------------------------- # find or download kustomize # ---------------------------------------------------------------------------------------------------------------------- KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" -KUSTOMIZE_VERSION ?= v3.8.7 +KUSTOMIZE_VERSION ?= v5.4.2 .PHONY: kustomize KUSTOMIZE = $(TOOLS_BIN)/kustomize From 344879a55db9c828cebbdc1038a1d3445012db41 Mon Sep 17 00:00:00 2001 From: Jonathan Knight Date: Wed, 26 Jun 2024 17:40:10 +0300 Subject: [PATCH 04/14] Update controller-gen and Kustomize versions --- api/v1/zz_generated.deepcopy.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go index 0ab6f2f35..99a3e5e27 100644 --- a/api/v1/zz_generated.deepcopy.go +++ b/api/v1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* * Copyright (c) 2022, Oracle and/or its affiliates. @@ -1880,7 +1879,8 @@ func (in *ServiceMonitorSpec) DeepCopyInto(out *ServiceMonitorSpec) { if val == nil { (*out)[key] = nil } else { - in, out := &val, &outVal + inVal := (*in)[key] + in, out := &inVal, &outVal *out = make([]string, len(*in)) copy(*out, *in) } From 6f6a213cf9e2f26b39e85b953998130c761f8394 Mon Sep 17 00:00:00 2001 From: Jonathan Knight Date: Wed, 26 Jun 2024 17:54:36 +0300 Subject: [PATCH 05/14] Update deprecated GitHub action versions --- .github/workflows/build.yaml | 8 ++++---- .github/workflows/coherence-matrix.yaml | 2 +- .github/workflows/compatibility-tests.yaml | 2 +- .github/workflows/istio-tests.yaml | 2 +- .github/workflows/k8s-matrix.yaml | 2 +- .github/workflows/minikube-matrix.yaml | 2 +- .github/workflows/prometheus-tests.yaml | 2 +- .github/workflows/tanzu-tests.yaml | 4 ++-- java/coherence-operator/pom.xml | 2 +- java/operator-compatibility/pom.xml | 2 +- java/operator-test-client/pom.xml | 2 +- java/operator-test/pom.xml | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8be9221d2..93ebdf6f2 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -146,27 +146,27 @@ jobs: make e2e-helm-test - name: Upload Manifests - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 if: success() with: name: coherence-operator-manifests.tar.gz path: build/_output/coherence-operator-manifests.tar.gz - name: Upload Yaml - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 if: success() with: name: coherence-operator.yaml path: build/_output/coherence-operator.yaml - name: Upload CRD - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 if: success() with: name: coherence.oracle.com_coherence.yaml path: build/_output/manifests/crd/coherence.oracle.com_coherence.yaml - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: test-output diff --git a/.github/workflows/coherence-matrix.yaml b/.github/workflows/coherence-matrix.yaml index d35102ec2..fc6caffa8 100644 --- a/.github/workflows/coherence-matrix.yaml +++ b/.github/workflows/coherence-matrix.yaml @@ -212,7 +212,7 @@ jobs: export TEST_LOGS_DIR=build/_output/test-logs/${{ matrix.matrixName }} make coherence-compatibility-test - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: test-output-${{ matrix.matrixName }} diff --git a/.github/workflows/compatibility-tests.yaml b/.github/workflows/compatibility-tests.yaml index b6872cbe1..4ca14b088 100644 --- a/.github/workflows/compatibility-tests.yaml +++ b/.github/workflows/compatibility-tests.yaml @@ -192,7 +192,7 @@ jobs: export COMPATIBLE_SELECTOR=${{ matrix.compatibilitySelector }} make compatibility-test - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: test-output-${{ matrix.compatibilityVersion }} diff --git a/.github/workflows/istio-tests.yaml b/.github/workflows/istio-tests.yaml index df9f9d7bd..3958a3907 100644 --- a/.github/workflows/istio-tests.yaml +++ b/.github/workflows/istio-tests.yaml @@ -138,7 +138,7 @@ jobs: make undeploy ISTIO_VERSION=${{ matrix.istioVersion }} make uninstall-istio - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: test-output-${{ matrix.istioVersion }} diff --git a/.github/workflows/k8s-matrix.yaml b/.github/workflows/k8s-matrix.yaml index c87e619a8..71c31033a 100644 --- a/.github/workflows/k8s-matrix.yaml +++ b/.github/workflows/k8s-matrix.yaml @@ -155,7 +155,7 @@ jobs: export RUN_NET_TEST=${{ matrix.runNetTests }} ./hack/k8s-certification.sh - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: test-output-${{ matrix.matrixName }} diff --git a/.github/workflows/minikube-matrix.yaml b/.github/workflows/minikube-matrix.yaml index a69d38faf..e1011589d 100644 --- a/.github/workflows/minikube-matrix.yaml +++ b/.github/workflows/minikube-matrix.yaml @@ -140,7 +140,7 @@ jobs: docker pull gcr.io/distroless/java17-debian11 ./hack/k8s-certification.sh - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: test-output-${{ matrix.matrixName }} diff --git a/.github/workflows/prometheus-tests.yaml b/.github/workflows/prometheus-tests.yaml index ddafdfbd8..980126d75 100644 --- a/.github/workflows/prometheus-tests.yaml +++ b/.github/workflows/prometheus-tests.yaml @@ -120,7 +120,7 @@ jobs: make kind-load make e2e-prometheus-test - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: test-output diff --git a/.github/workflows/tanzu-tests.yaml b/.github/workflows/tanzu-tests.yaml index 4306e475d..dd488b25e 100644 --- a/.github/workflows/tanzu-tests.yaml +++ b/.github/workflows/tanzu-tests.yaml @@ -139,13 +139,13 @@ jobs: make kind-load make run-certification OPERATOR_NAMESPACE=coherence - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: tanzu-artifacts path: build/_output/tanzu - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: test-output diff --git a/java/coherence-operator/pom.xml b/java/coherence-operator/pom.xml index 9038d6ec6..49d077ef6 100644 --- a/java/coherence-operator/pom.xml +++ b/java/coherence-operator/pom.xml @@ -2,7 +2,7 @@ diff --git a/java/operator-test/pom.xml b/java/operator-test/pom.xml index 27715943e..1084f98d9 100644 --- a/java/operator-test/pom.xml +++ b/java/operator-test/pom.xml @@ -1,7 +1,7 @@