Skip to content

Commit ce74fea

Browse files
author
Peng Zhou
committed
update the VERSION to 1.1.0
1 parent f86f6f7 commit ce74fea

File tree

8 files changed

+16
-15
lines changed

8 files changed

+16
-15
lines changed

Makefile

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# To re-generate a bundle for another specific version without changing the standard setup, you can:
44
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
55
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
6-
VERSION ?= 1.0.0
6+
VERSION ?= 1.1.0
77

88
# VERIFY_HUGE_PAGES defines if hugepages test is enabled or not for e2e test
99
VERIFY_HUGE_PAGES ?= false
@@ -12,10 +12,10 @@ export E2E_DOCKER_IMAGE ?= $(IMG)
1212
export E2E_KUSTOMIZE_VERSION ?= $(KUSTOMIZE_VERSION)
1313
export E2E_CONTROLLER_TOOLS_VERSION ?= $(CONTROLLER_TOOLS_VERSION)
1414
export E2E_MARKLOGIC_IMAGE_VERSION ?= progressofficial/marklogic-db:11.3.1-ubi-rootless-2.1.3
15-
export E2E_KUBERNETES_VERSION ?= v1.31.0
15+
export E2E_KUBERNETES_VERSION ?= v1.34.0
1616

1717
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
18-
ENVTEST_K8S_VERSION = 1.31.0
18+
ENVTEST_K8S_VERSION = 1.34.0
1919

2020

2121
# CHANNELS define the bundle channels used in the bundle.
@@ -65,8 +65,8 @@ OPERATOR_SDK_VERSION ?= v1.34.2
6565

6666
# Image URL to use all building/pushing image targets
6767
# Image for dev: ml-marklogic-operator-dev.bed-artifactory.bedford.progress.com/marklogic-operator-kubernetes
68-
# IMG ?= progressofficial/marklogic-operator-kubernetes:$(VERSION)
69-
IMG ?= "testrepo/marklogic-operator-image-dev:1.0.0"
68+
IMG ?= progressofficial/marklogic-operator-kubernetes:$(VERSION)
69+
# IMG ?= "testrepo/marklogic-operator-image-dev:$(VERSION)"
7070

7171

7272
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
@@ -173,7 +173,7 @@ e2e-cleanup-minikube:
173173
minikube delete
174174

175175
GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint
176-
GOLANGCI_LINT_VERSION ?= v1.54.2
176+
GOLANGCI_LINT_VERSION ?= v1.62.2
177177
golangci-lint:
178178
@[ -f $(GOLANGCI_LINT) ] || { \
179179
set -e ;\
@@ -265,7 +265,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
265265

266266
## Tool Versions
267267
KUSTOMIZE_VERSION ?= v5.5.0
268-
CONTROLLER_TOOLS_VERSION ?= v0.17.1
268+
CONTROLLER_TOOLS_VERSION ?= v0.19.0
269269

270270
.PHONY: kustomize
271271
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary. If wrong version is installed, it will be removed before downloading.
@@ -368,6 +368,7 @@ $(HELMIFY): $(LOCALBIN)
368368
test -s $(LOCALBIN)/helmify || GOBIN=$(LOCALBIN) go install github.com/arttor/helmify/cmd/helmify@latest
369369

370370
helm: manifests kustomize helmify
371+
cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
371372
$(KUSTOMIZE) build config/default | $(HELMIFY) -image-pull-secrets -original-name charts/marklogic-operator-kubernetes
372373

373374
.PHONY: image-scan

charts/marklogic-operator-kubernetes/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ type: application
1313
# This is the chart version. This version number should be incremented each time you make changes
1414
# to the chart and its templates, including the app version.
1515
# Versions are expected to follow Semantic Versioning (https://semver.org/)
16-
version: 1.0.0
16+
version: 1.1.0
1717
# This is the version number of the application being deployed. This version number should be
1818
# incremented each time you make changes to the application. Versions are not expected to
1919
# follow Semantic Versioning. They should reflect the version the application is using.
2020
# It is recommended to use it with quotes.
21-
appVersion: "1.0.0"
21+
appVersion: "1.1.0"

charts/marklogic-operator-kubernetes/templates/marklogiccluster-crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
33
metadata:
44
name: marklogicclusters.marklogic.progress.com
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.1
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
labels:
88
{{- include "marklogic-operator-kubernetes.labels" . | nindent 4 }}
99
spec:

charts/marklogic-operator-kubernetes/templates/marklogicgroup-crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
33
metadata:
44
name: marklogicgroups.marklogic.progress.com
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.1
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
labels:
88
{{- include "marklogic-operator-kubernetes.labels" . | nindent 4 }}
99
spec:

charts/marklogic-operator-kubernetes/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ controllerManager:
3232
- ALL
3333
image:
3434
repository: progressofficial/marklogic-operator-kubernetes
35-
tag: 1.0.0
35+
tag: 1.1.0
3636
resources:
3737
limits:
3838
cpu: 500m

config/crd/bases/marklogic.progress.com_marklogicclusters.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.1
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: marklogicclusters.marklogic.progress.com
88
spec:
99
group: marklogic.progress.com

config/crd/bases/marklogic.progress.com_marklogicgroups.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.1
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: marklogicgroups.marklogic.progress.com
88
spec:
99
group: marklogic.progress.com

config/manager/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ kind: Kustomization
55
images:
66
- name: controller
77
newName: progressofficial/marklogic-operator-kubernetes
8-
newTag: 1.0.0
8+
newTag: 1.1.0

0 commit comments

Comments
 (0)