Skip to content

Commit e4bf43e

Browse files
thegridmanthegridman
authored
Update versions (#658)
* Bump Operator version to 3.4.0 * Build against k8s 1.30.2 * Add k8s 1.30 to test matrix * Update controller-gen and Kubstomize versions * Update deprecated GitHub action versions * Use kube-prometheus directly from main branch instead of released version
1 parent 6ac72c9 commit e4bf43e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+338
-344
lines changed

‎.github/workflows/build.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -146,27 +146,27 @@ jobs:
146146
make e2e-helm-test
147147
148148
- name: Upload Manifests
149-
uses: actions/upload-artifact@v1
149+
uses: actions/upload-artifact@v4
150150
if: success()
151151
with:
152152
name: coherence-operator-manifests.tar.gz
153153
path: build/_output/coherence-operator-manifests.tar.gz
154154

155155
- name: Upload Yaml
156-
uses: actions/upload-artifact@v1
156+
uses: actions/upload-artifact@v4
157157
if: success()
158158
with:
159159
name: coherence-operator.yaml
160160
path: build/_output/coherence-operator.yaml
161161

162162
- name: Upload CRD
163-
uses: actions/upload-artifact@v1
163+
uses: actions/upload-artifact@v4
164164
if: success()
165165
with:
166166
name: coherence.oracle.com_coherence.yaml
167167
path: build/_output/manifests/crd/coherence.oracle.com_coherence.yaml
168168

169-
- uses: actions/upload-artifact@v1
169+
- uses: actions/upload-artifact@v4
170170
if: failure()
171171
with:
172172
name: test-output

‎.github/workflows/coherence-matrix.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ jobs:
212212
export TEST_LOGS_DIR=build/_output/test-logs/${{ matrix.matrixName }}
213213
make coherence-compatibility-test
214214
215-
- uses: actions/upload-artifact@v1
215+
- uses: actions/upload-artifact@v4
216216
if: failure()
217217
with:
218218
name: test-output-${{ matrix.matrixName }}

‎.github/workflows/compatibility-tests.yaml

+6-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
fail-fast: false
3838
matrix:
3939
compatibilityVersion:
40+
- 3.3.5
4041
- 3.3.4
4142
- 3.3.3
4243
- 3.3.2
@@ -48,6 +49,10 @@ jobs:
4849
- 3.2.7
4950
- 3.2.6
5051
include:
52+
- compatibilityVersion: 3.3.5
53+
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
54+
compatibilitySelector: control-plane=coherence
55+
k8s: kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245
5156
- compatibilityVersion: 3.3.4
5257
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
5358
compatibilitySelector: control-plane=coherence
@@ -187,7 +192,7 @@ jobs:
187192
export COMPATIBLE_SELECTOR=${{ matrix.compatibilitySelector }}
188193
make compatibility-test
189194
190-
- uses: actions/upload-artifact@v1
195+
- uses: actions/upload-artifact@v4
191196
if: failure()
192197
with:
193198
name: test-output-${{ matrix.compatibilityVersion }}

‎.github/workflows/istio-tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ jobs:
138138
make undeploy
139139
ISTIO_VERSION=${{ matrix.istioVersion }} make uninstall-istio
140140
141-
- uses: actions/upload-artifact@v1
141+
- uses: actions/upload-artifact@v4
142142
if: failure()
143143
with:
144144
name: test-output-${{ matrix.istioVersion }}

‎.github/workflows/k8s-matrix.yaml

+11-16
Original file line numberDiff line numberDiff line change
@@ -40,40 +40,35 @@ jobs:
4040
fail-fast: false
4141
matrix:
4242
matrixName:
43+
- v1.30
4344
- v1.29
4445
- v1.28
4546
- v1.27
4647
- v1.26
4748
- v1.25
48-
- v1.24
49-
- v1.23
5049
include:
50+
- matrixName: v1.30
51+
k8s: kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e
52+
kindCommand: kind-calico
53+
runNetTests: true
5154
- matrixName: v1.29
52-
k8s: kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245
55+
k8s: kindest/node:v1.29.4@sha256:3abb816a5b1061fb15c6e9e60856ec40d56b7b52bcea5f5f1350bc6e2320b6f8
5356
kindCommand: kind-calico
5457
runNetTests: true
5558
- matrixName: v1.28
56-
k8s: kindest/node:v1.28.7@sha256:9bc6c451a289cf96ad0bbaf33d416901de6fd632415b076ab05f5fa7e4f65c58
59+
k8s: kindest/node:v1.28.9@sha256:dca54bc6a6079dd34699d53d7d4ffa2e853e46a20cd12d619a09207e35300bd0
5760
kindCommand: kind-calico
5861
runNetTests: true
5962
- matrixName: v1.27
60-
k8s: kindest/node:v1.27.11@sha256:681253009e68069b8e01aad36a1e0fa8cf18bb0ab3e5c4069b2e65cafdd70843
63+
k8s: kindest/node:v1.27.13@sha256:17439fa5b32290e3ead39ead1250dca1d822d94a10d26f1981756cd51b24b9d8
6164
kindCommand: kind-calico
6265
runNetTests: true
6366
- matrixName: v1.26
64-
k8s: kindest/node:v1.26.14@sha256:5d548739ddef37b9318c70cb977f57bf3e5015e4552be4e27e57280a8cbb8e4f
67+
k8s: kindest/node:v1.26.15@sha256:84333e26cae1d70361bb7339efb568df1871419f2019c80f9a12b7e2d485fe19
6568
kindCommand: kind-calico
6669
runNetTests: true
6770
- matrixName: v1.25
68-
k8s: kindest/node:v1.25.16@sha256:e8b50f8e06b44bb65a93678a65a26248fae585b3d3c2a669e5ca6c90c69dc519
69-
kindCommand: kind-calico
70-
runNetTests: true
71-
- matrixName: v1.24
72-
k8s: kindest/node:v1.24.17@sha256:bad10f9b98d54586cba05a7eaa1b61c6b90bfc4ee174fdc43a7b75ca75c95e51
73-
kindCommand: kind-calico
74-
runNetTests: true
75-
- matrixName: v1.23
76-
k8s: kindest/node:v1.23.17@sha256:14d0a9a892b943866d7e6be119a06871291c517d279aedb816a4b4bc0ec0a5b3
71+
k8s: kindest/node:v1.25.16@sha256:5da57dfc290ac3599e775e63b8b6c49c0c85d3fec771cd7d55b45fae14b38d3b
7772
kindCommand: kind-calico
7873
runNetTests: true
7974

@@ -160,7 +155,7 @@ jobs:
160155
export RUN_NET_TEST=${{ matrix.runNetTests }}
161156
./hack/k8s-certification.sh
162157
163-
- uses: actions/upload-artifact@v1
158+
- uses: actions/upload-artifact@v4
164159
if: failure()
165160
with:
166161
name: test-output-${{ matrix.matrixName }}

‎.github/workflows/minikube-matrix.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ jobs:
4040
fail-fast: false
4141
matrix:
4242
matrixName:
43+
- v1.29
4344
- v1.28
4445
- v1.27
4546
- v1.26
@@ -139,7 +140,7 @@ jobs:
139140
docker pull gcr.io/distroless/java17-debian11
140141
./hack/k8s-certification.sh
141142
142-
- uses: actions/upload-artifact@v1
143+
- uses: actions/upload-artifact@v4
143144
if: failure()
144145
with:
145146
name: test-output-${{ matrix.matrixName }}

‎.github/workflows/prometheus-tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ jobs:
120120
make kind-load
121121
make e2e-prometheus-test
122122
123-
- uses: actions/upload-artifact@v1
123+
- uses: actions/upload-artifact@v4
124124
if: failure()
125125
with:
126126
name: test-output

‎.github/workflows/tanzu-tests.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -139,13 +139,13 @@ jobs:
139139
make kind-load
140140
make run-certification OPERATOR_NAMESPACE=coherence
141141
142-
- uses: actions/upload-artifact@v1
142+
- uses: actions/upload-artifact@v4
143143
if: failure()
144144
with:
145145
name: tanzu-artifacts
146146
path: build/_output/tanzu
147147

148-
- uses: actions/upload-artifact@v1
148+
- uses: actions/upload-artifact@v4
149149
if: failure()
150150
with:
151151
name: test-output

‎Makefile

+18-9
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
# ======================================================================================================================
1616

1717
# The version of the Operator being build - this should be a valid SemVer format
18-
VERSION ?= 3.3.6
18+
VERSION ?= 3.4.0
1919
MVN_VERSION ?= $(VERSION)
2020

2121
# The version number to be replaced by this release
22-
PREV_VERSION ?= 3.3.4
22+
PREV_VERSION ?= 3.3.5
2323

2424
# The operator version to use to run certification tests against
2525
CERTIFICATION_VERSION ?= $(VERSION)
2626

2727
# The previous Operator version used to run the compatibility tests.
28-
COMPATIBLE_VERSION ?= 3.3.4
28+
COMPATIBLE_VERSION ?= 3.3.5
2929
# The selector to use to find Operator Pods of the COMPATIBLE_VERSION (do not put in double quotes!!)
3030
COMPATIBLE_SELECTOR ?= control-plane=coherence
3131

@@ -39,12 +39,13 @@ KUBERNETES_DOC_VERSION=v1.29
3939
# ----------------------------------------------------------------------------------------------------------------------
4040
# The Coherence version to build against - must be a Java 8 compatible version
4141
COHERENCE_VERSION ?= 21.12.5
42-
COHERENCE_VERSION_LTS ?= 22.06.7
42+
COHERENCE_VERSION_LTS ?= 22.06.8
4343
# The default Coherence image the Operator will run if no image is specified
4444
COHERENCE_IMAGE_REGISTRY ?= ghcr.io/oracle
4545
COHERENCE_IMAGE_NAME ?= coherence-ce
4646
COHERENCE_IMAGE_TAG ?= $(COHERENCE_VERSION_LTS)
4747
COHERENCE_IMAGE ?= $(COHERENCE_IMAGE_REGISTRY)/$(COHERENCE_IMAGE_NAME):$(COHERENCE_IMAGE_TAG)
48+
COHERENCE_GROUP_ID ?= com.oracle.coherence.ce
4849
# The Java version that tests will be compiled to.
4950
# This should match the version required by the COHERENCE_IMAGE version
5051
BUILD_JAVA_VERSION ?= 11
@@ -93,7 +94,7 @@ OPERATOR_SDK_VERSION := v1.9.0
9394
# Options to append to the Maven command
9495
# ----------------------------------------------------------------------------------------------------------------------
9596
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)
9798

9899
# ----------------------------------------------------------------------------------------------------------------------
99100
# Operator image names
@@ -338,7 +339,8 @@ TEST_SSL_SECRET := coherence-ssl-secret
338339
# ----------------------------------------------------------------------------------------------------------------------
339340
# Prometheus Operator settings (used in integration tests)
340341
# ----------------------------------------------------------------------------------------------------------------------
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
342344
PROMETHEUS_HOME = $(TOOLS_DIRECTORY)/prometheus/$(PROMETHEUS_VERSION)
343345
PROMETHEUS_NAMESPACE ?= monitoring
344346
PROMETHEUS_ADAPTER_VERSION ?= 2.5.0
@@ -1567,7 +1569,7 @@ create-ssl-secrets: $(BUILD_OUTPUT)/certs
15671569
##@ KinD
15681570

15691571
KIND_CLUSTER ?= operator
1570-
KIND_IMAGE ?= "kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245"
1572+
KIND_IMAGE ?= "kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e"
15711573
CALICO_TIMEOUT ?= 300s
15721574

15731575
# ----------------------------------------------------------------------------------------------------------------------
@@ -1678,15 +1680,18 @@ $(TOOLS_BIN)/minikube:
16781680
ifeq (Darwin, $(UNAME_S))
16791681
ifeq (x86_64, $(UNAME_M))
16801682
curl -LOs https://storage.googleapis.com/minikube/releases/$(MINIKUBE_VERSION)/minikube-darwin-amd64
1683+
mkdir -p $(TOOLS_BIN) || true
16811684
install minikube-darwin-amd64 $(TOOLS_BIN)/minikube
16821685
rm minikube-darwin-amd64
16831686
else
16841687
curl -LOs https://storage.googleapis.com/minikube/releases/$(MINIKUBE_VERSION)/minikube-darwin-arm64
1688+
mkdir -p $(TOOLS_BIN) || true
16851689
install minikube-darwin-arm64 $(TOOLS_BIN)/minikube
16861690
rm minikube-darwin-arm64
16871691
endif
16881692
else
16891693
curl -LOs https://storage.googleapis.com/minikube/releases/$(MINIKUBE_VERSION)/minikube-linux-amd64
1694+
mkdir -p $(TOOLS_BIN) || true
16901695
install minikube-linux-amd64 $(TOOLS_BIN)/minikube
16911696
rm minikube-linux-amd64
16921697
endif
@@ -1843,14 +1848,14 @@ controller-gen: $(TOOLS_BIN)/controller-gen ## Download controller-gen locally i
18431848

18441849
$(TOOLS_BIN)/controller-gen:
18451850
@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
18471852
ls -al $(TOOLS_BIN)
18481853

18491854
# ----------------------------------------------------------------------------------------------------------------------
18501855
# find or download kustomize
18511856
# ----------------------------------------------------------------------------------------------------------------------
18521857
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
18541859

18551860
.PHONY: kustomize
18561861
KUSTOMIZE = $(TOOLS_BIN)/kustomize
@@ -2024,7 +2029,11 @@ push-release-images: push-operator-image tanzu-repo
20242029
get-prometheus: $(PROMETHEUS_HOME)/$(PROMETHEUS_VERSION).txt ## Download Prometheus Operator kube-prometheus
20252030

20262031
$(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
20272035
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
20282037
mkdir -p $(PROMETHEUS_HOME)
20292038
tar -zxf $(BUILD_OUTPUT)/prometheus.tar.gz --directory $(PROMETHEUS_HOME) --strip-components=1
20302039
rm $(BUILD_OUTPUT)/prometheus.tar.gz

‎api/v1/coherence_types.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -1201,7 +1201,7 @@ func (in *NamedPortSpec) CreateServiceMonitor(deployment CoherenceResource) *mon
12011201

12021202
endpoint := in.ServiceMonitor.CreateEndpoint()
12031203
endpoint.Port = in.Name
1204-
endpoint.RelabelConfigs = append(endpoint.RelabelConfigs, &monitoringv1.RelabelConfig{
1204+
endpoint.RelabelConfigs = append(endpoint.RelabelConfigs, monitoringv1.RelabelConfig{
12051205
Action: "labeldrop",
12061206
Regex: "(endpoint|instance|job|service)",
12071207
})
@@ -1383,13 +1383,13 @@ type ServiceMonitorSpec struct {
13831383
// See https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#endpoint
13841384
// +listType=atomic
13851385
// +optional
1386-
MetricRelabelings []*monitoringv1.RelabelConfig `json:"metricRelabelings,omitempty"`
1386+
MetricRelabelings []monitoringv1.RelabelConfig `json:"metricRelabelings,omitempty"`
13871387
// Relabelings to apply to samples before scraping.
13881388
// More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
13891389
// See https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#endpoint
13901390
// +listType=atomic
13911391
// +optional
1392-
Relabelings []*monitoringv1.RelabelConfig `json:"relabelings,omitempty"`
1392+
Relabelings []monitoringv1.RelabelConfig `json:"relabelings,omitempty"`
13931393
// ProxyURL eg http://proxyserver:2195 Directs scrapes to proxy through this endpoint.
13941394
// See https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#endpoint
13951395
// +optional

‎api/v1/zz_generated.deepcopy.go

+6-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/crd/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ commonLabels:
4141
app.kubernetes.io/instance: coherence-operator-crd
4242
app.kubernetes.io/name: coherence-operator
4343
app.kubernetes.io/part-of: coherence-operator
44-
app.kubernetes.io/version: 3.3.6
44+
app.kubernetes.io/version: 3.4.0

‎config/manager/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ resources:
99
images:
1010
- name: controller
1111
newName: ghcr.io/oracle/coherence-operator
12-
newTag: 3.3.6
12+
newTag: 3.4.0

0 commit comments

Comments
 (0)