This PR improves the skaffold setup of the extension

The change incorporates the changes from gardener/gardener#7757 and gardener/gardener-extension-shoot-rsyslog-relp#5.

It simplifies the skaffold setup and drops the ControllerRegistration chart (`./charts/registration`). The `make extension-up` target is now fixed and invoked by the `make ci-e2e-kind` target now.

Makefile

@@ -177,16 +177,3 @@ extension-dev: $(SKAFFOLD) $(HELM)
 
 extension-down: $(SKAFFOLD) $(HELM)
 	$(SKAFFOLD) delete
-
-# use static label for skaffold to prevent rolling all gardener components on every `skaffold` invocation
-admission-up admission-down: export SKAFFOLD_LABEL = skaffold.dev/run-id=admission-local
-admission-%: export SKAFFOLD_FILENAME = skaffold-admission.yaml
-
-admission-up: $(SKAFFOLD) $(KIND) $(HELM)
-	$(SKAFFOLD) run
-
-admission-dev: $(SKAFFOLD) $(HELM)
-	$(SKAFFOLD) dev --cleanup=false --trigger=manual
-
-admission-down: $(SKAFFOLD) $(HELM)
-	$(SKAFFOLD) delete

charts/admission/charts/runtime/templates/deployment.yaml

@@ -23,6 +23,7 @@ spec:
         # TODO(ialidzhikov): Double check whether we need these NetworkPolicy labels.
         networking.gardener.cloud/to-dns: allowed
         networking.resources.gardener.cloud/to-virtual-garden-kube-apiserver-tcp-443: allowed
+        networking.gardener.cloud/to-runtime-apiserver: allowed
 {{ include "labels" . | indent 8 }}
     spec:
       {{- if not .Values.global.virtualGarden.enabled }}

charts/gardener-extension-registry-cache/doc.go

@@ -12,10 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:generate sh -c "../../vendor/github.com/gardener/gardener/hack/generate-controller-registration.sh extension-registry-cache . $(cat ../../VERSION) ../../example/registration/controller-registration.yaml Extension:registry-cache"
-//go:generate cp ../../example/registration/controller-registration.yaml ../../charts/registration/templates/controller-registration.yaml
-//go:generate sh -c "sed -i 's/    image:/{{ toYaml .Values.values | indent 4 }}/g' ../../charts/registration/templates/controller-registration.yaml"
-//go:generate sh -c "sed -i 's/      tag: .*//g' ../../charts/registration/templates/controller-registration.yaml"
+//go:generate sh -c "../../vendor/github.com/gardener/gardener/hack/generate-controller-registration.sh extension-registry-cache . $(cat ../../VERSION) ../../example/controller-registration.yaml Extension:registry-cache"
 
 // Package chart enables go:generate support for generating the correct controller registration.
 package chart

charts/gardener-extension-registry-cache/templates/_helpers.tpl

@@ -7,14 +7,6 @@ apiVersion: config.registry.extensions.gardener.cloud/v1alpha1
 kind: Configuration
 {{- end }}
 
-{{-  define "image" -}}
-  {{- if hasPrefix "sha256:" .Values.image.tag }}
-  {{- printf "%s@%s" .Values.image.repository .Values.image.tag }}
-  {{- else }}
-  {{- printf "%s:%s" .Values.image.repository .Values.image.tag }}
-  {{- end }}
-{{- end }}
-
 {{- define "leaderelectionid" -}}
 extension-registry-cache-leader-election
 {{- end -}}

charts/gardener-extension-registry-cache/templates/deployment.yaml

@@ -39,8 +39,8 @@ spec:
       serviceAccountName: gardener-extension-registry-cache
       containers:
       - name: gardener-extension-registry-cache
-        image: {{ include "image" . }}
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        image: {{ .Values.image }}
+        imagePullPolicy: {{ .Values.imagePullPolicy }}
         args:
         - --config=/etc/registry-cache/config.yaml
         - --max-concurrent-reconciles={{ .Values.controllers.concurrentSyncs }}

charts/gardener-extension-registry-cache/values.yaml

@@ -1,7 +1,5 @@
-image:
-  repository: eu.gcr.io/gardener-project/gardener/extensions/registry-cache
-  tag: latest
-  pullPolicy: IfNotPresent
+image: eu.gcr.io/gardener-project/gardener/extensions/registry-cache:latest
+imagePullPolicy: IfNotPresent
 
 leaderElection:
   resourceLock: leases

example/controller-registration.yaml

@@ -0,0 +1,24 @@
+---
+apiVersion: core.gardener.cloud/v1beta1
+kind: ControllerDeployment
+metadata:
+  name: extension-registry-cache
+type: helm
+providerConfig:
+  chart: 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
+  values:
+    image: eu.gcr.io/gardener-project/gardener/extensions/registry-cache:v0.2.0-dev
+---
+apiVersion: core.gardener.cloud/v1beta1
+kind: ControllerRegistration
+metadata:
+  name: extension-registry-cache
+  annotations:
+    security.gardener.cloud/pod-security-enforce: baseline
+spec:
+  deployment:
+    deploymentRefs:
+    - name: extension-registry-cache
+  resources:
+  - kind: Extension
+    type: registry-cache