From 7f9939d26b2d023948d6bc96032c12f01be4d82e Mon Sep 17 00:00:00 2001 From: Mateusz Gozdek Date: Thu, 18 Aug 2022 12:23:25 +0200 Subject: [PATCH 1/2] Update Kubernetes to v1.24.4 Signed-off-by: Mateusz Gozdek --- e2e/main_test.go | 6 +++--- pkg/defaults/defaults.go | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/e2e/main_test.go b/e2e/main_test.go index a73729b8..2e09d9ff 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.4.3", + Version: "0.4.4", }, Kubernetes: chart{ Source: "flexkube/kubernetes", - Version: "0.5.3", + Version: "0.5.4", }, KubeProxy: chart{ Source: "flexkube/kube-proxy", - Version: "0.4.3", + Version: "0.4.4", }, TLSBootstrapping: chart{ Source: "flexkube/tls-bootstrapping", diff --git a/pkg/defaults/defaults.go b/pkg/defaults/defaults.go index 440842c2..231c5663 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 = "k8s.gcr.io/kube-apiserver:v1.24.3" + KubeAPIServerImage = "k8s.gcr.io/kube-apiserver:v1.24.4" // KubeControllerManagerImage points to a default Docker image, which will be used for // running kube-apiserver. - KubeControllerManagerImage = "k8s.gcr.io/kube-controller-manager:v1.24.3" + KubeControllerManagerImage = "k8s.gcr.io/kube-controller-manager:v1.24.4" // KubeSchedulerImage points to a default Docker image, which will be used for // running kube-apiserver. - KubeSchedulerImage = "k8s.gcr.io/kube-scheduler:v1.24.3" + KubeSchedulerImage = "k8s.gcr.io/kube-scheduler:v1.24.4" // KubeletImage points to a default Docker image, which will be used for // running kube-apiserver. - KubeletImage = "quay.io/flexkube/kubelet:v1.24.3" + KubeletImage = "quay.io/flexkube/kubelet:v1.24.4" // HAProxyImage is a default container image for APILoadBalancer. - HAProxyImage = "haproxy:2.6.1-alpine" + HAProxyImage = "haproxy:2.6.2-alpine" // DockerAPIVersion is a default API version used when talking to Docker runtime. DockerAPIVersion = "v1.38" From 4963c35845d482ae3179eca8fb4c00115b103dcf Mon Sep 17 00:00:00 2001 From: Mateusz Gozdek Date: Thu, 18 Aug 2022 12:25:59 +0200 Subject: [PATCH 2/2] Fix newly detected typos Signed-off-by: Mateusz Gozdek --- .github/workflows/ci.yml | 2 +- Makefile | 2 +- pkg/pki/pki.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd57172d..94da5100 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -107,7 +107,7 @@ jobs: - uses: codespell-project/actions-codespell@master with: skip: .git,go.sum - ignore_words_list: uptodate,decorder + ignore_words_list: uptodate,decorder,complies check_filenames: true check_hidden: true vagrant: diff --git a/Makefile b/Makefile index a6a2ec1b..2dc59051 100644 --- a/Makefile +++ b/Makefile @@ -190,7 +190,7 @@ test-update-linters: test-working-tree-clean .PHONY: codespell codespell: - codespell -S .git,state.yaml,go.sum,terraform.tfstate,terraform.tfstate.backup,./local-testing/resources -L uptodate,decorder + codespell -S .git,state.yaml,go.sum,terraform.tfstate,terraform.tfstate.backup,./local-testing/resources -L uptodate,decorder,complies .PHONY: codespell-pr codespell-pr: diff --git a/pkg/pki/pki.go b/pkg/pki/pki.go index 8b64aeb8..0fbff926 100644 --- a/pkg/pki/pki.go +++ b/pkg/pki/pki.go @@ -212,7 +212,7 @@ func buildAndGenerate(crs ...*certificateRequest) error { for _, certRequest := range crs { cert, err := buildCertificate(certRequest.Certificates...) if err != nil { - return fmt.Errorf("builing certificate configuration: %w", err) + return fmt.Errorf("building certificate configuration: %w", err) } if err := cert.Generate(certRequest.CA); err != nil {