From aea0fed20151670097f0abb9929304347ea649a8 Mon Sep 17 00:00:00 2001 From: Peng Zhou Date: Thu, 26 Sep 2024 09:22:23 -0700 Subject: [PATCH 1/2] MLE-17101 Build MarkLogic Operator Image target AMD64 platform --- Makefile | 4 ++-- charts/marklogic-operator/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 7748472..f6ec5fc 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ endif OPERATOR_SDK_VERSION ?= v1.34.2 # Image URL to use all building/pushing image targets -IMG ?= ml-marklogic-operator-dev.bed-artifactory.bedford.progress.com/marklogic-kubernetes-operator:0.0.2 +IMG ?= ml-marklogic-operator-dev.bed-artifactory.bedford.progress.com/marklogic-kubernetes-operator:0.1.0 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. ENVTEST_K8S_VERSION = 1.28.3 @@ -152,7 +152,7 @@ run: manifests generate fmt vet ## Run a controller from your host. # More info: https://docs.docker.com/develop/develop-images/build_enhancements/ .PHONY: docker-build docker-build: ## Build docker image with the manager. - $(CONTAINER_TOOL) build -t ${IMG} . + $(CONTAINER_TOOL) build --platform="linux/amd64" -t ${IMG} . .PHONY: docker-push docker-push: ## Push docker image with the manager. diff --git a/charts/marklogic-operator/values.yaml b/charts/marklogic-operator/values.yaml index 3cbb909..b9ab385 100644 --- a/charts/marklogic-operator/values.yaml +++ b/charts/marklogic-operator/values.yaml @@ -32,7 +32,7 @@ controllerManager: - ALL image: repository: ml-marklogic-operator-dev.bed-artifactory.bedford.progress.com/marklogic-kubernetes-operator - tag: 0.0.2 + tag: 0.1.0 resources: limits: cpu: 500m From 1d4dce648696e5fbaa3aa670d6a39a8ee6bcbe43 Mon Sep 17 00:00:00 2001 From: Peng Zhou Date: Thu, 26 Sep 2024 09:57:48 -0700 Subject: [PATCH 2/2] update the image tag to 1.0.0-ea2 --- Makefile | 2 +- charts/marklogic-operator/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f6ec5fc..79f8abc 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ endif OPERATOR_SDK_VERSION ?= v1.34.2 # Image URL to use all building/pushing image targets -IMG ?= ml-marklogic-operator-dev.bed-artifactory.bedford.progress.com/marklogic-kubernetes-operator:0.1.0 +IMG ?= ml-marklogic-operator-dev.bed-artifactory.bedford.progress.com/marklogic-kubernetes-operator:1.0.0-ea2 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. ENVTEST_K8S_VERSION = 1.28.3 diff --git a/charts/marklogic-operator/values.yaml b/charts/marklogic-operator/values.yaml index b9ab385..49458c3 100644 --- a/charts/marklogic-operator/values.yaml +++ b/charts/marklogic-operator/values.yaml @@ -32,7 +32,7 @@ controllerManager: - ALL image: repository: ml-marklogic-operator-dev.bed-artifactory.bedford.progress.com/marklogic-kubernetes-operator - tag: 0.1.0 + tag: 1.0.0-ea2 resources: limits: cpu: 500m