Merge tag 'refs/tags/v0.24.0' into update-cilium-extension

# Conflicts:
#	go.mod
#	go.sum
#	pkg/controller/controlplane/add.go
#	pkg/webhook/controlplane/ensurer.go

Makefile

@@ -48,6 +48,15 @@ docker-image:
 docker-push:
 	@docker push $(IMAGE_PREFIX)/gardener-extension-provider-metal:$(IMAGE_TAG)
 
+.PHONY: update-crds
+update-crds:
+	go mod tidy
+	cp -f $(shell go list -mod=mod -m -f '{{.Dir}}' all | grep metal-stack/duros-controller)/config/crd/bases/* charts/internal/crds-storage/templates
+	cp -f $(shell go list -mod=mod -m -f '{{.Dir}}' all | grep metal-stack/firewall-controller-manager)/config/crds/* charts/internal/crds-firewall/templates/firewall-controller-manager/
+	cp -f $(shell go list -mod=mod -m -f '{{.Dir}}' all | grep metal-stack/firewall-controller/v2)/config/crd/bases/* charts/internal/crds-firewall/templates/firewall-controller/
+	cp -f charts/internal/crds-firewall/templates/firewall-controller-manager/*monitors.yaml charts/internal/shoot-control-plane/templates/firewall-controller-manager-crds/
+	cp -f charts/internal/crds-firewall/templates/firewall-controller/* charts/internal/shoot-control-plane/templates/firewall-controller-crds/
+
 #####################################################################
 # Rules for verification, formatting, linting, testing and cleaning #
 #####################################################################
@@ -79,7 +88,7 @@ generate: $(HELM) $(YQ)
 	@$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/generate-sequential.sh ./charts/... ./cmd/... ./pkg/...
 
 .PHONY: generate-in-docker
-generate-in-docker: revendor $(HELM)
+generate-in-docker: revendor update-crds $(HELM)
 	echo $(shell git describe --abbrev=0 --tags) > VERSION
 	docker run --rm -i$(DOCKER_TTY_ARG) \
 		--volume $(PWD):/go/src/github.com/metal-stack/gardener-extension-provider-metal golang:$(GO_VERSION) \

charts/charts.go

@@ -8,3 +8,6 @@ import (
 //
 //go:embed internal
 var InternalChart embed.FS
+
+// InternalChartsPath is the path to the internal charts
+const InternalChartsPath = "internal"

charts/images.yaml

@@ -3,14 +3,10 @@ images:
   sourceRepository: github.com/metal-stack/metal-ccm
   repository: ghcr.io/metal-stack/metal-ccm
   tag: "v0.7.13"
-- name: machine-controller-manager
-  sourceRepository: github.com/gardener/machine-controller-manager
-  repository: eu.gcr.io/gardener-project/gardener/machine-controller-manager
-  tag: "0.49.3"
 - name: machine-controller-manager-provider-metal
   sourceRepository: https://github.com/metal-stack/machine-controller-manager-provider-metal
   repository: ghcr.io/metal-stack/machine-controller-manager-provider-metal
-  tag: "v0.1.17"
+  tag: "v0.1.19"
 - name: droptailer
   sourceRepository: github.com/metal-stack/droptailer
   repository: ghcr.io/metal-stack/droptailer

charts/internal/control-plane/templates/cloud-controller-manager.yaml

@@ -6,6 +6,11 @@ metadata:
   labels:
     app: kubernetes
     role: cloud-controller-manager
+  annotations:
+    networking.resources.gardener.cloud/from-all-scrape-targets-allowed-ports: '[{"port":{{ include "cloud-controller-manager.port" . }},"protocol":"TCP"}]'
+    # TODO: This label approach is deprecated and no longer needed in the future. Remove them as soon as gardener/[email protected] has been released.
+    networking.resources.gardener.cloud/from-policy-pod-label-selector: all-scrape-targets
+    networking.resources.gardener.cloud/from-policy-allowed-ports: '[{"port":{{ include "cloud-controller-manager.port" . }},"protocol":"TCP"}]'
 spec:
   type: ClusterIP
   clusterIP: None
@@ -72,7 +77,7 @@ spec:
         - --authorization-kubeconfig=/var/run/secrets/gardener.cloud/shoot/generic-kubeconfig/kubeconfig
         - --tls-cert-file=/var/lib/cloud-controller-manager-server/tls.crt
         - --tls-private-key-file=/var/lib/cloud-controller-manager-server/tls.key
-        - --tls-cipher-suites={{ include "kubernetes.tlsCipherSuites" . | replace "\n" "," | trimPrefix "," }}
+        - --tls-cipher-suites={{ .Values.cloudControllerManager.tlsCipherSuites | join "," }}
         - --use-service-account-credentials
         - --v=2
         {{- range $index, $param := $.Values.cloudControllerManager.additionalParameters }}