From 906797b3c5d871b456dacb612587a0b74ab334d3 Mon Sep 17 00:00:00 2001 From: Jonathan Knight Date: Tue, 14 Jan 2025 17:12:54 +0300 Subject: [PATCH 1/2] Bump version to 3.4.2 --- Dockerfile | 4 +- Makefile | 59 +++++++++++-------- config/crd/kustomization.yaml | 2 +- config/manager/kustomization.yaml | 2 +- config/manager/manager.yaml | 16 ++--- 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/metrics/020_metrics.adoc | 2 +- docs/networking/020_dual_stack.adoc | 4 +- docs/other/041_global_labels.adoc | 2 +- examples/015_simple_image/README.adoc | 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 +- hack/next-version.sh | 7 +++ .../templates/deployment.yaml | 2 +- java/pom.xml | 2 +- 28 files changed, 86 insertions(+), 68 deletions(-) create mode 100644 hack/next-version.sh diff --git a/Dockerfile b/Dockerfile index e0e2ab10e..d2765f72f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,11 +13,13 @@ ARG operator_image LABEL "com.oracle.coherence.application"="operator" LABEL "com.oracle.coherence.version"="$version" +LABEL "org.opencontainers.image.description"="The Oracle Coherece Kubernetes Operator image ($target)" +LABEL "org.opencontainers.image.source"="https://github.com/oracle/coherence-operator" ENV COHERENCE_IMAGE=$coherence_image \ OPERATOR_IMAGE=$operator_image -COPY bin/linux/$target/* /files/ +COPY bin/linux/$target/* /files/ COPY java/coherence-operator/target/docker/lib/*.jar /files/lib/ COPY java/coherence-operator/target/docker/logging/logging.properties /files/logging/logging.properties diff --git a/Makefile b/Makefile index acd87aa35..3667b2892 100644 --- a/Makefile +++ b/Makefile @@ -15,17 +15,18 @@ # ====================================================================================================================== # The version of the Operator being build - this should be a valid SemVer format -VERSION ?= 3.4.1 +VERSION ?= 3.4.2 MVN_VERSION ?= $(VERSION) # The version number to be replaced by this release -PREV_VERSION ?= 3.4.0 +PREV_VERSION ?= 3.4.1 +NEXT_VERSION := $(shell sh ./hack/next-version.sh "$(VERSION)") # 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.4.0 +COMPATIBLE_VERSION ?= 3.4.1 # The selector to use to find Operator Pods of the COMPATIBLE_VERSION (do not put in double quotes!!) COMPATIBLE_SELECTOR ?= control-plane=coherence @@ -61,7 +62,7 @@ TEST_COHERENCE_GID ?= com.oracle.coherence.ce # The current working directory CURRDIR := $(shell pwd) -GH_TOKEN ?= +GH_TOKEN ?= ifeq ("$(GH_TOKEN)", "") GH_AUTH := 'Foo: Bar' else @@ -364,7 +365,7 @@ ISTIO_VERSION ?= # ---------------------------------------------------------------------------------------------------------------------- # The version of Tanzu to install, leave empty for the latest TANZU_VERSION ?= -TANZU = +TANZU = # ====================================================================================================================== # Makefile targets start here @@ -420,11 +421,15 @@ $(BUILD_PROPS): # Clean-up all of the build artifacts # ---------------------------------------------------------------------------------------------------------------------- .PHONY: clean -clean: ## Cleans the build +clean: ## Cleans the build -rm -rf $(BUILD_OUTPUT) || true -rm -rf $(BUILD_BIN) || true -rm -rf bundle || true + rm config/crd/bases/*.yaml || true + rm -rf config/crd-small || true rm pkg/data/zz_generated_*.go || true + rm pkg/data/assets/*.yaml || true + rm pkg/data/assets/*.json || true ./mvnw -f java clean $(MAVEN_BUILD_OPTS) ./mvnw -f examples clean $(MAVEN_BUILD_OPTS) @@ -2074,7 +2079,7 @@ ifeq ($(OPERATOR_RELEASE_IMAGE), $(OPERATOR_IMAGE)) --amend $(OPERATOR_IMAGE)-amd64 \ --amend $(OPERATOR_IMAGE)-arm64 docker manifest annotate $(OPERATOR_IMAGE) $(OPERATOR_IMAGE)-arm64 --arch arm64 - docker manifest push $(OPERATOR_IMAGE) + docker manifest push $(OPERATOR_IMAGE) else @echo "Tagging $(OPERATOR_IMAGE)-amd64 as $(OPERATOR_RELEASE_IMAGE)-amd64" docker tag $(OPERATOR_IMAGE)-amd64 $(OPERATOR_RELEASE_IMAGE)-amd64 @@ -2354,6 +2359,10 @@ serve-docs: cd $(BUILD_OUTPUT)/docs; \ python -m SimpleHTTPServer 8080 +# ====================================================================================================================== +# Release targets +# ====================================================================================================================== +##@ Release Targets # ---------------------------------------------------------------------------------------------------------------------- # Pre-Release Tasks @@ -2373,23 +2382,6 @@ pre-release: .PHONY: post-release post-release: check-new-version new-version -.PHONY: check-new-version -check-new-version: -ifeq (, $(NEW_VERSION)) - @echo "You must specify the NEW_VERSION parameter" - exit 1 -else - @echo "Updating version from $(VERSION) to $(NEW_VERSION)" -endif - -.PHONY: new-version -new-version: - $(SED) 's/$(subst .,\.,$(PREV_VERSION))/$(VERSION)/g' MAKEFILE - $(SED) 's/$(subst .,\.,$(VERSION))/$(NEW_VERSION)/g' MAKEFILE - find config \( -name '*.yaml' -o -name '*.json' \) -exec $(SED) 's/$(subst .,\.,$(VERSION))/$(NEW_VERSION)/g' {} + - find java \( -name 'pom.xml' \) -exec $(SED) 's/$(subst .,\.,$(VERSION))<\/version>/$(NEW_VERSION)<\/version>/g' {} + - - # ---------------------------------------------------------------------------------------------------------------------- # Release the Coherence Operator dashboards # ---------------------------------------------------------------------------------------------------------------------- @@ -2498,7 +2490,7 @@ push-snapshot-docs: $(BUILD_TARGETS)/generate $(BUILD_TARGETS)/manifests docs # Release the Coherence Operator. # ---------------------------------------------------------------------------------------------------------------------- .PHONY: release -release: +release: ## Release the Operator ifeq (true, $(RELEASE_DRY_RUN)) release: build-all-images release-ghpages @echo "release dry-run: would have pushed images" @@ -2506,6 +2498,23 @@ else release: build-all-images push-release-images release-ghpages endif +# ---------------------------------------------------------------------------------------------------------------------- +# Update the Operator version and all references to the previous version +# This must be run with NEXT_VERSION=x.y.z specified (where x.y.z is the new version number) +# E.G: +# make new-version NEXT_VERSION=3.4.99 +# ---------------------------------------------------------------------------------------------------------------------- +.PHONY: new-version +new-version: ## Update the Operator Version (must be run with NEXT_VERSION=x.y.z specified) + $(SED) 's/$(subst .,\.,$(VERSION))/$(NEXT_VERSION)/g' MAKEFILE + $(SED) 's/$(subst .,\.,$(PREV_VERSION))/$(VERSION)/g' MAKEFILE + find docs \( -name '*.adoc' -o -name '*.yaml' \) -exec $(SED) 's/$(subst .,\.,$(VERSION))/$(NEXT_VERSION)/g' {} + + find examples \( -name 'pom.xml' \) -exec $(SED) 's/$(subst .,\.,$(VERSION))<\/version>/$(NEXT_VERSION)<\/version>/g' {} + + find examples \( -name '*.adoc' -o -name 'Dockerfile' \) -exec $(SED) 's/$(subst .,\.,$(VERSION))/$(NEXT_VERSION)/g' {} + + find examples \( -name '*.yaml' -o -name '*.json' \) -exec $(SED) 's/$(subst .,\.,$(VERSION))/$(NEXT_VERSION)/g' {} + + find config \( -name '*.yaml' -o -name '*.json' \) -exec $(SED) 's/$(subst .,\.,$(VERSION))/$(NEXT_VERSION)/g' {} + + find helm-charts \( -name '*.yaml' -o -name '*.json' \) -exec $(SED) 's/$(subst .,\.,$(VERSION))/$(NEXT_VERSION)/g' {} + + $(SED) -e 's/$(subst .,\.,$(VERSION))<\/revision>/$(NEXT_VERSION)<\/revision>/g' java/pom.xml # ---------------------------------------------------------------------------------------------------------------------- # Create the third-party license file diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index af9a2ef72..bd4b57bcf 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.4.1 + app.kubernetes.io/version: 3.4.2 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index ac33ad513..74fc18407 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.4.1 + newTag: 3.4.2 diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index e66251380..a166252c3 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.4.1" - version: "3.4.1" + app.kubernetes.io/version: "3.4.2" + version: "3.4.2" 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.4.1" - version: "3.4.1" + app.kubernetes.io/version: "3.4.2" + version: "3.4.2" app.kubernetes.io/component: manager app.kubernetes.io/part-of: coherence-operator spec: @@ -106,7 +106,7 @@ spec: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.4.1" + app.kubernetes.io/version: "3.4.2" affinity: podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: @@ -117,7 +117,7 @@ spec: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.4.1" + app.kubernetes.io/version: "3.4.2" weight: 50 - podAffinityTerm: topologyKey: "oci.oraclecloud.com/fault-domain" @@ -126,7 +126,7 @@ spec: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.4.1" + app.kubernetes.io/version: "3.4.2" weight: 10 - podAffinityTerm: topologyKey: "kubernetes.io/hostname" @@ -135,5 +135,5 @@ spec: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.4.1" + app.kubernetes.io/version: "3.4.2" weight: 1 diff --git a/config/manager/service.yaml b/config/manager/service.yaml index 642225c56..3635c946f 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.4.1" + app.kubernetes.io/version: "3.4.2" 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.4.1" + app.kubernetes.io/version: "3.4.2" 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.4.1" + app.kubernetes.io/version: "3.4.2" 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.4.1" + app.kubernetes.io/version: "3.4.2" app.kubernetes.io/component: manager diff --git a/config/manifests/bases/coherence-operator.clusterserviceversion.yaml b/config/manifests/bases/coherence-operator.clusterserviceversion.yaml index 85eb4f127..f73d27dc8 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.4.1' + containerImage: 'ghcr.io/oracle/coherence-operator:3.4.2' 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.4.1 + name: coherence-operator.v3.4.2 namespace: placeholder spec: apiservicedefinitions: {} @@ -65,4 +65,4 @@ spec: provider: name: Oracle url: https://oracle.github.io/coherence-operator/docs/latest - version: 3.4.1 + version: 3.4.2 diff --git a/docs/about/03_quickstart.adoc b/docs/about/03_quickstart.adoc index 0af74c3a3..0c626a1a4 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.4.1/coherence-operator.yaml +kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.4.2/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 a314c3f06..0a3bcfc47 100644 --- a/docs/installation/01_installation.adoc +++ b/docs/installation/01_installation.adoc @@ -150,7 +150,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.4.1/coherence-operator.yaml +kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.4.2/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 d2ccdf07c..f53291921 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.4.1/coherence-operator.yaml \ +curl -L https://github.com/oracle/coherence-operator/releases/download/v3.4.2/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 55a010fe7..56e2b7eb0 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.google.cloud.tools jib-maven-plugin - 3.4.1 + 3.4.2 diff --git a/examples/095_network_policies/manifests/net-test-client.yaml b/examples/095_network_policies/manifests/net-test-client.yaml index b2028e488..afa6cf94e 100644 --- a/examples/095_network_policies/manifests/net-test-client.yaml +++ b/examples/095_network_policies/manifests/net-test-client.yaml @@ -14,7 +14,7 @@ spec: spec: containers: - name: net-test - image: ghcr.io/oracle/coherence-operator:3.4.1 + image: ghcr.io/oracle/coherence-operator:3.4.2 env: - name: HOST value: net-test-coherence-server.coh-test.svc diff --git a/examples/095_network_policies/manifests/net-test-coherence-server.yaml b/examples/095_network_policies/manifests/net-test-coherence-server.yaml index be4668f08..78f537239 100644 --- a/examples/095_network_policies/manifests/net-test-coherence-server.yaml +++ b/examples/095_network_policies/manifests/net-test-coherence-server.yaml @@ -43,7 +43,7 @@ metadata: spec: containers: - name: net-test - image: ghcr.io/oracle/coherence-operator:3.4.1 + image: ghcr.io/oracle/coherence-operator:3.4.2 ports: - containerPort: 9612 name: metrics diff --git a/examples/095_network_policies/manifests/net-test-coherence.yaml b/examples/095_network_policies/manifests/net-test-coherence.yaml index d7973fa04..1e14c69df 100644 --- a/examples/095_network_policies/manifests/net-test-coherence.yaml +++ b/examples/095_network_policies/manifests/net-test-coherence.yaml @@ -20,7 +20,7 @@ spec: spec: containers: - name: net-test - image: ghcr.io/oracle/coherence-operator:3.4.1 + image: ghcr.io/oracle/coherence-operator:3.4.2 env: - name: CLUSTER_HOST value: net-test-coherence-server.coh-test.svc diff --git a/examples/095_network_policies/manifests/net-test-operator-server.yaml b/examples/095_network_policies/manifests/net-test-operator-server.yaml index f062b6869..d216a0e53 100644 --- a/examples/095_network_policies/manifests/net-test-operator-server.yaml +++ b/examples/095_network_policies/manifests/net-test-operator-server.yaml @@ -6,7 +6,7 @@ spec: selector: app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.4.1" + app.kubernetes.io/version: "3.4.2" app.kubernetes.io/component: manager app.kubernetes.io/part-of: coherence-operator coherenceNetTest: server @@ -27,14 +27,14 @@ metadata: labels: app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.4.1" + app.kubernetes.io/version: "3.4.2" app.kubernetes.io/component: manager app.kubernetes.io/part-of: coherence-operator coherenceNetTest: server spec: containers: - name: net-test - image: ghcr.io/oracle/coherence-operator:3.4.1 + image: ghcr.io/oracle/coherence-operator:3.4.2 ports: - containerPort: 8000 name: operator diff --git a/examples/095_network_policies/manifests/net-test-operator.yaml b/examples/095_network_policies/manifests/net-test-operator.yaml index 07faf4082..9d380b452 100644 --- a/examples/095_network_policies/manifests/net-test-operator.yaml +++ b/examples/095_network_policies/manifests/net-test-operator.yaml @@ -5,7 +5,7 @@ metadata: labels: app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.4.1" + app.kubernetes.io/version: "3.4.2" app.kubernetes.io/component: manager app.kubernetes.io/part-of: coherence-operator coherenceNetTest: operator-client @@ -15,14 +15,14 @@ spec: labels: app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.4.1" + app.kubernetes.io/version: "3.4.2" app.kubernetes.io/component: manager app.kubernetes.io/part-of: coherence-operator coherenceNetTest: operator-client spec: containers: - name: net-test - image: ghcr.io/oracle/coherence-operator:3.4.1 + image: ghcr.io/oracle/coherence-operator:3.4.2 env: - name: CLUSTER_HOST value: net-test-coherence-server.coh-test.svc diff --git a/examples/095_network_policies/manifests/net-test-webhook.yaml b/examples/095_network_policies/manifests/net-test-webhook.yaml index a51820572..b8ce77c2d 100644 --- a/examples/095_network_policies/manifests/net-test-webhook.yaml +++ b/examples/095_network_policies/manifests/net-test-webhook.yaml @@ -12,7 +12,7 @@ spec: spec: containers: - name: net-test - image: ghcr.io/oracle/coherence-operator:3.4.1 + image: ghcr.io/oracle/coherence-operator:3.4.2 env: - name: OPERATOR_HOST value: net-test-operator-server.coherence.svc diff --git a/examples/300_helm/chart/values.yaml b/examples/300_helm/chart/values.yaml index 4c5b2deb0..e94799cb7 100644 --- a/examples/300_helm/chart/values.yaml +++ b/examples/300_helm/chart/values.yaml @@ -5,7 +5,7 @@ operator: namespace: coherence service: coherence-operator-rest port: 8000 - image: ghcr.io/oracle/coherence-operator-utils:3.4.1 + image: ghcr.io/oracle/coherence-operator-utils:3.4.2 condition: Ready timeout: 5m interval: 10s diff --git a/examples/400_Istio/README.adoc b/examples/400_Istio/README.adoc index 0533b1679..a4a14cc08 100644 --- a/examples/400_Istio/README.adoc +++ b/examples/400_Istio/README.adoc @@ -10,7 +10,7 @@ == Using Coherence with Istio You can run the Coherence cluster and manage them using the Coherence Operator alongside https://istio.io[Istio]. -Coherence clusters managed with the Coherence Operator 3.4.1 and later work with Istio 1.9.1 and later out of the box. +Coherence clusters managed with the Coherence Operator 3.4.2 and later work with Istio 1.9.1 and later out of the box. Coherence caches can be accessed from outside the Coherence cluster via Coherence*Extend, REST, and other supported Coherence clients. Using Coherence clusters with Istio does not require the Coherence Operator to also be using Istio (and vice-versa) . diff --git a/examples/no-operator/04_istio/Dockerfile b/examples/no-operator/04_istio/Dockerfile index b12ef8bee..02aa695e6 100644 --- a/examples/no-operator/04_istio/Dockerfile +++ b/examples/no-operator/04_istio/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/oracle/coherence-operator:3.4.1 AS Builder +FROM ghcr.io/oracle/coherence-operator:3.4.2 AS Builder FROM ghcr.io/oracle/coherence-ce:22.06.10 COPY --from=Builder /files /files diff --git a/examples/no-operator/04_istio/README.adoc b/examples/no-operator/04_istio/README.adoc index f36e007b3..c0a4f899b 100644 --- a/examples/no-operator/04_istio/README.adoc +++ b/examples/no-operator/04_istio/README.adoc @@ -474,7 +474,7 @@ Various utilities are copied from the Operator image into the base. [source] .Dockerfile ---- -FROM ghcr.io/oracle/coherence-operator:3.4.1 AS Builder +FROM ghcr.io/oracle/coherence-operator:3.4.2 AS Builder FROM ghcr.io/oracle/coherence-ce:22.06.7 COPY --from=Builder /files /files diff --git a/hack/next-version.sh b/hack/next-version.sh new file mode 100644 index 000000000..3cfdb03f6 --- /dev/null +++ b/hack/next-version.sh @@ -0,0 +1,7 @@ +# +# Copyright (c) 2020, 2025, Oracle and/or its affiliates. +# Licensed under the Universal Permissive License v 1.0 as shown at +# http://oss.oracle.com/licenses/upl. +# + +echo $1 | awk -F. '{OFS="."; $NF+=1; print $0}' \ No newline at end of file diff --git a/helm-charts/coherence-operator/templates/deployment.yaml b/helm-charts/coherence-operator/templates/deployment.yaml index 64a692ea4..e471ee6e3 100644 --- a/helm-charts/coherence-operator/templates/deployment.yaml +++ b/helm-charts/coherence-operator/templates/deployment.yaml @@ -287,7 +287,7 @@ spec: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.4.1" + app.kubernetes.io/version: "3.4.2" {{- end }} {{- if .Values.affinity }} affinity: diff --git a/java/pom.xml b/java/pom.xml index 6099e73c6..e6452506f 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -29,7 +29,7 @@ - 3.4.1 + 3.4.2 ${project.version} 17 From 0d516a77def5ab809498f5a7a5698bc1a4f0b83a Mon Sep 17 00:00:00 2001 From: Jonathan Knight Date: Tue, 14 Jan 2025 18:59:53 +0300 Subject: [PATCH 2/2] Add new version PR to Makefile --- Makefile | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3667b2892..af51df06b 100644 --- a/Makefile +++ b/Makefile @@ -2500,9 +2500,6 @@ endif # ---------------------------------------------------------------------------------------------------------------------- # Update the Operator version and all references to the previous version -# This must be run with NEXT_VERSION=x.y.z specified (where x.y.z is the new version number) -# E.G: -# make new-version NEXT_VERSION=3.4.99 # ---------------------------------------------------------------------------------------------------------------------- .PHONY: new-version new-version: ## Update the Operator Version (must be run with NEXT_VERSION=x.y.z specified) @@ -2516,6 +2513,28 @@ new-version: ## Update the Operator Version (must be run with NEXT_VERSION=x.y.z find helm-charts \( -name '*.yaml' -o -name '*.json' \) -exec $(SED) 's/$(subst .,\.,$(VERSION))/$(NEXT_VERSION)/g' {} + $(SED) -e 's/$(subst .,\.,$(VERSION))<\/revision>/$(NEXT_VERSION)<\/revision>/g' java/pom.xml +GIT_BRANCH="version-update-$(VERSION)" +GIT_LABEL="version-update" + +.PHONY: new-version-pr +new-version-pr: ## Create a PR to update the version + git config user.email "action@github.com" + git config user.name "GitHub Action" + git checkout -b $(GIT_BRANCH) + git commit -am "Version update to $(VERSION)" + git push --set-upstream origin $(GIT_BRANCH) + + gh label create "$(GIT_LABEL)" \ + --description "Pull requests with version update" \ + --force \ + || true + + gh pr create \ + --title "Version update to $(VERSION)" \ + --body "Current pull request contains version update to version $(VERSION)" \ + --label "$(GIT_LABEL)" \ + --head $(GIT_BRANCH) + # ---------------------------------------------------------------------------------------------------------------------- # Create the third-party license file # ----------------------------------------------------------------------------------------------------------------------