diff --git a/.ci/pipeline_definitions b/.ci/pipeline_definitions index e8a7be13..a46cee49 100644 --- a/.ci/pipeline_definitions +++ b/.ci/pipeline_definitions @@ -3,6 +3,27 @@ # SPDX-License-Identifier: Apache-2.0 gardener-extension-shoot-lakom-service: + templates: + helmcharts: + - &shoot-lakom-service + name: shoot-lakom-service + dir: charts/gardener-extension-shoot-lakom-service + registry: europe-docker.pkg.dev/gardener-project/snapshots/charts/gardener/extensions + mappings: + - ref: ocm-resource:gardener-extension-shoot-lakom-service.repository + attribute: image.repository + - ref: ocm-resource:gardener-extension-shoot-lakom-service.tag + attribute: image.tag + - &lakom + name: lakom + dir: charts/lakom + registry: europe-docker.pkg.dev/gardener-project/snapshots/charts/gardener/extensions + mappings: + - ref: ocm-resource:lakom.repository + attribute: image.repository + - ref: ocm-resource:lakom.tag + attribute: image.tag + base_definition: traits: version: @@ -32,6 +53,10 @@ gardener-extension-shoot-lakom-service: draft_release: ~ options: public_build_logs: true + publish: + helmcharts: + - *shoot-lakom-service + - *lakom pull-request: traits: pull-request: ~ @@ -40,6 +65,10 @@ gardener-extension-shoot-lakom-service: - repository: europe-docker.pkg.dev/gardener-project/releases options: public_build_logs: true + publish: + helmcharts: + - *shoot-lakom-service + - *lakom release: traits: version: @@ -54,6 +83,11 @@ gardener-extension-shoot-lakom-service: lakom: image: europe-docker.pkg.dev/gardener-project/releases/gardener/extensions/lakom tag_as_latest: true + helmcharts: + - <<: *shoot-lakom-service + registry: europe-docker.pkg.dev/gardener-project/releases/charts/gardener/extensions + - <<: *lakom + registry: europe-docker.pkg.dev/gardener-project/releases/charts/gardener/extensions release: nextversion: 'bump_minor' next_version_callback: '.ci/prepare_release' diff --git a/charts/gardener-extension-shoot-lakom-service/templates/deployment.yaml b/charts/gardener-extension-shoot-lakom-service/templates/deployment.yaml index 4c13b24d..ff484a7f 100644 --- a/charts/gardener-extension-shoot-lakom-service/templates/deployment.yaml +++ b/charts/gardener-extension-shoot-lakom-service/templates/deployment.yaml @@ -69,7 +69,8 @@ spec: type: RuntimeDefault containers: - name: gardener-extension-{{ .Values.serviceName }} - image: {{ .Values.image }} + image: {{ include "image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy }} args: - --config=/etc/lakom-service/config.yaml - --lifecycle-max-concurrent-reconciles={{ .Values.controllers.lifecycle.concurrentSyncs }} diff --git a/charts/gardener-extension-shoot-lakom-service/values.yaml b/charts/gardener-extension-shoot-lakom-service/values.yaml index 22fd9d8d..3adf7783 100644 --- a/charts/gardener-extension-shoot-lakom-service/values.yaml +++ b/charts/gardener-extension-shoot-lakom-service/values.yaml @@ -5,7 +5,10 @@ serviceName: shoot-lakom-service replicaCount: 3 -image: europe-docker.pkg.dev/gardener-project/public/gardener/extensions/shoot-lakom-service +image: + repository: europe-docker.pkg.dev/gardener-project/public/gardener/extensions/shoot-lakom-service + tag: latest + pullPolicy: IfNotPresent imageVectorOverwrite: {} # images: diff --git a/example/controller-registration.yaml b/example/controller-registration.yaml index 85a21148..0d63dc70 100644 --- a/example/controller-registration.yaml +++ b/example/controller-registration.yaml @@ -5,9 +5,10 @@ metadata: name: shoot-lakom-service type: helm providerConfig: - chart: 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 + chart: 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 values: - image: europe-docker.pkg.dev/gardener-project/public/gardener/extensions/shoot-lakom-service:v0.13.0-dev + image: + tag: v0.13.0-dev --- apiVersion: core.gardener.cloud/v1beta1 kind: ControllerRegistration diff --git a/example/kustomization.yaml b/example/kustomization.yaml index 1ec8d82f..5514a25f 100644 --- a/example/kustomization.yaml +++ b/example/kustomization.yaml @@ -6,28 +6,3 @@ kind: Kustomization resources: - controller-registration.yaml - -patches: -- path: lakom/skaffold/patch-imagevector-overwrite.yaml -- patch: | - - op: replace - path: /providerConfig/values/image - value: local-skaffold/gardener-extension-shoot-lakom-service - - op: add - path: /providerConfig/values/controllers - value: - allowUntrustedImages: true - allowInsecureRegistries: true - cosignPublicKeys: - publicKeys: - - name: example-01 - algorithm: RSASSA-PKCS1-v1_5-SHA256 - key: |- - -----BEGIN PUBLIC KEY----- - MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEAKZef+D07q1AyXxf8xw3L23TgDSq - Scitl0xDpdLGpODUZXG6LbWY3QXS6yhCt0MZH6+Jf5l/8daO7HDRRvbQMg== - -----END PUBLIC KEY----- - target: - group: core.gardener.cloud - kind: ControllerDeployment - name: shoot-lakom-service diff --git a/hack/skaffold-image.sh b/hack/skaffold-image.sh new file mode 100755 index 00000000..8091f474 --- /dev/null +++ b/hack/skaffold-image.sh @@ -0,0 +1,23 @@ +# SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Gardener contributors +# +# SPDX-License-Identifier: Apache-2.0 + +# See skaffold-imagevector.sh for documentation + +set -o pipefail +set -o errexit + +image_repo=$(echo $SKAFFOLD_IMAGE | cut -d':' -f1,2) +image_tag=$(echo $SKAFFOLD_IMAGE | cut -d':' -f3) + +cat < local-setup/patch-image.yaml +apiVersion: core.gardener.cloud/v1beta1 +kind: ControllerDeployment +metadata: + name: shoot-lakom-service +providerConfig: + values: + image: + repository: ${image_repo} + tag: ${image_tag} +EOF diff --git a/hack/skaffold-imagevector.sh b/hack/skaffold-imagevector.sh index 89e075b4..3eef9805 100755 --- a/hack/skaffold-imagevector.sh +++ b/hack/skaffold-imagevector.sh @@ -21,9 +21,7 @@ set -o errexit image_repo=$(echo $SKAFFOLD_IMAGE | cut -d':' -f1,2) image_tag=$(echo $SKAFFOLD_IMAGE | cut -d':' -f3) -mkdir -p example/lakom/skaffold - -cat < example/lakom/skaffold/patch-imagevector-overwrite.yaml +cat < local-setup/patch-imagevector-overwrite.yaml apiVersion: core.gardener.cloud/v1beta1 kind: ControllerDeployment metadata: diff --git a/local-setup/.gitignore b/local-setup/.gitignore new file mode 100644 index 00000000..e9486d6f --- /dev/null +++ b/local-setup/.gitignore @@ -0,0 +1,2 @@ +patch-image.yaml +patch-imagevector-overwrite.yaml diff --git a/local-setup/kustomization.yaml b/local-setup/kustomization.yaml index cf58e6ec..e1399bf9 100644 --- a/local-setup/kustomization.yaml +++ b/local-setup/kustomization.yaml @@ -6,3 +6,26 @@ kind: Kustomization resources: - ../example + +patches: +- path: patch-image.yaml +- path: patch-imagevector-overwrite.yaml +- patch: | + - op: add + path: /providerConfig/values/controllers + value: + allowUntrustedImages: true + allowInsecureRegistries: true + cosignPublicKeys: + publicKeys: + - name: example-01 + algorithm: RSASSA-PKCS1-v1_5-SHA256 + key: |- + -----BEGIN PUBLIC KEY----- + MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEAKZef+D07q1AyXxf8xw3L23TgDSq + Scitl0xDpdLGpODUZXG6LbWY3QXS6yhCt0MZH6+Jf5l/8daO7HDRRvbQMg== + -----END PUBLIC KEY----- + target: + group: core.gardener.cloud + kind: ControllerDeployment + name: shoot-lakom-service diff --git a/skaffold.yaml b/skaffold.yaml index 36b937d0..d255e548 100644 --- a/skaffold.yaml +++ b/skaffold.yaml @@ -18,6 +18,9 @@ build: # This requires that the admission controller is built before this image. requires: - image: local-skaffold/lakom + hooks: + after: + - command: ["sh", "hack/skaffold-image.sh"] ko: # The dependencies section configures what files Skaffold should watch for changes when in dev mode. # These dependencies can be updated using a skaffold script found in the hack dir