From 2b0872ba6370e92008d61adccec18ba21b378302 Mon Sep 17 00:00:00 2001 From: Mateusz Gozdek Date: Tue, 4 Jun 2024 14:30:14 +0200 Subject: [PATCH] Update all components Signed-off-by: Mateusz Gozdek --- Dockerfile | 2 +- e2e/Dockerfile | 4 ++-- e2e/main_test.go | 6 +++--- integration/Dockerfile | 2 +- pkg/defaults/defaults.go | 12 ++++++------ 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1d05036f..ac9bf0f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22-alpine3.19 +FROM golang:1.22-alpine3.20 # Enable go modules ENV GO111MODULE=on diff --git a/e2e/Dockerfile b/e2e/Dockerfile index c1b85650..1605b946 100644 --- a/e2e/Dockerfile +++ b/e2e/Dockerfile @@ -1,8 +1,8 @@ -FROM golang:1.22-alpine3.19 +FROM golang:1.22-alpine3.20 RUN apk add -U make bash bash-completion vim coreutils -RUN wget https://get.helm.sh/helm-v3.14.3-linux-amd64.tar.gz -O- | tar -xzvf - -C /usr/local/bin --strip-components=1 linux-amd64/helm +RUN wget https://get.helm.sh/helm-v3.15.1-linux-amd64.tar.gz -O- | tar -xzvf - -C /usr/local/bin --strip-components=1 linux-amd64/helm RUN wget -O /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/$(wget -q -O- https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl && \ chmod +x /usr/local/bin/kubectl && \ diff --git a/e2e/main_test.go b/e2e/main_test.go index 007618a9..290aee61 100644 --- a/e2e/main_test.go +++ b/e2e/main_test.go @@ -99,15 +99,15 @@ func defaultE2EConfig(t *testing.T) e2eConfig { Charts: charts{ KubeAPIServer: chart{ Source: "flexkube/kube-apiserver", - Version: "0.9.3", + Version: "0.10.0", }, Kubernetes: chart{ Source: "flexkube/kubernetes", - Version: "0.10.3", + Version: "0.11.0", }, KubeProxy: chart{ Source: "flexkube/kube-proxy", - Version: "0.9.3", + Version: "0.10.0", }, TLSBootstrapping: chart{ Source: "flexkube/tls-bootstrapping", diff --git a/integration/Dockerfile b/integration/Dockerfile index 3acf5f03..84dd441d 100644 --- a/integration/Dockerfile +++ b/integration/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22-alpine3.19 +FROM golang:1.22-alpine3.20 # Install dependencies: # - docker for spawning further Docker containers diff --git a/pkg/defaults/defaults.go b/pkg/defaults/defaults.go index 69e129c9..1f34523c 100644 --- a/pkg/defaults/defaults.go +++ b/pkg/defaults/defaults.go @@ -3,26 +3,26 @@ package defaults const ( // EtcdImage points to a default Docker image, which will be used for running etcd. - EtcdImage = "quay.io/coreos/etcd:v3.5.13" + EtcdImage = "quay.io/coreos/etcd:v3.5.14" // KubeAPIServerImage points to a default Docker image, which will be used for // running kube-apiserver. - KubeAPIServerImage = "registry.k8s.io/kube-apiserver:v1.29.3" + KubeAPIServerImage = "registry.k8s.io/kube-apiserver:v1.30.1" // KubeControllerManagerImage points to a default Docker image, which will be used for // running kube-apiserver. - KubeControllerManagerImage = "registry.k8s.io/kube-controller-manager:v1.29.3" + KubeControllerManagerImage = "registry.k8s.io/kube-controller-manager:v1.30.1" // KubeSchedulerImage points to a default Docker image, which will be used for // running kube-apiserver. - KubeSchedulerImage = "registry.k8s.io/kube-scheduler:v1.29.3" + KubeSchedulerImage = "registry.k8s.io/kube-scheduler:v1.30.1" // KubeletImage points to a default Docker image, which will be used for // running kube-apiserver. - KubeletImage = "quay.io/flexkube/kubelet:v1.29.3" + KubeletImage = "quay.io/flexkube/kubelet:v1.30.1" // HAProxyImage is a default container image for APILoadBalancer. - HAProxyImage = "haproxy:2.9.6-alpine" + HAProxyImage = "haproxy:2.9.7-alpine" // DockerAPIVersion is a default API version used when talking to Docker runtime. DockerAPIVersion = "v1.38"