diff --git a/Makefile b/Makefile
index dad66286e..e8c63ac02 100644
--- a/Makefile
+++ b/Makefile
@@ -35,6 +35,20 @@ PROJECT_URL = https://github.com/oracle/coherence-operator
KUBERNETES_DOC_VERSION=v1.30
+# ----------------------------------------------------------------------------------------------------------------------
+# Operator image names
+# ----------------------------------------------------------------------------------------------------------------------
+ORACLE_REGISTRY := container-registry.oracle.com/middleware
+GITHUB_REGISTRY := ghcr.io/oracle
+OPERATOR_IMAGE_NAME := coherence-operator
+OPERATOR_IMAGE_REGISTRY ?= $(ORACLE_REGISTRY)
+OPERATOR_IMAGE_ARM := $(OPERATOR_IMAGE_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(VERSION)-arm64
+OPERATOR_IMAGE_AMD := $(OPERATOR_IMAGE_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(VERSION)-amd64
+OPERATOR_IMAGE := $(OPERATOR_IMAGE_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(VERSION)
+OPERATOR_IMAGE_DELVE := $(OPERATOR_IMAGE_REGISTRY)/$(OPERATOR_IMAGE_NAME):delve
+OPERATOR_IMAGE_DEBUG := $(OPERATOR_IMAGE_REGISTRY)/$(OPERATOR_IMAGE_NAME):debug
+OPERATOR_BASE_IMAGE ?= scratch
+
# ----------------------------------------------------------------------------------------------------------------------
# The Coherence image to use for deployments that do not specify an image
# ----------------------------------------------------------------------------------------------------------------------
@@ -42,11 +56,13 @@ KUBERNETES_DOC_VERSION=v1.30
COHERENCE_VERSION ?= 21.12.5
COHERENCE_VERSION_LTS ?= 14.1.2-0-1
COHERENCE_CE_LATEST ?= 24.09.2
+
# The default Coherence image the Operator will run if no image is specified
-COHERENCE_IMAGE_REGISTRY ?= ghcr.io/oracle
+COHERENCE_IMAGE_REGISTRY ?= $(ORACLE_REGISTRY)
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
@@ -57,9 +73,9 @@ COHERENCE_TEST_BASE_IMAGE_21 ?= gcr.io/distroless/java21-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
# without altering the default image name.
-TEST_COHERENCE_IMAGE ?= $(COHERENCE_IMAGE)
+TEST_COHERENCE_IMAGE ?= $(COHERENCE_IMAGE)
TEST_COHERENCE_VERSION ?= $(COHERENCE_VERSION)
-TEST_COHERENCE_GID ?= com.oracle.coherence.ce
+TEST_COHERENCE_GID ?= $(COHERENCE_GROUP_ID)
# The minimum certified OpenShift version the Operator runs on
OPENSHIFT_MIN_VERSION := v4.15
@@ -110,24 +126,15 @@ MAVEN_OPTIONS ?= -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon
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_17) -Dcoherence.test.base.image.21=$(COHERENCE_TEST_BASE_IMAGE_21) -Dbuild.java.version=$(BUILD_JAVA_VERSION) $(MAVEN_OPTIONS)
# ----------------------------------------------------------------------------------------------------------------------
-# Operator image names
+# Test image names
# ----------------------------------------------------------------------------------------------------------------------
-GITHUB_REGISTRY := ghcr.io/oracle
-OPERATOR_IMAGE_REGISTRY ?= $(GITHUB_REGISTRY)
-OPERATOR_BASE_IMAGE ?= scratch
-OPERATOR_IMAGE_NAME := coherence-operator
-OPERATOR_IMAGE_ARM := $(OPERATOR_IMAGE_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(VERSION)-arm64
-OPERATOR_IMAGE_AMD := $(OPERATOR_IMAGE_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(VERSION)-amd64
-OPERATOR_IMAGE := $(OPERATOR_IMAGE_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(VERSION)
-OPERATOR_IMAGE_DELVE := $(OPERATOR_IMAGE_REGISTRY)/$(OPERATOR_IMAGE_NAME):delve
-OPERATOR_IMAGE_DEBUG := $(OPERATOR_IMAGE_REGISTRY)/$(OPERATOR_IMAGE_NAME):debug
-
-TEST_BASE_IMAGE := $(OPERATOR_IMAGE_REGISTRY)/$(OPERATOR_IMAGE_NAME)-test-base:$(VERSION)
+TEST_BASE_IMAGE := $(OPERATOR_IMAGE_REGISTRY)/$(OPERATOR_IMAGE_NAME)-test-base:$(VERSION)
# Tanzu packages
-OPERATOR_PACKAGE_PREFIX := $(OPERATOR_IMAGE_REGISTRY)/$(OPERATOR_IMAGE_NAME)-package
+TANZU_REGISTRY := $(GITHUB_REGISTRY)
+OPERATOR_PACKAGE_PREFIX := $(TANZU_REGISTRY)/$(OPERATOR_IMAGE_NAME)-package
OPERATOR_PACKAGE_IMAGE := $(OPERATOR_PACKAGE_PREFIX):$(VERSION)
-OPERATOR_REPO_PREFIX := $(OPERATOR_IMAGE_REGISTRY)/$(OPERATOR_IMAGE_NAME)-repo
+OPERATOR_REPO_PREFIX := $(TANZU_REGISTRY)/$(OPERATOR_IMAGE_NAME)-repo
OPERATOR_REPO_IMAGE := $(OPERATOR_REPO_PREFIX):$(VERSION)
# ----------------------------------------------------------------------------------------------------------------------
@@ -922,29 +929,38 @@ stop: ## kill any locally running operator process
# ----------------------------------------------------------------------------------------------------------------------
# Generate bundle manifests and metadata, then validate generated files.
# ----------------------------------------------------------------------------------------------------------------------
+BUNDLE_DIRECTORY := ./bundle
+BUNDLE_BUILD := $(BUILD_OUTPUT)/bundle
+
+.PHONY: bundle-clean
+bundle-clean:
+ rm -rf $(BUNDLE_DIRECTORY) || true
+ rm -rf $(BUNDLE_BUILD) || true
+ rm $(BUILD_OUTPUT)/coherence-operator-bundle.tar.gz
+
.PHONY: bundle
bundle: $(BUILD_PROPS) ensure-sdk $(TOOLS_BIN)/kustomize $(BUILD_TARGETS)/manifests $(MANIFEST_FILES) ## Generate OLM bundle manifests and metadata, then validate generated files.
$(OPERATOR_SDK) generate kustomize manifests
cd config/manager && $(KUSTOMIZE) edit set image controller=$(OPERATOR_IMAGE)
$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle --verbose --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS)
- @echo "" >> ./bundle/metadata/annotations.yaml
- @echo " # OpenShift annotations" >> ./bundle/metadata/annotations.yaml
- @echo " com.redhat.openshift.versions: $(OPENSHIFT_MIN_VERSION)" >> ./bundle/metadata/annotations.yaml
+ @echo "" >> $(BUNDLE_DIRECTORY)/metadata/annotations.yaml
+ @echo " # OpenShift annotations" >> $(BUNDLE_DIRECTORY)/metadata/annotations.yaml
+ @echo " com.redhat.openshift.versions: $(OPENSHIFT_MIN_VERSION)" >> $(BUNDLE_DIRECTORY)/metadata/annotations.yaml
@echo "" >> bundle.Dockerfile
@echo "# OpenShift labels" >> bundle.Dockerfile
@echo "LABEL com.redhat.openshift.versions=$(OPENSHIFT_MIN_VERSION)" >> bundle.Dockerfile
@echo "LABEL org.opencontainers.image.description=\"This is the Operator Lifecycle Manager bundle for the Coherence Kubernetes Operator\"" >> bundle.Dockerfile
@echo "cert_project_id: $(OPENSHIFT_COMPONENT_PID)" > bundle/ci.yaml
- $(OPERATOR_SDK) bundle validate ./bundle
- $(OPERATOR_SDK) bundle validate ./bundle --select-optional suite=operatorframework --optional-values=k8s-version=1.26
- $(OPERATOR_SDK) bundle validate ./bundle --select-optional name=operatorhubv2 --optional-values=k8s-version=1.26
- $(OPERATOR_SDK) bundle validate ./bundle --select-optional name=capabilities --optional-values=k8s-version=1.26
- $(OPERATOR_SDK) bundle validate ./bundle --select-optional name=categories --optional-values=k8s-version=1.26
- rm -rf $(BUILD_OUTPUT)/bundle || true
- mkdir -p $(BUILD_OUTPUT)/bundle/coherence-operator/$(VERSION) || true
- cp -R ./bundle/. $(BUILD_OUTPUT)/bundle/coherence-operator/$(VERSION)
- rm $(BUILD_OUTPUT)/bundle/coherence-operator/$(VERSION)/ci.yaml || true
- tar -C $(BUILD_OUTPUT)/bundle -czf $(BUILD_OUTPUT)/coherence-operator-bundle.tar.gz .
+ $(OPERATOR_SDK) bundle validate $(BUNDLE_DIRECTORY)
+ $(OPERATOR_SDK) bundle validate $(BUNDLE_DIRECTORY) --select-optional suite=operatorframework --optional-values=k8s-version=1.26
+ $(OPERATOR_SDK) bundle validate $(BUNDLE_DIRECTORY) --select-optional name=operatorhubv2 --optional-values=k8s-version=1.26
+ $(OPERATOR_SDK) bundle validate $(BUNDLE_DIRECTORY) --select-optional name=capabilities --optional-values=k8s-version=1.26
+ $(OPERATOR_SDK) bundle validate $(BUNDLE_DIRECTORY) --select-optional name=categories --optional-values=k8s-version=1.26
+ rm -rf $(BUNDLE_BUILD) || true
+ mkdir -p $(BUNDLE_BUILD)/coherence-operator/$(VERSION) || true
+ cp -R $(BUNDLE_DIRECTORY)/. $(BUNDLE_BUILD)/coherence-operator/$(VERSION)
+ rm $(BUNDLE_BUILD)/coherence-operator/$(VERSION)/ci.yaml || true
+ tar -C $(BUNDLE_BUILD) -czf $(BUILD_OUTPUT)/coherence-operator-bundle.tar.gz .
rm -rf bundle_tmp*
# ----------------------------------------------------------------------------------------------------------------------
@@ -998,7 +1014,7 @@ catalog-push: catalog-build ## Push a catalog image.
.PHONY: scorecard
scorecard: $(BUILD_PROPS) ensure-sdk bundle ## Run the Operator SDK scorecard tests.
- $(OPERATOR_SDK) scorecard --verbose ./bundle
+ $(OPERATOR_SDK) scorecard --verbose $(BUNDLE_DIRECTORY)
.PHONY: install-olm
install-olm: ensure-sdk ## Install the Operator Lifecycle Manage into the K8s cluster
@@ -1711,7 +1727,7 @@ ifeq (false,$(OPERATOR_HA))
cd $(BUILD_DEPLOY)/manager && $(KUSTOMIZE) edit add patch --kind Deployment --name controller-manager --path single-replica-patch.yaml
endif
kubectl -n $(OPERATOR_NAMESPACE) create secret generic coherence-webhook-server-cert || true
-ifeq ("$(OPERATOR_IMAGE_REGISTRY)","$(GITHUB_REGISTRY)")
+ifeq ("$(OPERATOR_IMAGE_REGISTRY)","$(ORACLE_REGISTRY)")
$(KUSTOMIZE) build $(BUILD_DEPLOY)/default | kubectl apply -f -
else
$(KUSTOMIZE) build $(BUILD_DEPLOY)/overlays/ci | kubectl apply -f -
@@ -1722,7 +1738,7 @@ endif
.PHONY: just-deploy
just-deploy: ensure-pull-secret ## Deploy the Coherence Operator without rebuilding anything
$(call prepare_deploy,$(OPERATOR_IMAGE),$(OPERATOR_NAMESPACE))
-ifeq ("$(OPERATOR_IMAGE_REGISTRY)","$(GITHUB_REGISTRY)")
+ifeq ("$(OPERATOR_IMAGE_REGISTRY)","$(ORACLE_REGISTRY)")
$(KUSTOMIZE) build $(BUILD_DEPLOY)/default | kubectl apply -f -
else
$(KUSTOMIZE) build $(BUILD_DEPLOY)/overlays/ci | kubectl apply -f -
@@ -2427,13 +2443,24 @@ test-examples: build-examples
# ----------------------------------------------------------------------------------------------------------------------
PUSH_ARGS ?=
+# The registry we release (push) the operator images to, which can be different to the registry
+# used to build and test the operator.
+OPERATOR_RELEASE_REGISTRY ?= $(OPERATOR_IMAGE_REGISTRY)
+OPERATOR_RELEASE_IMAGE := $(OPERATOR_RELEASE_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(VERSION)
+OPERATOR_RELEASE_ARM := $(OPERATOR_RELEASE_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(VERSION)-arm64
+OPERATOR_RELEASE_AMD := $(OPERATOR_RELEASE_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(VERSION)-amd64
+
.PHONY: push-operator-image
push-operator-image: $(BUILD_TARGETS)/build-operator
+ifneq ("$(OPERATOR_RELEASE_REGISTRY)","$(OPERATOR_IMAGE_REGISTRY)")
+ $(DOCKER_CMD) tag $(OPERATOR_IMAGE_ARM) $(OPERATOR_RELEASE_ARM)
+ $(DOCKER_CMD) tag $(OPERATOR_IMAGE_AMD) $(OPERATOR_RELEASE_AMD)
+endif
chmod +x $(CURRDIR)/hack/run-buildah.sh
- export OPERATOR_IMAGE=$(OPERATOR_IMAGE) \
- && export OPERATOR_IMAGE_AMD=$(OPERATOR_IMAGE_AMD) \
- && export OPERATOR_IMAGE_ARM=$(OPERATOR_IMAGE_ARM) \
- && export OPERATOR_IMAGE_REGISTRY=$(OPERATOR_IMAGE_REGISTRY) \
+ export OPERATOR_IMAGE=$(OPERATOR_RELEASE_IMAGE) \
+ && export OPERATOR_IMAGE_AMD=$(OPERATOR_RELEASE_AMD) \
+ && export OPERATOR_IMAGE_ARM=$(OPERATOR_RELEASE_ARM) \
+ && export OPERATOR_IMAGE_REGISTRY=$(OPERATOR_RELEASE_REGISTRY) \
&& export VERSION=$(VERSION) \
&& export REVISION=$(GITCOMMIT) \
&& export NO_DOCKER_DAEMON=$(NO_DOCKER_DAEMON) \
@@ -2538,7 +2565,7 @@ push-all-ttl-images: push-ttl-operator-images push-ttl-test-images
# Push all of the images that are released
# ----------------------------------------------------------------------------------------------------------------------
.PHONY: push-release-images
-push-release-images: push-operator-image bundle-push catalog-push tanzu-repo
+push-release-images: push-operator-image bundle-clean bundle bundle-push catalog-push tanzu-repo
# ----------------------------------------------------------------------------------------------------------------------
# Install Prometheus
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index b500f1196..978014432 100644
--- a/config/manager/kustomization.yaml
+++ b/config/manager/kustomization.yaml
@@ -8,5 +8,5 @@ resources:
images:
- name: controller
- newName: ghcr.io/oracle/coherence-operator
+ newName: container-registry.oracle.com/middleware/coherence-operator
newTag: 3.5.0
diff --git a/config/manifests/bases/coherence-operator.clusterserviceversion.yaml b/config/manifests/bases/coherence-operator.clusterserviceversion.yaml
index d834e8997..06af28594 100644
--- a/config/manifests/bases/coherence-operator.clusterserviceversion.yaml
+++ b/config/manifests/bases/coherence-operator.clusterserviceversion.yaml
@@ -8,7 +8,7 @@ metadata:
capabilities: Full Lifecycle
categories: Database
certified: "false"
- containerImage: ghcr.io/oracle/coherence-operator:3.5.0
+ containerImage: container-registry.oracle.com/middleware/coherence-operator:3.5.0
description: The Oracle Coherence Kubernetes Operator enables easy management
of Coherence clusters in a Kubernetes environment.
features.operators.openshift.io/cnf: "false"
diff --git a/debug/Dockerfile b/debug/Dockerfile
index 38b214fb3..726f19867 100644
--- a/debug/Dockerfile
+++ b/debug/Dockerfile
@@ -3,7 +3,7 @@
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
-FROM ghcr.io/oracle/coherence-operator:delve
+FROM container-registry.oracle.com/middleware/coherence-operator:delve
ARG target
ARG version
diff --git a/docs/installation/01_installation.adoc b/docs/installation/01_installation.adoc
index d47f45f7d..b55b8c5a9 100644
--- a/docs/installation/01_installation.adoc
+++ b/docs/installation/01_installation.adoc
@@ -8,7 +8,7 @@
= Coherence Operator Installation
-The Coherence Operator is available as an image from the GitHub container registry `ghcr.io/oracle/coherence-operator:{operator-version}` that can
+The Coherence Operator is available as an image from the GitHub container registry `container-registry.oracle.com/middleware/coherence-operator:{operator-version}` that can
easily be installed into a Kubernetes cluster.
== Coherence Operator Installation
@@ -315,7 +315,7 @@ helm install \
[#helm-operator-image]
=== Set the Operator Image
-The Helm chart uses a default Operator image from `ghcr.io/oracle/coherence-operator:{operator-version}`.
+The Helm chart uses a default Operator image from `container-registry.oracle.com/middleware/coherence-operator:{operator-version}`.
If the image needs to be pulled from a different location (for example an internal registry) then there are two ways to override the default.
Either set the individual `image.registry`, `image.name` and `image.tag` values, or set the whole image name by setting the `image` value.
@@ -897,8 +897,8 @@ using a standalone Carvel https://carvel.dev/kapp-controller/[kapp-controller].
The Coherence Operator release published two images required to deploy the Operator as a Tanzu package.
-* `ghcr.io/oracle/coherence-operator-package:{operator-version}` - the Coherence Operator package
-* `ghcr.io/oracle/coherence-operator-repo:{operator-version}` - the Coherence Operator repository
+* `container-registry.oracle.com/middleware/coherence-operator-package:{operator-version}` - the Coherence Operator package
+* `container-registry.oracle.com/middleware/coherence-operator-repo:{operator-version}` - the Coherence Operator repository
=== Install the Coherence Repository
@@ -908,7 +908,7 @@ This can be done using the Tanzu CLI.
[source,bash]
----
tanzu package repository add coherence-repo \
- --url ghcr.io/oracle/coherence-operator-repo:3.5.0 \
+ --url container-registry.oracle.com/middleware/coherence-operator-repo:3.5.0 \
--namespace coherence \
--create-namespace
----
@@ -923,8 +923,8 @@ tanzu package repository list --namespace coherence
which should display something like the following
[source,bash]
----
-NAME REPOSITORY TAG STATUS DETAILS
-coherence-repo ghcr.io/oracle/coherence-operator-repo 1h Reconcile succeeded
+NAME REPOSITORY TAG STATUS DETAILS
+coherence-repo container-registry.oracle.com/middleware/coherence-operator-repo 1h Reconcile succeeded
----
The available packages in the Coherence repository can also be displayed using the CLI
diff --git a/docs/management/100_tmb_test.adoc b/docs/management/100_tmb_test.adoc
index 28cff1bba..f3203bc5c 100644
--- a/docs/management/100_tmb_test.adoc
+++ b/docs/management/100_tmb_test.adoc
@@ -54,7 +54,7 @@ spec:
restartPolicy: Never
containers:
- name: coherence
- image: ghcr.io/oracle/coherence-ce:22.06.10 # <1>
+ image: container-registry.oracle.com/middleware/coherence-ce:14.1.2-0-1 # <1>
ports:
- name: mbus
containerPort: 8000
@@ -101,7 +101,7 @@ spec:
restartPolicy: Never
containers:
- name: coherence
- image: ghcr.io/oracle/coherence-ce:22.06.10
+ image: container-registry.oracle.com/middleware/coherence-ce:14.1.2-0-1
command:
- java # <1>
- -cp
diff --git a/examples/095_network_policies/README.adoc b/examples/095_network_policies/README.adoc
index 6d9d690dc..c4cc7a032 100644
--- a/examples/095_network_policies/README.adoc
+++ b/examples/095_network_policies/README.adoc
@@ -414,12 +414,12 @@ If Coherence Extend is being used, then first the Extend Proxy must be configure
The default behaviour of Coherence is to bind the Extend proxy to an ephemeral port and clients use the Coherence
NameService to look up the port to use.
-When using the default Coherence images, for example `ghcr.io/oracle/coherence-ce:22.06` the Extend proxy is already
+When using the default Coherence images, for example `container-registry.oracle.com/middleware/coherence-ce:22.06` the Extend proxy is already
configured to run on a fixed port `20000`. When using this image, or any image that uses the default Coherence cache
configuration file, this port can be changed by setting the `COHERENCE_EXTEND_PORT` environment variable.
When using the Coherence Concurrent extensions over Extend, the Concurrent Extend proxy also needs to be configured with a fixed port.
-When using the default Coherence images, for example `ghcr.io/oracle/coherence-ce:22.06` the Concurrent Extend proxy is already
+When using the default Coherence images, for example `container-registry.oracle.com/middleware/coherence-ce:22.06` the Concurrent Extend proxy is already
configured to run on a fixed port `20001`. When using this image, or any image that uses the default Coherence cache
configuration file, this port can be changed by setting the `COHERENCE_CONCURRENT_EXTEND_PORT` environment variable.
@@ -491,7 +491,7 @@ This policy must be applied to the namespace _where the client Pods will be depl
If Coherence gRPC is being used, then first the gRPC Proxy must be configured to use a fixed port.
-When using the default Coherence images, for example `ghcr.io/oracle/coherence-ce:22.06` the gRPC proxy is already
+When using the default Coherence images, for example `container-registry.oracle.com/middleware/coherence-ce:22.06` the gRPC proxy is already
configured to run on a fixed port `1408`. The gRPC proxy port can be changed by setting the `COHERENCE_GRPC_PORT` environment variable.
The ingress policy below will allow ingress into the Coherence Pods gRPC port.
diff --git a/examples/095_network_policies/manifests/net-test-client.yaml b/examples/095_network_policies/manifests/net-test-client.yaml
index 4a2a6d4c6..90e7f6068 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.5.0
+ image: container-registry.oracle.com/middleware/coherence-operator:3.5.0
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 ba07b9f56..d7fd83d22 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.5.0
+ image: container-registry.oracle.com/middleware/coherence-operator:3.5.0
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 1ab9d9b2e..be2f3df34 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.5.0
+ image: container-registry.oracle.com/middleware/coherence-operator:3.5.0
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 7b59dd75d..2e433feaf 100644
--- a/examples/095_network_policies/manifests/net-test-operator-server.yaml
+++ b/examples/095_network_policies/manifests/net-test-operator-server.yaml
@@ -34,7 +34,7 @@ metadata:
spec:
containers:
- name: net-test
- image: ghcr.io/oracle/coherence-operator:3.5.0
+ image: container-registry.oracle.com/middleware/coherence-operator:3.5.0
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 f244a9b16..ef47defeb 100644
--- a/examples/095_network_policies/manifests/net-test-operator.yaml
+++ b/examples/095_network_policies/manifests/net-test-operator.yaml
@@ -22,7 +22,7 @@ spec:
spec:
containers:
- name: net-test
- image: ghcr.io/oracle/coherence-operator:3.5.0
+ image: container-registry.oracle.com/middleware/coherence-operator:3.5.0
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 35050ef91..5e7e7929c 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.5.0
+ image: container-registry.oracle.com/middleware/coherence-operator:3.5.0
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 3c533f16c..daf42cf3b 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.5.0
+ image: container-registry.oracle.com/middleware/coherence-operator-utils:3.5.0
condition: Ready
timeout: 5m
interval: 10s
diff --git a/examples/400_Istio/README.adoc b/examples/400_Istio/README.adoc
index f31ccc14d..772c796bb 100644
--- a/examples/400_Istio/README.adoc
+++ b/examples/400_Istio/README.adoc
@@ -209,7 +209,7 @@ metadata:
name: storage
spec:
replicas: 3
- image: ghcr.io/oracle/coherence-ce:22.06.10
+ image: container-registry.oracle.com/middleware/coherence-ce:14.1.2-0-1
labels:
app: storage # <1>
version: 1.0.0 # <2>
@@ -291,7 +291,7 @@ kind: CoherenceJob
metadata:
name: client
spec:
- image: ghcr.io/oracle/coherence-ce:22.06.10 # <1>
+ image: container-registry.oracle.com/middleware/coherence-ce:14.1.2-0-1 # <1>
restartPolicy: Never
cluster: storage # <2>
coherence:
diff --git a/examples/no-operator/04_istio/Dockerfile b/examples/no-operator/04_istio/Dockerfile
index f240c1b41..68dd3147a 100644
--- a/examples/no-operator/04_istio/Dockerfile
+++ b/examples/no-operator/04_istio/Dockerfile
@@ -1,9 +1,9 @@
-FROM ghcr.io/oracle/coherence-operator:3.5.0 AS Builder
+FROM container-registry.oracle.com/middlewarecoherence-operator:3.5.0 AS Builder
-FROM ghcr.io/oracle/coherence-ce:22.06.10
+FROM container-registry.oracle.com/middleware/coherence-ce:14.1.2-0-1
COPY --from=Builder /files /files
COPY --from=Builder /files/lib/coherence-operator.jar /app/libs/coherence-operator.jar
-COPY coherence-java-client-22.06.7.jar /app/libs/coherence-java-client-22.06.7.jar
+COPY coherence-java-client-14.1.2-0-1.jar /app/libs/coherence-java-client-14.1.2-0-1.jar
ENTRYPOINT ["files/runner"]
CMD ["-h"]
\ No newline at end of file
diff --git a/examples/no-operator/04_istio/README.adoc b/examples/no-operator/04_istio/README.adoc
index c73349e25..8d596b0fd 100644
--- a/examples/no-operator/04_istio/README.adoc
+++ b/examples/no-operator/04_istio/README.adoc
@@ -225,7 +225,7 @@ spec:
spec:
containers:
- name: coherence
- image: ghcr.io/oracle/coherence-ce:22.06.7 # <2>
+ image: container-registry.oracle.com/middleware/coherence-ce:14.1.2-0-1 # <2>
env:
- name: COHERENCE_CLUSTER # <3>
value: "test-cluster"
@@ -408,7 +408,7 @@ The port could be changed by setting the `COHERENCE_EXTEND_PORT` environment var
spec:
containers:
- name: coherence
- image: ghcr.io/oracle/coherence-ce:22.06.7
+ image: container-registry.oracle.com/middleware/coherence-ce:14.1.2-0-1
env:
- name: COHERENCE_EXTEND_PORT
value: "20001"
@@ -434,7 +434,7 @@ This port can be changed by using the `COHERENCE_GRPC_SERVER_PORT` environment v
spec:
containers:
- name: coherence
- image: ghcr.io/oracle/coherence-ce:22.06.7
+ image: container-registry.oracle.com/middleware/coherence-ce:14.1.2-0-1
env:
- name: COHERENCE_GRPC_SERVER_PORT
value: "1408"
@@ -474,12 +474,12 @@ Various utilities are copied from the Operator image into the base.
[source]
.Dockerfile
----
-FROM ghcr.io/oracle/coherence-operator:3.5.0 AS Builder
+FROM container-registry.oracle.com/middleware/coherence-operator:3.5.0 AS Builder
-FROM ghcr.io/oracle/coherence-ce:22.06.7
+FROM container-registry.oracle.com/middleware/coherence-ce:14.1.2-0-1
COPY --from=Builder /files /files
COPY --from=Builder /files/lib/coherence-operator.jar /app/libs/coherence-operator.jar
-COPY coherence-java-client-22.06.7.jar /app/libs/coherence-java-client-22.06.7.jar
+COPY coherence-java-client-14.1.2-0-1.jar /app/libs/coherence-java-client-14.1.2-0-1.jar
ENTRYPOINT ["files/runner"]
CMD ["-h"]
@@ -490,8 +490,8 @@ Coherence gRPC client jar. We can download this with `curl` to the same director
[source,bash]
----
-curl -s https://repo1.maven.org/maven2/com/oracle/coherence/ce/coherence-java-client/22.06.7/coherence-java-client-22.06.7.jar \
- -o coherence-java-client-22.06.7.jar
+curl -s https://repo1.maven.org/maven2/com/oracle/coherence/ce/coherence-java-client/14.1.2-0-1/coherence-java-client-14.1.2-0-1.jar \
+ -o coherence-java-client-14.1.2-0-1.jar
----
Build the image with the following command:
diff --git a/examples/no-operator/04_istio/storage.yaml b/examples/no-operator/04_istio/storage.yaml
index 894259a4a..c17d01634 100644
--- a/examples/no-operator/04_istio/storage.yaml
+++ b/examples/no-operator/04_istio/storage.yaml
@@ -25,7 +25,7 @@ spec:
spec:
containers:
- name: coherence
- image: ghcr.io/oracle/coherence-ce:22.06.7 # <2>
+ image: container-registry.oracle.com/middleware/coherence-ce:14.1.2-0-1 # <2>
env:
- name: COHERENCE_CLUSTER # <3>
value: "test-cluster"
diff --git a/java/coherence-operator/pom.xml b/java/coherence-operator/pom.xml
index aefc35ae4..9b0302429 100644
--- a/java/coherence-operator/pom.xml
+++ b/java/coherence-operator/pom.xml
@@ -21,7 +21,7 @@
coherence-operator
- ghcr.io/oracle
+ container-registry.oracle.com/middleware
${docker.registry}/coherence-operator-test-base:${project.version}
amd64
gcr.io/distroless/java17-debian12
diff --git a/java/pom.xml b/java/pom.xml
index ad447d8d9..c5a020d05 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -50,8 +50,8 @@
gcr.io/distroless/java17-debian12
gcr.io/distroless/java21-debian12
- ghcr.io/oracle/coherence-ce:${coherence.version}
- ghcr.io/oracle/${project.artifactId}:${project.version}
+ container-registry.oracle.com/middleware/coherence-ce:${coherence.version}
+ container-registry.oracle.com/middleware/${project.artifactId}:${project.version}
docker
diff --git a/test/e2e/helper/proj_helpers.go b/test/e2e/helper/proj_helpers.go
index 4ec63020b..564f4288b 100644
--- a/test/e2e/helper/proj_helpers.go
+++ b/test/e2e/helper/proj_helpers.go
@@ -84,13 +84,13 @@ func EnsureTestEnvVars() {
ensureEnvVar("K3D_OPERATOR_IMAGE", "k3d-myregistry.localhost:12345/oracle/coherence-operator:1.0.0")
- ensureEnvVar("TEST_COMPATIBILITY_IMAGE", "ghcr.io/oracle/operator-test-compatibility:1.0.0")
- ensureEnvVar("TEST_APPLICATION_IMAGE_CLIENT", "ghcr.io/oracle/operator-test-client:1.0.0")
- ensureEnvVar("TEST_APPLICATION_IMAGE", "ghcr.io/oracle/operator-test:1.0.0")
- ensureEnvVar("TEST_APPLICATION_IMAGE_HELIDON", "ghcr.io/oracle/operator-test-helidon:1.0.0")
- ensureEnvVar("TEST_APPLICATION_IMAGE_SPRING", "ghcr.io/oracle/operator-test-spring:1.0.0")
- ensureEnvVar("TEST_APPLICATION_IMAGE_SPRING_FAT", "ghcr.io/oracle/operator-test-spring-fat:1.0.0")
- ensureEnvVar("TEST_APPLICATION_IMAGE_SPRING_CNBP", "ghcr.io/oracle/operator-test-spring-cnbp:1.0.0")
+ ensureEnvVar("TEST_COMPATIBILITY_IMAGE", "container-registry.oracle.com/middleware/operator-test-compatibility:1.0.0")
+ ensureEnvVar("TEST_APPLICATION_IMAGE_CLIENT", "container-registry.oracle.com/middleware/operator-test-client:1.0.0")
+ ensureEnvVar("TEST_APPLICATION_IMAGE", "container-registry.oracle.com/middleware/operator-test:1.0.0")
+ ensureEnvVar("TEST_APPLICATION_IMAGE_HELIDON", "container-registry.oracle.com/middleware/operator-test-helidon:1.0.0")
+ ensureEnvVar("TEST_APPLICATION_IMAGE_SPRING", "container-registry.oracle.com/middleware/operator-test-spring:1.0.0")
+ ensureEnvVar("TEST_APPLICATION_IMAGE_SPRING_FAT", "container-registry.oracle.com/middleware/operator-test-spring-fat:1.0.0")
+ ensureEnvVar("TEST_APPLICATION_IMAGE_SPRING_CNBP", "container-registry.oracle.com/middleware/operator-test-spring-cnbp:1.0.0")
}
func ensureEnvVar(key, value string) {
@@ -114,7 +114,7 @@ func GetOperatorImageRegistry() string {
if s, found := os.LookupEnv(OperatorImageRegistryEnv); found {
return s
}
- return "ghcr.io/oracle"
+ return "container-registry.oracle.com/middleware"
}
// GetOperatorImageName returns the name part of the Operator image.
@@ -135,7 +135,7 @@ func GetDefaultCoherenceImageRegistry() string {
if s, found := os.LookupEnv(CoherenceImageRegistryEnv); found {
return s
}
- return "ghcr.io/oracle"
+ return "container-registry.oracle.com/middleware"
}
// GetDefaultCoherenceImageName returns the name part of the default Coherence image.
@@ -143,7 +143,7 @@ func GetDefaultCoherenceImageName() string {
if s, found := os.LookupEnv(CoherenceImageNameEnv); found {
return s
}
- return "coherence"
+ return "coherence-ce"
}
// GetDefaultCoherenceImageTag returns the tag part of the default Coherence image.