Skip to content

Commit 49fdc4e

Browse files
paulofasilvapaulofasilva
committed
MYSQLCLUSTER-8330 Update base images and tools
Updating Docker base images and installed tools to their latest versions. Change-Id: If5e508cf5b33e2431def79746ed533ab27a05c1f
1 parent d133a3a commit 49fdc4e

File tree

9 files changed

+32
-29
lines changed

9 files changed

+32
-29
lines changed

‎DEVELOPER.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ License information can be found in the LICENSE file. This distribution may incl
1111
## Prerequisites
1212
- [Golang v1.16](https://go.dev/dl/) or above to compile the operator.
1313
- [Docker](https://docs.docker.com/get-docker/) to build the NDB Operator and other container images. Docker is also used to run the E2E testcases.
14-
- [Minikube](https://minikube.sigs.k8s.io/docs/) or [KinD](https://kind.sigs.k8s.io/) to deploy and test the NDB Operator. A minimum version of Kubernetes 1.19 is required. If using minikube, the default memory config might not be adequate and the memory should be increased using `minikube config set` command. For example to deploy the example at [docs/examples/example-ndb.yaml](docs/examples/example-ndb.yaml), minikube requires a memory of atleast 5GB, and it can be set by `minikube config set memory 5GB`.
14+
- [Minikube](https://minikube.sigs.k8s.io/docs/) or [KinD](https://kind.sigs.k8s.io/) to deploy and test the NDB Operator. A minimum version of Kubernetes 1.23 is required. If using minikube, the default memory config might not be adequate and the memory should be increased using `minikube config set` command. For example to deploy the example at [docs/examples/example-ndb.yaml](docs/examples/example-ndb.yaml), minikube requires a memory of atleast 5GB, and it can be set by `minikube config set memory 5GB`.
1515

1616
## Build NDB Operator
1717

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ License information can be found in the LICENSE file. This distribution may incl
1111
## Installation
1212

1313
### Prerequisites
14-
- Kubernetes Version 1.19+
14+
- Kubernetes Version 1.23+
1515

1616
### Install using helm
1717

‎deploy/charts/ndb-operator/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ License information can be found in the LICENSE file. This distribution may incl
1010

1111
## Prerequisites
1212

13-
- Kubernetes v1.19.0+
13+
- Kubernetes v1.23.0+
1414

1515
## Install the Chart
1616

‎docker/e2e-tests/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
# Copyright (c) 2021, 2023, Oracle and/or its affiliates.
1+
# Copyright (c) 2021, 2025, Oracle and/or its affiliates.
22
#
33
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
4-
ARG GOLANG_IMAGE=golang:1.20
4+
ARG GOLANG_IMAGE=docker.io/golang:1.24.1
55
FROM $GOLANG_IMAGE
66

77
# install kubectl
8-
ARG KUBE_VERSION=v1.21.6
8+
ARG KUBE_VERSION=v1.32.2
99
RUN curl -LO "https://dl.k8s.io/release/$KUBE_VERSION/bin/linux/amd64/kubectl" && \
1010
install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
1111

1212
# install helm
13-
ARG HELM_VERSION=v3.7.1
13+
ARG HELM_VERSION=v3.17.1
1414
RUN curl -LO https://get.helm.sh/helm-$HELM_VERSION-linux-amd64.tar.gz && \
15-
tar -zxf helm-v3.7.1-linux-amd64.tar.gz && \
15+
tar -zxf helm-$HELM_VERSION-linux-amd64.tar.gz && \
1616
install -o root -g root -m 0755 linux-amd64/helm /usr/bin/helm
1717

1818
# Create and move into the target repo directory

‎docker/ndb-operator-release/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Copyright (c) 2022, 2023, Oracle and/or its affiliates.
1+
# Copyright (c) 2022, 2025, Oracle and/or its affiliates.
22
#
33
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
4-
ARG GOLANG_ALPINE_IMAGE=golang:1.20.0-alpine3.17
4+
ARG GOLANG_ALPINE_IMAGE=docker.io/golang:1.24.1-alpine3.21
55
FROM $GOLANG_ALPINE_IMAGE as builder
66
RUN apk add --no-cache make
77

‎e2e-tests/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ $ go run e2e-tests/run-e2e-test.go --help
2727
More details : https://onsi.github.io/ginkgo/#location-based-filtering
2828
-kind-k8s-version string
2929
Kind k8s version used to run tests.
30-
Example usage: -kind-k8s-version=1.20 (default "1.23")
30+
Example usage: -kind-k8s-version=1.30 (default "1.32")
3131
-kubeconfig string
3232
Kubeconfig of the existing K8s cluster to run tests on.
3333
This will not be used if '--use-kind' is enabled. (default "$HOME/.kube/config")

‎e2e-tests/run-e2e-test.go‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2020, 2024, Oracle and/or its affiliates.
1+
// Copyright (c) 2020, 2025, Oracle and/or its affiliates.
22
//
33
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
44

@@ -57,13 +57,16 @@ var options struct {
5757
// K8s image used by KinD to bring up cluster
5858
// https://github.com/kubernetes-sigs/kind/releases
5959
var kindK8sNodeImages = map[string]string{
60-
"1.19": "kindest/node:v1.19.16@sha256:476cb3269232888437b61deca013832fee41f9f074f9bed79f57e4280f7c48b7",
61-
"1.20": "kindest/node:v1.20.15@sha256:a32bf55309294120616886b5338f95dd98a2f7231519c7dedcec32ba29699394",
62-
"1.21": "kindest/node:v1.21.14@sha256:9d9eb5fb26b4fbc0c6d95fa8c790414f9750dd583f5d7cee45d92e8c26670aa1",
63-
"1.22": "kindest/node:v1.22.15@sha256:7d9708c4b0873f0fe2e171e2b1b7f45ae89482617778c1c875f1053d4cef2e41",
64-
"1.23": "kindest/node:v1.23.12@sha256:ef453bb7c79f0e3caba88d2067d4196f427794086a7d0df8df4f019d5e336b61",
65-
"1.24": "kindest/node:v1.24.6@sha256:577c630ce8e509131eab1aea12c022190978dd2f745aac5eb1fe65c0807eb315",
66-
"1.25": "kindest/node:v1.25.2@sha256:f52781bc0d7a19fb6c405c2af83abfeb311f130707a0e219175677e366cc45d1",
60+
"1.23": "kindest/node:v1.23.17@sha256:14d0a9a892b943866d7e6be119a06871291c517d279aedb816a4b4bc0ec0a5b3",
61+
"1.24": "kindest/node:v1.24.17@sha256:bad10f9b98d54586cba05a7eaa1b61c6b90bfc4ee174fdc43a7b75ca75c95e51",
62+
"1.25": "kindest/node:v1.25.16@sha256:6110314339b3b44d10da7d27881849a87e092124afab5956f2e10ecdb463b025",
63+
"1.26": "kindest/node:v1.26.15@sha256:c79602a44b4056d7e48dc20f7504350f1e87530fe953428b792def00bc1076dd",
64+
"1.27": "kindest/node:v1.27.16@sha256:2d21a61643eafc439905e18705b8186f3296384750a835ad7a005dceb9546d20",
65+
"1.28": "kindest/node:v1.28.15@sha256:a7c05c7ae043a0b8c818f5a06188bc2c4098f6cb59ca7d1856df00375d839251",
66+
"1.29": "kindest/node:v1.29.14@sha256:8703bd94ee24e51b778d5556ae310c6c0fa67d761fae6379c8e0bb480e6fea29",
67+
"1.30": "kindest/node:v1.30.10@sha256:4de75d0e82481ea846c0ed1de86328d821c1e6a6a91ac37bf804e5313670e507",
68+
"1.31": "kindest/node:v1.31.6@sha256:28b7cbb993dfe093c76641a0c95807637213c9109b761f1d422c2400e22b8e87",
69+
"1.32": "kindest/node:v1.32.2@sha256:f226345927d7e348497136874b6d207e0b32cc52154ad8323129352923a3142f",
6770
}
6871

6972
var (
@@ -884,10 +887,10 @@ func init() {
884887
"Enable this to run tests from outside the K8s cluster.\n"+
885888
"By default, this is not enabled and the tests will be run as a pod from inside K8s Cluster.")
886889

887-
// use v1.23 as default kind k8s version
888-
flag.StringVar(&options.kindK8sVersion, "kind-k8s-version", "1.23",
890+
// use v1.32 as default kind k8s version
891+
flag.StringVar(&options.kindK8sVersion, "kind-k8s-version", "1.32",
889892
"Kind k8s version used to run tests.\n"+
890-
"Example usage: -kind-k8s-version=1.23")
893+
"Example usage: -kind-k8s-version=1.30")
891894

892895
// test suites to be run.
893896
flag.StringVar(&options.suites, "suites", "",

‎e2e-tests/suites/basic/node_selection_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
1+
// Copyright (c) 2022, 2025, Oracle and/or its affiliates.
22
//
33
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
44

@@ -64,24 +64,24 @@ var _ = ndbtest.NewOrderedTestCase("Node Selectors and Pod affinity", func(tc *n
6464
testNdb = testutils.NewTestNdb(namespace, "node-spec-test", 2)
6565
// Add Tolerations to all node types to enable scheduling them
6666
// on KinD master which has a NoSchedule taint.
67-
tolerateTaintOnKinDMaster := corev1.Toleration{
68-
Key: "node-role.kubernetes.io/master",
67+
tolerateTaintOnKinDControlPlane := corev1.Toleration{
68+
Key: "node-role.kubernetes.io/control-plane",
6969
Operator: corev1.TolerationOpEqual,
7070
Effect: corev1.TaintEffectNoSchedule,
7171
}
7272
testNdb.Spec.ManagementNode.NdbPodSpec = &v1.NdbClusterPodSpec{
7373
Tolerations: []corev1.Toleration{
74-
tolerateTaintOnKinDMaster,
74+
tolerateTaintOnKinDControlPlane,
7575
},
7676
}
7777
testNdb.Spec.DataNode.NdbPodSpec = &v1.NdbClusterPodSpec{
7878
Tolerations: []corev1.Toleration{
79-
tolerateTaintOnKinDMaster,
79+
tolerateTaintOnKinDControlPlane,
8080
},
8181
}
8282
testNdb.Spec.MysqlNode.NdbPodSpec = &v1.NdbClusterPodSpec{
8383
Tolerations: []corev1.Toleration{
84-
tolerateTaintOnKinDMaster,
84+
tolerateTaintOnKinDControlPlane,
8585
},
8686
}
8787
ginkgo.DeferCleanup(func() {

‎operator_hub_bundle/patch_bundle_operatorhub.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ spec:
154154
version: 1.0.10
155155
replaces: 1.0.2
156156
#skips: []
157-
minKubeVersion: 1.21.0
157+
minKubeVersion: 1.23.0
158158
keywords:
159159
- mysql
160160
- ndb

0 commit comments

Comments
 (0)