Skip to content

Commit

Permalink
Merge pull request #397 from invidian/calico-update
Browse files Browse the repository at this point in the history
Update Kubernetes and golangci-lint
  • Loading branch information
invidian authored Jun 18, 2024
2 parents cd8338b + 740ae55 commit c35ca6a
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 @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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=./...
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.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",
Expand Down
2 changes: 1 addition & 1 deletion pkg/container/runtime/docker/docker_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func TestContainerCreatePullImage(t *testing.T) {
t.Parallel()

// Don't use default version of image, to have better chance it can be removed
image := "quay.io/coreos/etcd:v3.3.0"
image := "quay.io/coreos/etcd:v3.5.0"

testRuntime, _ := getDockerRuntime(t)

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 = "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"
Expand Down

0 comments on commit c35ca6a

Please sign in to comment.