Merge branch 'master' of github.com:gardener/gardener into master

* 'master' of github.com:gardener/gardener: (51 commits) Switch extension controller to `logr` and streamline/cleanup logs (gardener#6332) Switch `./test/...` packages to `logr` and drop `github.com/sirupsen/logrus` dependency (gardener#6316) Only check shoot conditions during hibernation integration test (gardener#6325) Add dashboard for monitoring conntrack race failures. (gardener#6329) Reconcile quota before rbac (gardener#6326) Update istio to v1.14.1 (gardener#6271) Update gardenlet's base image to alpine:3.16.0 (gardener#6321) Update envoy proxy to v1.21.4 (gardener#6320) Deploy the metrics server to the kind cluster (gardener#6301) Fix tools download for aarch64 (arm64) (gardener#6314) update with latest CA releases (gardener#6295) Add missing unit tests for the predicates provided by the extensions library (gardener#6249) [GEP-19] Monitoring Stack - Migrating to the `prometheus-operator` (gardener#6151) Revert "Recreate DWD deployment if needed" (gardener#6307) Update to golang 1.18.4 (gardener#6300) Cleaned up imports in vpn-seed-server (gardener#6315) Prepare next Dev Cycle v1.52.0-dev Release v1.51.0 Add pre/post reconciliation/deletion hooks for the Worker resource (gardener#6290) Update the supported values in the usage text of the `--leader-election-resource-lock` flag (gardener#6304) ...
krgostev · Jul 15, 2022 · 306b7fe · 306b7fe
2 parents 30b1ad2 + cffdb9f
commit 306b7fe
Show file tree

Hide file tree

Showing 764 changed files with 34,879 additions and 89,399 deletions.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -39,7 +39,7 @@ issues:
   - "undeclared name: `.*`"
   - "\".*\" imported but not used"
   # allow non-capitalized messages if they start with technical terms
-  - "structured logging message should be capitalized: \"gardener-(apiserver|controller-manager)"
+  - "structured logging message should be capitalized: \"garden(er-apiserver|er-controller-manager|er-admission-controller|er-seed-admission-controller|er-resource-manager|let)"
   exclude-rules:
   - linters:
     - staticcheck

diff --git a/.test-defs/CreateManagedSeed.yaml b/.test-defs/CreateManagedSeed.yaml
diff --git a/.test-defs/CreateShoot.yaml b/.test-defs/CreateShoot.yaml
@@ -41,4 +41,4 @@ spec:
 #    -machine-type=$MACHINE_TYPE
 #    -external-domain=
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.18.1
+  image: eu.gcr.io/gardener-project/3rd/golang:1.18.4
diff --git a/.test-defs/DeleteManagedSeed.yaml b/.test-defs/DeleteManagedSeed.yaml
diff --git a/.test-defs/DeleteShoot.yaml b/.test-defs/DeleteShoot.yaml
@@ -15,4 +15,4 @@ spec:
     --shoot-name=$SHOOT_NAME
     --project-namespace=$PROJECT_NAMESPACE
     --kubecfg="$TM_KUBECONFIG_PATH/gardener.config"
-  image: eu.gcr.io/gardener-project/3rd/golang:1.18.1
+  image: eu.gcr.io/gardener-project/3rd/golang:1.18.4
diff --git a/.test-defs/HibernateShoot.yaml b/.test-defs/HibernateShoot.yaml
@@ -16,4 +16,4 @@ spec:
     --project-namespace=$PROJECT_NAMESPACE
     --kubecfg="$TM_KUBECONFIG_PATH/gardener.config"
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.18.1
+  image: eu.gcr.io/gardener-project/3rd/golang:1.18.4
diff --git a/.test-defs/MigrateShoot.yaml b/.test-defs/MigrateShoot.yaml
@@ -19,4 +19,4 @@ spec:
     -mr-exclude-list="$MR_EXCLUDE_LIST"
     -resources-with-generated-name="$RESOURCES_WITH_GENERATED_NAME"
     -add-test-run-taint="$ADD_TEST_RUN_TAINT"
-  image: eu.gcr.io/gardener-project/3rd/golang:1.18.1
+  image: eu.gcr.io/gardener-project/3rd/golang:1.18.4
diff --git a/.test-defs/ReconcileShoots.yaml b/.test-defs/ReconcileShoots.yaml
@@ -15,4 +15,4 @@ spec:
     -kubecfg=$TM_KUBECONFIG_PATH/gardener.config
     -version=$GARDENER_VERSION
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.18.1
+  image: eu.gcr.io/gardener-project/3rd/golang:1.18.4
diff --git a/.test-defs/ShootKubernetesUpdateTest.yaml b/.test-defs/ShootKubernetesUpdateTest.yaml
@@ -19,4 +19,4 @@ spec:
     -project-namespace=$PROJECT_NAMESPACE
     -version=$K8S_VERSION
     -version-worker-pools=$K8S_VERSION_WORKER_POOLS
-  image: eu.gcr.io/gardener-project/3rd/golang:1.18.1
+  image: eu.gcr.io/gardener-project/3rd/golang:1.18.4
diff --git a/.test-defs/TestSuiteGardenerBeta.yaml b/.test-defs/TestSuiteGardenerBeta.yaml
@@ -19,4 +19,4 @@ spec:
       -ginkgo.focus="\[BETA\]"
       -ginkgo.skip="\[SERIAL\]|\[DISRUPTIVE\]"
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.18.1
+  image: eu.gcr.io/gardener-project/3rd/golang:1.18.4
diff --git a/.test-defs/TestSuiteGardenerBetaSerial.yaml b/.test-defs/TestSuiteGardenerBetaSerial.yaml
@@ -21,4 +21,4 @@ spec:
       -ginkgo.focus="\[BETA\].*\[SERIAL\]"
       -ginkgo.skip="\[DISRUPTIVE\]"
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.18.1
+  image: eu.gcr.io/gardener-project/3rd/golang:1.18.4
diff --git a/.test-defs/TestSuiteGardenerDefault.yaml b/.test-defs/TestSuiteGardenerDefault.yaml
@@ -19,4 +19,4 @@ spec:
       -ginkgo.focus="\[DEFAULT\]"
       -ginkgo.skip="\[SERIAL\]|\[DISRUPTIVE\]"
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.18.1
+  image: eu.gcr.io/gardener-project/3rd/golang:1.18.4
diff --git a/.test-defs/TestSuiteGardenerDefaultSerial.yaml b/.test-defs/TestSuiteGardenerDefaultSerial.yaml
@@ -21,4 +21,4 @@ spec:
       -ginkgo.focus="\[DEFAULT\].*\[SERIAL\]"
       -ginkgo.skip="\[DISRUPTIVE\]"
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.18.1
+  image: eu.gcr.io/gardener-project/3rd/golang:1.18.4
diff --git a/.test-defs/TestSuiteGardenerRelease.yaml b/.test-defs/TestSuiteGardenerRelease.yaml
@@ -19,4 +19,4 @@ spec:
       -ginkgo.focus="\[RELEASE\]"
       -ginkgo.skip="\[SERIAL\]|\[DISRUPTIVE\]"
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.18.1
+  image: eu.gcr.io/gardener-project/3rd/golang:1.18.4
diff --git a/.test-defs/TestSuiteGardenerReleaseSerial.yaml b/.test-defs/TestSuiteGardenerReleaseSerial.yaml
@@ -21,4 +21,4 @@ spec:
       -ginkgo.focus="\[RELEASE\].*\[SERIAL\]"
       -ginkgo.skip="\[DISRUPTIVE\]"
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.18.1
+  image: eu.gcr.io/gardener-project/3rd/golang:1.18.4
diff --git a/.test-defs/TestSuiteShootBeta.yaml b/.test-defs/TestSuiteShootBeta.yaml
@@ -21,4 +21,4 @@ spec:
       -ginkgo.focus="\[BETA\]"
       -ginkgo.skip="\[SERIAL\]|\[DISRUPTIVE\]"
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.18.1
+  image: eu.gcr.io/gardener-project/3rd/golang:1.18.4
diff --git a/.test-defs/TestSuiteShootBetaDisruptive.yaml b/.test-defs/TestSuiteShootBetaDisruptive.yaml
@@ -23,4 +23,4 @@ spec:
       -ginkgo.focus="\[BETA\].*\[DISRUPTIVE\]"
       -ginkgo.skip="\[SERIAL\]"
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.18.1
+  image: eu.gcr.io/gardener-project/3rd/golang:1.18.4
diff --git a/.test-defs/TestSuiteShootBetaSerial.yaml b/.test-defs/TestSuiteShootBetaSerial.yaml
@@ -23,4 +23,4 @@ spec:
       -ginkgo.focus="\[BETA\].*\[SERIAL\]"
       -ginkgo.skip="\[DISRUPTIVE\]"
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.18.1
+  image: eu.gcr.io/gardener-project/3rd/golang:1.18.4
diff --git a/.test-defs/TestSuiteShootDefault.yaml b/.test-defs/TestSuiteShootDefault.yaml
@@ -22,4 +22,4 @@ spec:
       -ginkgo.skip="\[SERIAL\]|\[DISRUPTIVE\]"
       -ginkgo.timeout=2h
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.18.1
+  image: eu.gcr.io/gardener-project/3rd/golang:1.18.4
diff --git a/.test-defs/TestSuiteShootDefaultDisruptive.yaml b/.test-defs/TestSuiteShootDefaultDisruptive.yaml
@@ -23,4 +23,4 @@ spec:
       -ginkgo.focus="\[DEFAULT\].*\[DISRUPTIVE\]"
       -ginkgo.skip="\[SERIAL\]"
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.18.1
+  image: eu.gcr.io/gardener-project/3rd/golang:1.18.4
diff --git a/.test-defs/TestSuiteShootDefaultSerial.yaml b/.test-defs/TestSuiteShootDefaultSerial.yaml
@@ -24,4 +24,4 @@ spec:
       -ginkgo.skip="\[DISRUPTIVE\]"
       -ginkgo.timeout=2h
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.18.1
+  image: eu.gcr.io/gardener-project/3rd/golang:1.18.4
diff --git a/.test-defs/TestSuiteShootRelease.yaml b/.test-defs/TestSuiteShootRelease.yaml
@@ -21,4 +21,4 @@ spec:
       -ginkgo.focus="\[RELEASE\]"
       -ginkgo.skip="\[SERIAL\]|\[DISRUPTIVE\]"
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.18.1
+  image: eu.gcr.io/gardener-project/3rd/golang:1.18.4
diff --git a/.test-defs/TestSuiteShootReleaseDisruptive.yaml b/.test-defs/TestSuiteShootReleaseDisruptive.yaml
@@ -23,4 +23,4 @@ spec:
       -ginkgo.focus="\[RELEASE\].*\[DISRUPTIVE\]"
       -ginkgo.skip="\[SERIAL\]"
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.18.1
+  image: eu.gcr.io/gardener-project/3rd/golang:1.18.4
diff --git a/.test-defs/TestSuiteShootReleaseSerial.yaml b/.test-defs/TestSuiteShootReleaseSerial.yaml
@@ -23,4 +23,4 @@ spec:
       -ginkgo.focus="\[RELEASE\].*\[SERIAL\]"
       -ginkgo.skip="\[DISRUPTIVE\]"
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.18.1
+  image: eu.gcr.io/gardener-project/3rd/golang:1.18.4
diff --git a/.test-defs/WakeUpShoot.yaml b/.test-defs/WakeUpShoot.yaml
@@ -16,4 +16,4 @@ spec:
     --project-namespace=$PROJECT_NAMESPACE
     --kubecfg="$TM_KUBECONFIG_PATH/gardener.config"
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.18.1
+  image: eu.gcr.io/gardener-project/3rd/golang:1.18.4
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 #############      builder       #############
-FROM golang:1.18.1 AS builder
+FROM golang:1.18.4 AS builder
 
 WORKDIR /go/src/github.com/gardener/gardener
 COPY . .
@@ -9,7 +9,7 @@ ARG EFFECTIVE_VERSION
 RUN make install EFFECTIVE_VERSION=$EFFECTIVE_VERSION
 
 ############# base
-FROM alpine:3.15.4 AS base
+FROM alpine:3.16.0 AS base
 
 ############# distroless-static
 FROM gcr.io/distroless/static-debian11:nonroot as distroless-static

diff --git a/Dockerfile.local b/Dockerfile.local
@@ -1,5 +1,5 @@
 ############# base
-FROM alpine:3.15.4 AS base
+FROM alpine:3.16.0 AS base
 
 # Define GOTRACEBACK to mark this container as using the Go language runtime
 # for `skaffold debug` (https://skaffold.dev/docs/workflows/debug/).
@@ -11,7 +11,7 @@ RUN apk add --update tzdata
 FROM gcr.io/distroless/static-debian11:nonroot as distroless-static
 
 ############# builder-base #############
-FROM golang:1.18.1 AS builder-base
+FROM golang:1.18.4 AS builder-base
 
 WORKDIR /go/src/github.com/gardener/gardener
 

diff --git a/Makefile b/Makefile
@@ -267,12 +267,13 @@ kind2-up kind2-down: TARGET_SUFFIX := 2
 
 kind-up kind2-up: $(KIND)
 ifeq ($(MAKECMDGOALS), kind-up)
-	mkdir -m 775 -p $(REPO_ROOT)/dev/local-backupbuckets
+	mkdir -m 775 -p $(REPO_ROOT)/dev/local-backupbuckets $(REPO_ROOT)/dev/local-registry
 endif
 	$(KIND) create cluster --name gardener-local$(TARGET_SUFFIX) --config $(REPO_ROOT)/example/gardener-local/kind$(TARGET_SUFFIX)/cluster-$(KIND_ENV).yaml --kubeconfig $(KUBECONFIG)
 	docker exec gardener-local$(TARGET_SUFFIX)-control-plane sh -c "sysctl fs.inotify.max_user_instances=8192" # workaround https://kind.sigs.k8s.io/docs/user/known-issues/#pod-errors-due-to-too-many-open-files
 	cp $(KUBECONFIG) $(REPO_ROOT)/example/provider-local/seed-kind$(TARGET_SUFFIX)/base/kubeconfig
 	kubectl apply -k $(REPO_ROOT)/example/gardener-local/calico --server-side
+	kubectl apply -k $(REPO_ROOT)/example/gardener-local/metrics-server --server-side
 
 kind-down kind2-down: $(KIND)
 	$(KIND) delete cluster --name gardener-local$(TARGET_SUFFIX)
@@ -285,7 +286,9 @@ endif
 gardener-up gardener-down gardenlet-kind2-up gardenlet-kind2-down: export SKAFFOLD_LABEL = skaffold.dev/run-id=gardener-local
 
 gardener-up: $(SKAFFOLD) $(HELM)
-	$(SKAFFOLD) run
+	kubectl apply -k $(REPO_ROOT)/example/gardener-local/registry --server-side
+	kubectl wait --for=condition=available deployment -l app=registry -n registry --timeout=2m
+	SKAFFOLD_DEFAULT_REPO=localhost:5001 SKAFFOLD_PUSH=true $(SKAFFOLD) run
 
 gardener-down: $(SKAFFOLD) $(HELM)
 	@# delete stuff gradually in the right order, otherwise several dependencies will prevent the cleanup from succeeding
@@ -304,7 +307,7 @@ gardener-down: $(SKAFFOLD) $(HELM)
 gardenlet-kind2-up: $(SKAFFOLD) $(HELM)
 	$(SKAFFOLD) deploy -m kind2-env -p kind2 --kubeconfig=$(GARDENER_LOCAL_KUBECONFIG)
 	@# define GARDENER_LOCAL_KUBECONFIG so that it can be used by skaffold when checking whether the seed managed by this gardenlet is ready
-	GARDENER_LOCAL_KUBECONFIG=$(GARDENER_LOCAL_KUBECONFIG) $(SKAFFOLD) run -m provider-local,gardenlet -p kind2
+	GARDENER_LOCAL_KUBECONFIG=$(GARDENER_LOCAL_KUBECONFIG) SKAFFOLD_DEFAULT_REPO=localhost:5001 SKAFFOLD_PUSH=true $(SKAFFOLD) run -m provider-local,gardenlet -p kind2
 
 gardenlet-kind2-down: $(SKAFFOLD) $(HELM)
 	$(SKAFFOLD) delete -m kind2-env -p kind2 --kubeconfig=$(GARDENER_LOCAL_KUBECONFIG)
@@ -333,10 +336,10 @@ test-e2e-local-migration: $(GINKGO)
 
 test-e2e-local: $(GINKGO)
 	@# run at maximum 5 tests in parallel for now until we have better experience of how much load a single prow pod can take
-	./hack/test-e2e-local.sh --procs=5 --label-filter="Shoot && default"
+	./hack/test-e2e-local.sh --procs=5 --label-filter="ManagedSeed || (Shoot && default)"
 
 ci-e2e-kind: $(KIND)
 	./hack/ci-e2e-kind.sh
 
 ci-e2e-kind-migration: $(KIND)
-	./hack/ci-e2e-kind-migration.sh
+	./hack/ci-e2e-kind-migration.sh
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v1.51.0-dev
+v1.52.0-dev
diff --git a/charts/gardener/gardenlet/charts/runtime/templates/clusterrole-gardenlet.yaml b/charts/gardener/gardenlet/charts/runtime/templates/clusterrole-gardenlet.yaml
@@ -140,6 +140,7 @@ rules:
   - workloadgroups.networking.istio.io
   - telemetries.telemetry.istio.io
   - wasmplugins.extensions.istio.io
+  - proxyconfigs.networking.istio.io
   verbs:
   - delete
 - apiGroups:

diff --git a/charts/gardener/provider-local/extension/templates/deployment.yaml b/charts/gardener/provider-local/extension/templates/deployment.yaml
@@ -33,7 +33,7 @@ spec:
       labels:
 {{ include "labels" . | indent 8 }}
     spec:
-      priorityClassName: {{ include "name" . }}
+      priorityClassName: gardener-system-900
       serviceAccountName: {{ include "name" . }}
       containers:
       - name: {{ include "name" . }}
@@ -127,4 +127,4 @@ spec:
       - name: backup-path
         hostPath:
           path: {{ .Values.controllers.backupbucket.containerMountPath }}
-          type: Directory
+          type: DirectoryOrCreate
diff --git a/charts/gardener/provider-local/extension/templates/priorityclass.yaml b/charts/gardener/provider-local/extension/templates/priorityclass.yaml
diff --git a/...ardener/provider-local/internal/machine-controller-manager/seed/templates/deployment.yaml b/...ardener/provider-local/internal/machine-controller-manager/seed/templates/deployment.yaml
@@ -35,6 +35,7 @@ spec:
 {{ toYaml .Values.podLabels | indent 8 }}
 {{- end }}
     spec:
+      priorityClassName: gardener-system-300
       serviceAccountName: machine-controller-manager
       terminationGracePeriodSeconds: 5
       containers:

diff --git a/.../internal/shoot-system-components/charts/local-path-provisioner/templates/deployment.yaml b/.../internal/shoot-system-components/charts/local-path-provisioner/templates/deployment.yaml
@@ -19,6 +19,7 @@ spec:
       labels:
         app: local-path-provisioner
     spec:
+      priorityClassName: system-cluster-critical
       serviceAccountName: local-path-provisioner-service-account
       containers:
         - name: local-path-provisioner