Skip to content

Commit

Permalink
Merge pull request #322 from invidian/update-kubernetes
Browse files Browse the repository at this point in the history
Update Kubernetes to v1.24.4
  • Loading branch information
invidian authored Aug 18, 2022
2 parents 311dec7 + 4963c35 commit 41cfed3
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions e2e/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions pkg/defaults/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/pki/pki.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 41cfed3

Please sign in to comment.