15
15
# ======================================================================================================================
16
16
17
17
# The version of the Operator being build - this should be a valid SemVer format
18
- VERSION ?= 3.3.6
18
+ VERSION ?= 3.4.0
19
19
MVN_VERSION ?= $(VERSION )
20
20
21
21
# The version number to be replaced by this release
22
- PREV_VERSION ?= 3.3.4
22
+ PREV_VERSION ?= 3.3.5
23
23
24
24
# The operator version to use to run certification tests against
25
25
CERTIFICATION_VERSION ?= $(VERSION )
26
26
27
27
# The previous Operator version used to run the compatibility tests.
28
- COMPATIBLE_VERSION ?= 3.3.4
28
+ COMPATIBLE_VERSION ?= 3.3.5
29
29
# The selector to use to find Operator Pods of the COMPATIBLE_VERSION (do not put in double quotes!!)
30
30
COMPATIBLE_SELECTOR ?= control-plane=coherence
31
31
@@ -39,12 +39,13 @@ KUBERNETES_DOC_VERSION=v1.29
39
39
# ----------------------------------------------------------------------------------------------------------------------
40
40
# The Coherence version to build against - must be a Java 8 compatible version
41
41
COHERENCE_VERSION ?= 21.12.5
42
- COHERENCE_VERSION_LTS ?= 22.06.7
42
+ COHERENCE_VERSION_LTS ?= 22.06.8
43
43
# The default Coherence image the Operator will run if no image is specified
44
44
COHERENCE_IMAGE_REGISTRY ?= ghcr.io/oracle
45
45
COHERENCE_IMAGE_NAME ?= coherence-ce
46
46
COHERENCE_IMAGE_TAG ?= $(COHERENCE_VERSION_LTS )
47
47
COHERENCE_IMAGE ?= $(COHERENCE_IMAGE_REGISTRY ) /$(COHERENCE_IMAGE_NAME ) :$(COHERENCE_IMAGE_TAG )
48
+ COHERENCE_GROUP_ID ?= com.oracle.coherence.ce
48
49
# The Java version that tests will be compiled to.
49
50
# This should match the version required by the COHERENCE_IMAGE version
50
51
BUILD_JAVA_VERSION ?= 11
@@ -93,7 +94,7 @@ OPERATOR_SDK_VERSION := v1.9.0
93
94
# Options to append to the Maven command
94
95
# ----------------------------------------------------------------------------------------------------------------------
95
96
MAVEN_OPTIONS ?= -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3
96
- 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 )
97
+ 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 )
97
98
98
99
# ----------------------------------------------------------------------------------------------------------------------
99
100
# Operator image names
@@ -338,7 +339,8 @@ TEST_SSL_SECRET := coherence-ssl-secret
338
339
# ----------------------------------------------------------------------------------------------------------------------
339
340
# Prometheus Operator settings (used in integration tests)
340
341
# ----------------------------------------------------------------------------------------------------------------------
341
- PROMETHEUS_VERSION ?= v0.13.0
342
+ # The version of kube-prometheus to use (main = latest main branch from https://github.com/prometheus-operator/kube-prometheus)
343
+ PROMETHEUS_VERSION ?= main
342
344
PROMETHEUS_HOME = $(TOOLS_DIRECTORY ) /prometheus/$(PROMETHEUS_VERSION )
343
345
PROMETHEUS_NAMESPACE ?= monitoring
344
346
PROMETHEUS_ADAPTER_VERSION ?= 2.5.0
@@ -1567,7 +1569,7 @@ create-ssl-secrets: $(BUILD_OUTPUT)/certs
1567
1569
# #@ KinD
1568
1570
1569
1571
KIND_CLUSTER ?= operator
1570
- KIND_IMAGE ?= "kindest/node:v1.29.2 @sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245 "
1572
+ KIND_IMAGE ?= "kindest/node:v1.30.0 @sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e "
1571
1573
CALICO_TIMEOUT ?= 300s
1572
1574
1573
1575
# ----------------------------------------------------------------------------------------------------------------------
@@ -1678,15 +1680,18 @@ $(TOOLS_BIN)/minikube:
1678
1680
ifeq (Darwin, $(UNAME_S ) )
1679
1681
ifeq (x86_64, $(UNAME_M ) )
1680
1682
curl -LOs https://storage.googleapis.com/minikube/releases/$(MINIKUBE_VERSION)/minikube-darwin-amd64
1683
+ mkdir -p $(TOOLS_BIN) || true
1681
1684
install minikube-darwin-amd64 $(TOOLS_BIN)/minikube
1682
1685
rm minikube-darwin-amd64
1683
1686
else
1684
1687
curl -LOs https://storage.googleapis.com/minikube/releases/$(MINIKUBE_VERSION)/minikube-darwin-arm64
1688
+ mkdir -p $(TOOLS_BIN) || true
1685
1689
install minikube-darwin-arm64 $(TOOLS_BIN)/minikube
1686
1690
rm minikube-darwin-arm64
1687
1691
endif
1688
1692
else
1689
1693
curl -LOs https://storage.googleapis.com/minikube/releases/$(MINIKUBE_VERSION)/minikube-linux-amd64
1694
+ mkdir -p $(TOOLS_BIN) || true
1690
1695
install minikube-linux-amd64 $(TOOLS_BIN)/minikube
1691
1696
rm minikube-linux-amd64
1692
1697
endif
@@ -1843,14 +1848,14 @@ controller-gen: $(TOOLS_BIN)/controller-gen ## Download controller-gen locally i
1843
1848
1844
1849
$(TOOLS_BIN ) /controller-gen :
1845
1850
@echo " Downloading controller-gen"
1846
- test -s $(TOOLS_BIN ) /controller-gen || GOBIN=$(TOOLS_BIN ) go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.10 .0
1851
+ test -s $(TOOLS_BIN ) /controller-gen || GOBIN=$(TOOLS_BIN ) go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.15 .0
1847
1852
ls -al $(TOOLS_BIN )
1848
1853
1849
1854
# ----------------------------------------------------------------------------------------------------------------------
1850
1855
# find or download kustomize
1851
1856
# ----------------------------------------------------------------------------------------------------------------------
1852
1857
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
1853
- KUSTOMIZE_VERSION ?= v3.8.7
1858
+ KUSTOMIZE_VERSION ?= v5.4.2
1854
1859
1855
1860
.PHONY : kustomize
1856
1861
KUSTOMIZE = $(TOOLS_BIN ) /kustomize
@@ -2024,7 +2029,11 @@ push-release-images: push-operator-image tanzu-repo
2024
2029
get-prometheus : $(PROMETHEUS_HOME ) /$(PROMETHEUS_VERSION ) .txt # # Download Prometheus Operator kube-prometheus
2025
2030
2026
2031
$(PROMETHEUS_HOME ) /$(PROMETHEUS_VERSION ) .txt : $(BUILD_PROPS )
2032
+ ifeq (main, $(PROMETHEUS_VERSION ) )
2033
+ curl -sL https://github.com/prometheus-operator/kube-prometheus/archive/main.tar.gz -o $(BUILD_OUTPUT)/prometheus.tar.gz --header $(GH_AUTH)
2034
+ else
2027
2035
curl -sL https://github.com/prometheus-operator/kube-prometheus/archive/refs/tags/$(PROMETHEUS_VERSION).tar.gz -o $(BUILD_OUTPUT)/prometheus.tar.gz --header $(GH_AUTH)
2036
+ endif
2028
2037
mkdir -p $(PROMETHEUS_HOME)
2029
2038
tar -zxf $(BUILD_OUTPUT)/prometheus.tar.gz --directory $(PROMETHEUS_HOME) --strip-components=1
2030
2039
rm $(BUILD_OUTPUT)/prometheus.tar.gz
0 commit comments