From 21b9449383dfe01ae21c0bc8f16b2f14ea566611 Mon Sep 17 00:00:00 2001 From: Mateusz Gozdek Date: Tue, 18 Jun 2024 13:07:34 +0200 Subject: [PATCH] Update Kubernetes and golangci-lint Signed-off-by: Mateusz Gozdek --- .github/workflows/ci.yml | 2 +- Makefile | 2 +- e2e/main_test.go | 6 +++--- pkg/defaults/defaults.go | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8ccd1c38..81cb618f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ on: jobs: build: runs-on: ubuntu-latest - container: golangci/golangci-lint:v1.59.0 + container: golangci/golangci-lint:v1.59.1 steps: - uses: actions/cache@v2 with: diff --git a/Makefile b/Makefile index 6fecfabc..599f43e8 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ GORUN=$(GOCMD) run GOBUILD=$(GOCMD) build -v -ldflags $(LD_FLAGS) -trimpath CC_TEST_REPORTER_ID=6e107e510c5479f40b0ce9166a254f3f1ee0bc547b3e48281bada1a5a32bb56d -GOLANGCI_LINT_VERSION=v1.59.0 +GOLANGCI_LINT_VERSION=v1.59.1 BIN_PATH=$$HOME/bin GO_PACKAGES=./... diff --git a/e2e/main_test.go b/e2e/main_test.go index ee28a4b1..d301b66f 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.10.0", + Version: "0.10.1", }, Kubernetes: chart{ Source: "flexkube/kubernetes", - Version: "0.11.0", + Version: "0.11.1", }, KubeProxy: chart{ Source: "flexkube/kube-proxy", - Version: "0.10.0", + Version: "0.10.1", }, TLSBootstrapping: chart{ Source: "flexkube/tls-bootstrapping", diff --git a/pkg/defaults/defaults.go b/pkg/defaults/defaults.go index 1f34523c..9260d54a 100644 --- a/pkg/defaults/defaults.go +++ b/pkg/defaults/defaults.go @@ -7,22 +7,22 @@ const ( // KubeAPIServerImage points to a default Docker image, which will be used for // running kube-apiserver. - KubeAPIServerImage = "registry.k8s.io/kube-apiserver:v1.30.1" + KubeAPIServerImage = "registry.k8s.io/kube-apiserver:v1.30.2" // KubeControllerManagerImage points to a default Docker image, which will be used for // running kube-apiserver. - KubeControllerManagerImage = "registry.k8s.io/kube-controller-manager:v1.30.1" + KubeControllerManagerImage = "registry.k8s.io/kube-controller-manager:v1.30.2" // KubeSchedulerImage points to a default Docker image, which will be used for // running kube-apiserver. - KubeSchedulerImage = "registry.k8s.io/kube-scheduler:v1.30.1" + KubeSchedulerImage = "registry.k8s.io/kube-scheduler:v1.30.2" // KubeletImage points to a default Docker image, which will be used for // running kube-apiserver. - KubeletImage = "quay.io/flexkube/kubelet:v1.30.1" + KubeletImage = "quay.io/flexkube/kubelet:v1.30.2" // HAProxyImage is a default container image for APILoadBalancer. - HAProxyImage = "haproxy:2.9.7-alpine" + HAProxyImage = "haproxy:2.9.9-alpine" // DockerAPIVersion is a default API version used when talking to Docker runtime. DockerAPIVersion = "v1.38"