Merge pull request #329 from invidian/kubernetes-v1.25.0

Update to Kubernetes v1.25.0

e2e/main_test.go

@@ -99,35 +99,35 @@ func defaultE2EConfig(t *testing.T) e2eConfig {
 		Charts: charts{
 			KubeAPIServer: chart{
 				Source:  "flexkube/kube-apiserver",
-				Version: "0.4.4",
+				Version: "0.5.0",
 			},
 			Kubernetes: chart{
 				Source:  "flexkube/kubernetes",
-				Version: "0.5.4",
+				Version: "0.6.0",
 			},
 			KubeProxy: chart{
 				Source:  "flexkube/kube-proxy",
-				Version: "0.4.4",
+				Version: "0.5.0",
 			},
 			TLSBootstrapping: chart{
 				Source:  "flexkube/tls-bootstrapping",
 				Version: "0.1.1",
 			},
 			CoreDNS: chart{
 				Source:  "flexkube/coredns",
-				Version: "2.0.4",
+				Version: "2.0.6",
 			},
 			MetricsServer: chart{
 				Source:  "flexkube/metrics-server",
-				Version: "3.0.6",
+				Version: "3.0.9",
 			},
 			KubeletRubberStamp: chart{
 				Source:  "flexkube/kubelet-rubber-stamp",
-				Version: "0.1.7",
+				Version: "0.1.8",
 			},
 			Calico: chart{
 				Source:  "flexkube/calico",
-				Version: "0.4.20",
+				Version: "0.4.22",
 			},
 		},
 		KubeletExtraArgs: []string{

go.mod

@@ -4,23 +4,23 @@ go 1.16
 
 require (
 	github.com/Masterminds/sprig/v3 v3.2.2
-	github.com/docker/docker v20.10.10+incompatible
+	github.com/docker/docker v20.10.17+incompatible
 	github.com/docker/go-connections v0.4.0
-	github.com/flexkube/helm/v3 v3.1.0-rc.1.0.20211028083037-3b856c17ab41
-	github.com/google/go-cmp v0.5.6
+	github.com/flexkube/helm/v3 v3.1.0-rc.1.0.20220909120838-ecd8a196773e
+	github.com/google/go-cmp v0.5.9
 	github.com/google/uuid v1.3.0
 	github.com/logrusorgru/aurora v2.0.3+incompatible
-	github.com/opencontainers/image-spec v1.0.2
-	github.com/urfave/cli/v2 v2.3.0
+	github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799
+	github.com/urfave/cli/v2 v2.14.1
 	go.etcd.io/etcd/api/v3 v3.5.1
 	go.etcd.io/etcd/client/v3 v3.5.1
-	golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
-	k8s.io/api v0.23.0
-	k8s.io/apimachinery v0.23.0
-	k8s.io/client-go v0.23.0
-	k8s.io/component-base v0.23.0
-	k8s.io/kube-scheduler v0.23.0
-	k8s.io/kubectl v0.23.0
-	k8s.io/kubelet v0.23.0
+	golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90
+	k8s.io/api v0.25.0
+	k8s.io/apimachinery v0.25.0
+	k8s.io/client-go v0.25.0
+	k8s.io/component-base v0.25.0
+	k8s.io/kube-scheduler v0.25.0
+	k8s.io/kubectl v0.25.0
+	k8s.io/kubelet v0.25.0
 	sigs.k8s.io/yaml v1.3.0
 )

pkg/controlplane/kube-apiserver.go

@@ -206,8 +206,7 @@ func (k *kubeAPIServer) args() []string {
 		fmt.Sprintf("--etcd-keyfile=%s", path.Join(containerConfigPath, etcdKeyfile)),
 		// Enable additional admission plugins:
 		// - NodeRestriction for extra protection against rogue cluster nodes.
-		// - PodSecurityPolicy for PSP support.
-		"--enable-admission-plugins=NodeRestriction,PodSecurityPolicy",
+		"--enable-admission-plugins=NodeRestriction",
 		// Use SO_REUSEPORT, so multiple instances can run on the same controller for smooth upgrades.
 		"--permit-port-sharing=true",
 		// New flags required for TokenRequest feature.

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.4"
+	KubeAPIServerImage = "registry.k8s.io/kube-apiserver:v1.25.0"
 
 	// KubeControllerManagerImage points to a default Docker image, which will be used for
 	// running kube-apiserver.
-	KubeControllerManagerImage = "k8s.gcr.io/kube-controller-manager:v1.24.4"
+	KubeControllerManagerImage = "registry.k8s.io/kube-controller-manager:v1.25.0"
 
 	// KubeSchedulerImage points to a default Docker image, which will be used for
 	// running kube-apiserver.
-	KubeSchedulerImage = "k8s.gcr.io/kube-scheduler:v1.24.4"
+	KubeSchedulerImage = "registry.k8s.io/kube-scheduler:v1.25.0"
 
 	// KubeletImage points to a default Docker image, which will be used for
 	// running kube-apiserver.
-	KubeletImage = "quay.io/flexkube/kubelet:v1.24.4"
+	KubeletImage = "quay.io/flexkube/kubelet:v1.25.0"
 
 	// HAProxyImage is a default container image for APILoadBalancer.
-	HAProxyImage = "haproxy:2.6.2-alpine"
+	HAProxyImage = "haproxy:2.6.5-alpine"
 
 	// DockerAPIVersion is a default API version used when talking to Docker runtime.
 	DockerAPIVersion = "v1.38"

pkg/helm/release/release.go

@@ -176,7 +176,7 @@ func (r *release) Install(ctx context.Context) error {
 
 	client := r.installClient()
 
-	chart, err := r.loadChart()
+	chart, err := r.loadChart() //nolint:contextcheck // Helm API does not allow passing contexts here.
 	if err != nil {
 		return fmt.Errorf("loading chart: %w", err)
 	}
@@ -203,7 +203,7 @@ func (r *release) Upgrade(ctx context.Context) error {
 
 	client := r.upgradeClient()
 
-	chart, err := r.loadChart()
+	chart, err := r.loadChart() //nolint:contextcheck // Helm API does not allow passing contexts here.
 	if err != nil {
 		return fmt.Errorf("loading chart: %w", err)
 	}

pkg/kubernetes/client/client.go

@@ -79,10 +79,6 @@ func (c *client) ping() (bool, error) {
 		return false, nil
 	}
 
-	if _, err := c.PolicyV1beta1().PodSecurityPolicies().List(context.TODO(), metav1.ListOptions{}); err != nil {
-		return false, nil
-	}
-
 	return true, nil
 }