From 298e6648961a5b847d4cb578c3bd576cf28174d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Foks?= Date: Wed, 22 May 2024 13:05:55 +0200 Subject: [PATCH 1/2] Semantic versionining in ACM release images --- .../application-connector-manager.yaml | 57 +++++++++++++++++-- 1 file changed, 53 insertions(+), 4 deletions(-) diff --git a/prow/jobs/kyma-project/application-connector-manager/application-connector-manager.yaml b/prow/jobs/kyma-project/application-connector-manager/application-connector-manager.yaml index eb2203ccfc6d..536e9da02a95 100644 --- a/prow/jobs/kyma-project/application-connector-manager/application-connector-manager.yaml +++ b/prow/jobs/kyma-project/application-connector-manager/application-connector-manager.yaml @@ -56,13 +56,13 @@ presubmits: # runs on PRs postsubmits: # runs on main kyma-project/application-connector-manager: - - name: post-application-connector-manager-build + - name: main-application-connector-manager-build annotations: description: "Job to build application-connector operator for a release" owner: "framefrog" labels: prow.k8s.io/pubsub.project: "sap-kyma-prow" - prow.k8s.io/pubsub.runID: "post-application-connector-manager-build" + prow.k8s.io/pubsub.runID: "main-application-connector-manager-build" prow.k8s.io/pubsub.topic: "prowjobs" preset-sa-kyma-push-images: "true" preset-signify-prod-secret: "true" @@ -72,7 +72,6 @@ postsubmits: # runs on main cluster: trusted-workload max_concurrency: 10 branches: - - ^master$ - ^main$ spec: containers: @@ -108,6 +107,57 @@ postsubmits: # runs on main - name: signify-secret secret: secretName: signify-dev-secret + - name: release-application-connector-manager-build + annotations: + description: "Job to build application-connector operator for a release" + owner: "framefrog" + labels: + prow.k8s.io/pubsub.project: "sap-kyma-prow" + prow.k8s.io/pubsub.runID: "release-application-connector-manager-build" + prow.k8s.io/pubsub.topic: "prowjobs" + preset-sa-kyma-push-images: "true" + preset-signify-prod-secret: "true" + always_run: true + skip_report: false + decorate: true + cluster: trusted-workload + max_concurrency: 10 + branches: + - ^\d+\.\d+\.\d+(?:-.*)?$ + spec: + containers: + - image: "europe-docker.pkg.dev/kyma-project/prod/image-builder:v20240521-098832b4" + securityContext: + privileged: false + seccompProfile: + type: RuntimeDefault + allowPrivilegeEscalation: false + command: + - "/image-builder" + args: + - "--name=application-connector-manager" + - "--config=/config/kaniko-build-config.yaml" + - "--context=." + - "--dockerfile=Dockerfile" + - "--tag=$(PULL_BASE_REF)" + resources: + requests: + memory: 1.5Gi + cpu: 1 + volumeMounts: + - name: config + mountPath: /config + readOnly: true + - name: signify-secret + mountPath: /secret + readOnly: true + volumes: + - name: config + configMap: + name: kaniko-build-config + - name: signify-secret + secret: + secretName: signify-dev-secret - name: post-main-application-connector-manager-upgrade-latest-to-main annotations: description: "upgrade application-connector manager test" @@ -126,7 +176,6 @@ postsubmits: # runs on main cluster: trusted-workload max_concurrency: 10 branches: - - ^master$ - ^main$ extra_refs: - org: kyma-project From 5dba79c86663f03d4cd9004169043d83f3651b4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Foks?= Date: Wed, 22 May 2024 13:33:42 +0200 Subject: [PATCH 2/2] Remove ACM Prow template --- templates/data/generic_module_data.yaml | 112 ------------------------ 1 file changed, 112 deletions(-) delete mode 100644 templates/data/generic_module_data.yaml diff --git a/templates/data/generic_module_data.yaml b/templates/data/generic_module_data.yaml deleted file mode 100644 index 242363ec2b4b..000000000000 --- a/templates/data/generic_module_data.yaml +++ /dev/null @@ -1,112 +0,0 @@ -templates: - - from: generic.tmpl - render: - - to: ../../prow/jobs/kyma-project/application-connector-manager/application-connector-manager.yaml - localSets: - job_build: - skip_report: "false" - max_concurrency: "10" - decorate: "true" - branches: - - "^master$" - - "^main$" - pubsub_project: "sap-kyma-prow" - pubsub_topic: "prowjobs" - image: europe-docker.pkg.dev/kyma-project/prod/image-builder:v20240521-098832b4 - command: /image-builder - request_memory: "1.5Gi" - request_cpu: "1" - labels: - preset-sa-kyma-push-images: "true" - volumes: - - name: config - configMapName: kaniko-build-config - - name: signify-secret - secretName: signify-dev-secret - volumeMounts: - - name: config - mountPath: /config - readOnly: true - - name: signify-secret - mountPath: /secret - readOnly: true - limits: - limits_memory: 3Gi - limits_cpu: 2 - dind_job_k3d: - annotations: - labels: - preset-kyma-guard-bot-github-token: "true" - preset-kind-volume-mounts: "true" - preset-dind-enabled: "true" - image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-k3d:v20240521-eb926153 - command: "/init.sh" - request_memory: "4Gi" - request_cpu: "3" - limits_memory: "4Gi" - limits_cpu: "3" - jobConfigs: - - repoName: github.com/kyma-project/application-connector-manager - jobs: - - jobConfig: - global: - - image_buildpack-golang # takes latest golang image - - jobConfig_default - - jobConfig_presubmit - - jobConfig: - annotations: - owner: framefrog - description: application-connector operator build job - name: pre-application-connector-manager-build - always_run: true - args: - - "--name=application-connector-manager" - - "--config=/config/kaniko-build-config.yaml" - - "--context=." - - "--dockerfile=Dockerfile" - inheritedConfigs: - global: - - jobConfig_default - - jobConfig_presubmit - local: - - job_build - - jobConfig: - name: post-application-connector-manager-build - annotations: - owner: framefrog - description: Job to build application-connector operator for a release - always_run: true - labels: - preset-signify-prod-secret: "true" - args: - - "--name=application-connector-manager" - - "--config=/config/kaniko-build-config.yaml" - - "--context=." - - "--dockerfile=Dockerfile" - - '--tag={{`{{ .Env \"PULL_BASE_SHA\" }}`}}' - inheritedConfigs: - global: - - jobConfig_default - - jobConfig_postsubmit - local: - - job_build - - jobConfig: - name: post-main-application-connector-manager-upgrade-latest-to-main - annotations: - owner: framefrog - description: upgrade application-connector manager test - always_run: "true" - optional: "true" - args: - - bash - - -c - - | - make -C hack/ci k3d-upgrade-test - inheritedConfigs: - global: - - jobConfig_default - - privileged - - jobConfig_postsubmit # TODO: Prepare a Keda-Manager Image - - extra_refs_test-infra - local: - - dind_job_k3d