diff --git a/Makefile b/Makefile index 0f417d3d..082cda05 100644 --- a/Makefile +++ b/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 diff --git a/charts/admission/charts/runtime/templates/deployment.yaml b/charts/admission/charts/runtime/templates/deployment.yaml index 7e25d1ad..9e5cfc0b 100644 --- a/charts/admission/charts/runtime/templates/deployment.yaml +++ b/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 }} diff --git a/charts/gardener-extension-registry-cache/doc.go b/charts/gardener-extension-registry-cache/doc.go index fc8c4af5..fb990747 100644 --- a/charts/gardener-extension-registry-cache/doc.go +++ b/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 diff --git a/charts/gardener-extension-registry-cache/templates/_helpers.tpl b/charts/gardener-extension-registry-cache/templates/_helpers.tpl index 4be46364..bef67c54 100644 --- a/charts/gardener-extension-registry-cache/templates/_helpers.tpl +++ b/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 -}} diff --git a/charts/gardener-extension-registry-cache/templates/deployment.yaml b/charts/gardener-extension-registry-cache/templates/deployment.yaml index 5d1a7648..34b2e7f1 100644 --- a/charts/gardener-extension-registry-cache/templates/deployment.yaml +++ b/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 }} diff --git a/charts/gardener-extension-registry-cache/values.yaml b/charts/gardener-extension-registry-cache/values.yaml index da64482e..ef6ba447 100644 --- a/charts/gardener-extension-registry-cache/values.yaml +++ b/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 diff --git a/charts/registration/Chart.yaml b/charts/registration/Chart.yaml deleted file mode 100644 index 5713e5b4..00000000 --- a/charts/registration/Chart.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: v1 -appVersion: "1.0" -description: A Helm chart for the Gardener registry cache extension registration -name: gardener-extension-registry-cache-registration -version: 0.1.0 diff --git a/charts/registration/templates/controller-registration.yaml b/charts/registration/templates/controller-registration.yaml deleted file mode 100644 index 413d91e7..00000000 --- a/charts/registration/templates/controller-registration.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -apiVersion: core.gardener.cloud/v1beta1 -kind: ControllerDeployment -metadata: - name: extension-registry-cache -type: helm -providerConfig: - chart: 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 - values: -{{ toYaml .Values.values | indent 4 }} - ---- -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 diff --git a/charts/registration/values.yaml b/charts/registration/values.yaml deleted file mode 100644 index d6212f29..00000000 --- a/charts/registration/values.yaml +++ /dev/null @@ -1 +0,0 @@ -values: {} diff --git a/example/controller-registration.yaml b/example/controller-registration.yaml new file mode 100644 index 00000000..e2c11fc7 --- /dev/null +++ b/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 diff --git a/example/registration/controller-registration.yaml b/example/registration/controller-registration.yaml deleted file mode 100644 index d0970d17..00000000 --- a/example/registration/controller-registration.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -apiVersion: core.gardener.cloud/v1beta1 -kind: ControllerDeployment -metadata: - name: extension-registry-cache -type: helm -providerConfig: - chart: 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 - values: - image: - tag: 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 diff --git a/example/registration/kustomization.yaml b/example/registration/kustomization.yaml deleted file mode 100644 index 80cd76ba..00000000 --- a/example/registration/kustomization.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: -- controller-registration.yaml - -patchesStrategicMerge: -- patch-registration.yaml -- patch-deployment.yaml diff --git a/example/registration/patch-deployment.yaml b/example/registration/patch-deployment.yaml deleted file mode 100644 index 2da37120..00000000 --- a/example/registration/patch-deployment.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: core.gardener.cloud/v1beta1 -kind: ControllerDeployment -metadata: - name: extension-registry-cache -type: helm -providerConfig: - values: - image: - tag: latest diff --git a/example/registration/patch-registration.yaml b/example/registration/patch-registration.yaml deleted file mode 100644 index 208d0bb2..00000000 --- a/example/registration/patch-registration.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: core.gardener.cloud/v1beta1 -kind: ControllerRegistration -metadata: - name: extension-registry-cache -spec: - deployment: - policy: Always diff --git a/hack/ci-e2e-kind.sh b/hack/ci-e2e-kind.sh index e94757ec..a5ac6dcd 100755 --- a/hack/ci-e2e-kind.sh +++ b/hack/ci-e2e-kind.sh @@ -46,6 +46,5 @@ trap '{ make -C "$REPO_ROOT/gardener" gardener-up make extension-up make test-e2e-local -# TODO: make extension-down currently fails. When we fix it, we can execute it during the tear down. -# make extension-down +make extension-down make -C "$REPO_ROOT/gardener" gardener-down diff --git a/skaffold-admission.yaml b/skaffold-admission.yaml deleted file mode 100644 index 278b76bc..00000000 --- a/skaffold-admission.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -apiVersion: skaffold/v2beta29 -kind: Config -metadata: - name: admission -build: - artifacts: - - image: eu.gcr.io/gardener-project/gardener/extensions/registry-cache-admission - ko: - main: ./cmd/gardener-extension-registry-cache-admission -deploy: - helm: - releases: - - name: gardener-extension-registry-cache-admission - chartPath: charts/admission - namespace: garden - artifactOverrides: - global: - image: eu.gcr.io/gardener-project/gardener/extensions/registry-cache-admission - imageStrategy: - helm: {} - valuesFiles: - - example/admission/values.yaml diff --git a/skaffold.yaml b/skaffold.yaml index c6645df3..963f6312 100644 --- a/skaffold.yaml +++ b/skaffold.yaml @@ -1,5 +1,5 @@ --- -apiVersion: skaffold/v2beta29 +apiVersion: skaffold/v4beta3 kind: Config metadata: name: extension @@ -8,13 +8,35 @@ build: - image: eu.gcr.io/gardener-project/gardener/extensions/registry-cache ko: main: ./cmd/gardener-extension-registry-cache +resourceSelector: + allow: + # instruct skaffold to inject the built image reference into the image field in our ControllerDeployment + - groupKind: ControllerDeployment.core.gardener.cloud + image: [".*"] +manifests: + rawYaml: + - example/controller-registration.yaml +deploy: + kubectl: {} +--- +apiVersion: skaffold/v4beta3 +kind: Config +metadata: + name: admission +build: + artifacts: + - image: eu.gcr.io/gardener-project/gardener/extensions/registry-cache-admission + ko: + main: ./cmd/gardener-extension-registry-cache-admission deploy: helm: releases: - - name: gardener-extension-registry-cache-registration - chartPath: charts/registration - artifactOverrides: - values: - image: eu.gcr.io/gardener-project/gardener/extensions/registry-cache - imageStrategy: - helm: {} + - name: gardener-extension-registry-cache-admission + namespace: garden + wait: true + chartPath: charts/admission + valuesFiles: + - example/admission/values.yaml + setValueTemplates: + runtime.image.repository: '{{.IMAGE_REPO_eu_gcr_io_gardener_project_gardener_extensions_registry_cache_admission}}' + runtime.image.tag: '{{.IMAGE_TAG_eu_gcr_io_gardener_project_gardener_extensions_registry_cache_admission}}@{{.IMAGE_DIGEST_eu_gcr_io_gardener_project_gardener_extensions_registry_cache_admission}}'