From acbac287ea7db977e586cf60a61cca0150fe40e2 Mon Sep 17 00:00:00 2001 From: Patryk Dobrowolski Date: Thu, 3 Oct 2024 14:33:23 +0200 Subject: [PATCH] cleanup of ko (#12055) * cleanup of ko * Bump image --- .ko.yaml | 7 -- .koapps.yaml | 21 ----- cmd/image-builder/images/buildkit/Dockerfile | 2 +- cmd/image-builder/images/kaniko/Dockerfile | 2 +- .../test-infra-autobump-config.yaml | 2 +- .../modules/cors-proxy/cors-proxy.tf | 2 +- .../github-webhook-gateway.tf | 2 +- .../gcs-bucket-mover.tf | 2 +- .../github-issue-creator.tf | 2 +- .../github-issue-finder.tf | 2 +- .../secrets-leak-log-scanner.tf | 2 +- .../security-dashboard-token.tf | 2 +- images/buildpack/go/test.sh | 1 - .../test-data/trustedSAUsage_test-data.jsonc | 8 +- pkg/securityconfig/securityconfig_test.go | 4 +- .../automated-approver_external-plugin.yaml | 2 +- .../external_secrets_checker_prow.yaml | 12 +-- ...ymaAutobumpBotGithubTokenTrustedUsage.yaml | 8 +- .../kymaBotGithubSapTokenTrustedUsage.yaml | 4 +- .../kymaBotGithubSecretTrustedUsage.yaml | 10 +-- .../pjtesterSecretsTrustedUsage.yaml | 4 +- .../saKymaPushImagesSecretTrustedUsage.yaml | 7 +- .../workloads/seccomp.yaml | 2 +- .../kyma-project/test-infra/image-syncer.yaml | 8 +- .../kyma-project/test-infra/ko-build.yaml | 82 ------------------ .../kyma-project/test-infra/kyma-bot.yaml | 4 +- .../kyma-project/test-infra/periodics.yaml | 30 +++---- .../kyma-project/test-infra/pjtester.yaml | 84 +++++++++---------- .../test-infra/prow-periodics.yaml | 6 +- .../kyma-project/test-infra/validation.yaml | 2 +- sec-scanners-config.yaml | 18 ++-- templates/config.yaml | 4 +- .../data/test-infra/image-syncer-data.yaml | 8 +- templates/data/test-infra/pjtester-data.yaml | 6 +- 34 files changed, 125 insertions(+), 237 deletions(-) delete mode 100644 .ko.yaml delete mode 100644 .koapps.yaml delete mode 100644 prow/jobs/kyma-project/test-infra/ko-build.yaml diff --git a/.ko.yaml b/.ko.yaml deleted file mode 100644 index 8b4489b7b425..000000000000 --- a/.ko.yaml +++ /dev/null @@ -1,7 +0,0 @@ -baseImageOverrides: - github.com/kyma-project/test-infra/cmd/tools/pjtester: europe-docker.pkg.dev/kyma-project/prod/testimages/alpine-git:v20241001-f0fc4ad0 - github.com/kyma-project/test-infra/cmd/markdown-index: europe-docker.pkg.dev/kyma-project/prod/testimages/alpine-git:v20241001-f0fc4ad0 - github.com/kyma-project/test-infra/cmd/external-plugins/automated-approver: europe-docker.pkg.dev/kyma-project/prod/testimages/alpine-git:v20241001-f0fc4ad0 -defaultPlatforms: - - linux/arm64 - - linux/amd64 diff --git a/.koapps.yaml b/.koapps.yaml deleted file mode 100644 index 0e07d19d6bc7..000000000000 --- a/.koapps.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apps: - - ko://github.com/kyma-project/test-infra/cmd/tools/pjtester - - ko://github.com/kyma-project/test-infra/cmd/image-url-helper - - ko://github.com/kyma-project/test-infra/cmd/markdown-index - - ko://github.com/kyma-project/test-infra/cmd/tools/usersmapchecker - - ko://github.com/kyma-project/test-infra/cmd/tools/gcscleaner - - ko://github.com/kyma-project/test-infra/cmd/tools/diskscollector - - ko://github.com/kyma-project/test-infra/cmd/tools/clusterscollector - - ko://github.com/kyma-project/test-infra/cmd/tools/vmscollector - - ko://github.com/kyma-project/test-infra/cmd/tools/ipcleaner - - ko://github.com/kyma-project/test-infra/cmd/tools/orphanremover - - ko://github.com/kyma-project/test-infra/cmd/tools/dnscollector - - ko://github.com/kyma-project/test-infra/cmd/tools/externalsecretschecker - - ko://github.com/kyma-project/test-infra/cmd/cloud-run/create-github-issue - - ko://github.com/kyma-project/test-infra/cmd/cloud-run/move-gcs-bucket - - ko://github.com/kyma-project/test-infra/cmd/cloud-run/scan-logs-for-secrets - - ko://github.com/kyma-project/test-infra/cmd/cloud-run/search-github-issue - - ko://github.com/kyma-project/test-infra/cmd/cloud-run/github-webhook-gateway - - ko://github.com/kyma-project/test-infra/cmd/cloud-run/cors-proxy - - ko://github.com/kyma-project/test-infra/cmd/external-plugins/automated-approver - - ko://github.com/kyma-project/test-infra/cmd/dashboard-token-proxy \ No newline at end of file diff --git a/cmd/image-builder/images/buildkit/Dockerfile b/cmd/image-builder/images/buildkit/Dockerfile index 4a8d4b0648ae..6c994731a3fe 100644 --- a/cmd/image-builder/images/buildkit/Dockerfile +++ b/cmd/image-builder/images/buildkit/Dockerfile @@ -5,7 +5,7 @@ RUN apk add --no-cache curl && \ | tar xz docker-credential-gcr \ && chmod +x docker-credential-gcr && mv docker-credential-gcr /usr/bin/ -FROM europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20240523-9d9961f1 AS builder +FROM europe-docker.pkg.dev/kyma-project/prod/buildpack-go:v20241003-9d1845c9 AS builder WORKDIR / COPY . /app/ diff --git a/cmd/image-builder/images/kaniko/Dockerfile b/cmd/image-builder/images/kaniko/Dockerfile index 5f1bff4e29c1..72bf6fd877ac 100644 --- a/cmd/image-builder/images/kaniko/Dockerfile +++ b/cmd/image-builder/images/kaniko/Dockerfile @@ -1,4 +1,4 @@ -FROM europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20240523-9d9961f1 AS builder +FROM europe-docker.pkg.dev/kyma-project/prod/buildpack-go:v20241003-9d1845c9 AS builder WORKDIR / COPY . /app/ diff --git a/configs/autobump-config/test-infra-autobump-config.yaml b/configs/autobump-config/test-infra-autobump-config.yaml index 0669bbf61d96..fbd312ccfe3b 100644 --- a/configs/autobump-config/test-infra-autobump-config.yaml +++ b/configs/autobump-config/test-infra-autobump-config.yaml @@ -108,7 +108,7 @@ prefixes: summarise: true consistentImages: false - name: "testimages" - prefix: "europe-docker.pkg.dev/kyma-project/prod/testimages/" + prefix: "europe-docker.pkg.dev/kyma-project/prod/" refConfigFile: "templates/config.yaml" stagingRefConfigFile: "templates/config.yaml" repo: "https://github.com/kyma-project/test-infra" diff --git a/configs/terraform/modules/cors-proxy/cors-proxy.tf b/configs/terraform/modules/cors-proxy/cors-proxy.tf index c22f50b04172..51485559f821 100644 --- a/configs/terraform/modules/cors-proxy/cors-proxy.tf +++ b/configs/terraform/modules/cors-proxy/cors-proxy.tf @@ -28,7 +28,7 @@ resource "google_cloud_run_service" "cors_proxy" { template { spec { containers { - image = "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/cors-proxy:v20241003-9d1845c9" + image = "europe-docker.pkg.dev/kyma-project/prod/cors-proxy:v20241002-aac0cb23" env { name = "COMPONENT_NAME" value = "cors-proxy" diff --git a/configs/terraform/modules/github-webhook-gateway/github-webhook-gateway.tf b/configs/terraform/modules/github-webhook-gateway/github-webhook-gateway.tf index 889e084aa760..43c7cb7fdd6d 100644 --- a/configs/terraform/modules/github-webhook-gateway/github-webhook-gateway.tf +++ b/configs/terraform/modules/github-webhook-gateway/github-webhook-gateway.tf @@ -67,7 +67,7 @@ resource "google_cloud_run_service" "github_webhook_gateway" { spec { service_account_name = google_service_account.github_webhook_gateway.email containers { - image = "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/github-webhook-gateway:v20241003-9d1845c9" + image = "europe-docker.pkg.dev/kyma-project/prod/github-webhook-gateway:v20241002-aac0cb23" env { name = "PROJECT_ID" value = var.gcp_project_id diff --git a/configs/terraform/modules/secrets-leaks-log-scanner/gcs-bucket-mover.tf b/configs/terraform/modules/secrets-leaks-log-scanner/gcs-bucket-mover.tf index 7437b19a514b..f60a70331b52 100644 --- a/configs/terraform/modules/secrets-leaks-log-scanner/gcs-bucket-mover.tf +++ b/configs/terraform/modules/secrets-leaks-log-scanner/gcs-bucket-mover.tf @@ -47,7 +47,7 @@ resource "google_cloud_run_service" "gcs_bucket_mover" { spec { service_account_name = google_service_account.gcs_bucket_mover.email containers { - image = "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/move-gcs-bucket:v20241003-9d1845c9" + image = "europe-docker.pkg.dev/kyma-project/prod/move-gcs-bucket:v20241002-aac0cb23" env { name = "PROJECT_ID" value = var.gcp_project_id diff --git a/configs/terraform/modules/secrets-leaks-log-scanner/github-issue-creator.tf b/configs/terraform/modules/secrets-leaks-log-scanner/github-issue-creator.tf index 9912265fb23c..4b133a06ef4e 100644 --- a/configs/terraform/modules/secrets-leaks-log-scanner/github-issue-creator.tf +++ b/configs/terraform/modules/secrets-leaks-log-scanner/github-issue-creator.tf @@ -24,7 +24,7 @@ resource "google_cloud_run_service" "github_issue_creator" { spec { service_account_name = google_service_account.github_issue_creator.email containers { - image = "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/create-github-issue:v20241003-9d1845c9" + image = "europe-docker.pkg.dev/kyma-project/prod/create-github-issue:v20241002-aac0cb23" env { name = "PROJECT_ID" value = var.gcp_project_id diff --git a/configs/terraform/modules/secrets-leaks-log-scanner/github-issue-finder.tf b/configs/terraform/modules/secrets-leaks-log-scanner/github-issue-finder.tf index 7d3100fe257d..967a6acd7150 100644 --- a/configs/terraform/modules/secrets-leaks-log-scanner/github-issue-finder.tf +++ b/configs/terraform/modules/secrets-leaks-log-scanner/github-issue-finder.tf @@ -24,7 +24,7 @@ resource "google_cloud_run_service" "github_issue_finder" { spec { service_account_name = google_service_account.github_issue_finder.email containers { - image = "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/search-github-issue:v20241003-9d1845c9" + image = "europe-docker.pkg.dev/kyma-project/prod/search-github-issue:v20241002-aac0cb23" env { name = "PROJECT_ID" value = var.gcp_project_id diff --git a/configs/terraform/modules/secrets-leaks-log-scanner/secrets-leak-log-scanner.tf b/configs/terraform/modules/secrets-leaks-log-scanner/secrets-leak-log-scanner.tf index 2e5614743c6c..9caa8cbdabac 100644 --- a/configs/terraform/modules/secrets-leaks-log-scanner/secrets-leak-log-scanner.tf +++ b/configs/terraform/modules/secrets-leaks-log-scanner/secrets-leak-log-scanner.tf @@ -23,7 +23,7 @@ resource "google_cloud_run_service" "secrets_leak_log_scanner" { spec { service_account_name = google_service_account.secrets_leak_log_scanner.email containers { - image = "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/scan-logs-for-secrets:v20241003-9d1845c9" #gitleaks:allow + image = "europe-docker.pkg.dev/kyma-project/prod/scan-logs-for-secrets:v20241002-aac0cb23" #gitleaks:allow env { name = "PROJECT_ID" value = var.gcp_project_id diff --git a/configs/terraform/modules/security-dashboard-token/security-dashboard-token.tf b/configs/terraform/modules/security-dashboard-token/security-dashboard-token.tf index ce5faa6e7e8e..32949d15a027 100644 --- a/configs/terraform/modules/security-dashboard-token/security-dashboard-token.tf +++ b/configs/terraform/modules/security-dashboard-token/security-dashboard-token.tf @@ -31,7 +31,7 @@ resource "google_cloud_run_service" "security_dashboard_token" { template { spec { containers { - image = "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/dashboard-token-proxy:v20241003-9d1845c9" #gitleaks:allow ignore gitleaks detection + image = "europe-docker.pkg.dev/kyma-project/prod/dashboard-token-proxy:v20241002-aac0cb23" #gitleaks:allow ignore gitleaks detection env { name = "CLIENT_SECRET" value_from { diff --git a/images/buildpack/go/test.sh b/images/buildpack/go/test.sh index 4892c8887c7f..79f3819f92b4 100755 --- a/images/buildpack/go/test.sh +++ b/images/buildpack/go/test.sh @@ -4,7 +4,6 @@ set -e docker run --rm "$IMG" bash -c ' set -e go version -ko version kubebuilder version kustomize version jobguard -help diff --git a/opa/gatekeeper/constraint-templates/test-data/trustedSAUsage_test-data.jsonc b/opa/gatekeeper/constraint-templates/test-data/trustedSAUsage_test-data.jsonc index 44c1e254dd1d..8a5afa7e8f18 100644 --- a/opa/gatekeeper/constraint-templates/test-data/trustedSAUsage_test-data.jsonc +++ b/opa/gatekeeper/constraint-templates/test-data/trustedSAUsage_test-data.jsonc @@ -19,9 +19,9 @@ }, { "command": [ - "/ko-app/entrypoint", + "/entrypoint", "init", - "/ko-app/entrypoint", + "/entrypoint", "/tekton/bin/entrypoint", "step-build-image" ], @@ -39,9 +39,9 @@ "containers": [ { "command": [ - "/ko-app/entrypoint", + "/entrypoint", "init", - "/ko-app/entrypoint", + "/entrypoint", "/tekton/bin/entrypoint", "step-build-image" ], diff --git a/pkg/securityconfig/securityconfig_test.go b/pkg/securityconfig/securityconfig_test.go index a9f68a501246..c7fc574e7b95 100644 --- a/pkg/securityconfig/securityconfig_test.go +++ b/pkg/securityconfig/securityconfig_test.go @@ -18,7 +18,7 @@ func TestLoadSecurityConfig(t *testing.T) { WantErr: false, ExpectedConfig: &SecurityConfig{ ModuleName: "test-infra", - Images: []string{"europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20230717-e09b0fee"}, + Images: []string{"europe-docker.pkg.dev/kyma-project/prod/buildpack-go:v20230717-e09b0fee"}, Whitesource: Whitesource{ Language: "golang-mod", SubProjects: true, @@ -27,7 +27,7 @@ func TestLoadSecurityConfig(t *testing.T) { }, FileContent: `module-name: test-infra protecode: - - europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20230717-e09b0fee + - europe-docker.pkg.dev/kyma-project/prod/buildpack-go:v20230717-e09b0fee whitesource: language: golang-mod subprojects: true diff --git a/prow/cluster/components/automated-approver_external-plugin.yaml b/prow/cluster/components/automated-approver_external-plugin.yaml index 23a5ef7dd0f4..2e25606f6fc8 100644 --- a/prow/cluster/components/automated-approver_external-plugin.yaml +++ b/prow/cluster/components/automated-approver_external-plugin.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: automated-approver - image: europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/automated-approver:v20241003-9d1845c9 + image: europe-docker.pkg.dev/kyma-project/prod/automated-approver:v20241002-aac0cb23 imagePullPolicy: Always args: - --dry-run=false diff --git a/prow/cluster/resources/external-secrets/external_secrets_checker_prow.yaml b/prow/cluster/resources/external-secrets/external_secrets_checker_prow.yaml index 258f51e2f679..cb0487140b82 100644 --- a/prow/cluster/resources/external-secrets/external_secrets_checker_prow.yaml +++ b/prow/cluster/resources/external-secrets/external_secrets_checker_prow.yaml @@ -13,10 +13,10 @@ spec: spec: containers: - name: secret-checker-untrusted - image: europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/externalsecretschecker:v20241003-9d1845c9 #gitleaks:allow + image: europe-docker.pkg.dev/kyma-project/prod/externalsecretschecker:v20241002-aac0cb23 #gitleaks:allow imagePullPolicy: IfNotPresent command: - - /ko-app/externalsecretschecker + - /externalsecretschecker args: - "--kubeconfig" - "/etc/kubeconfig/untrusted/config" @@ -49,10 +49,10 @@ spec: spec: containers: - name: secret-checker-trusted - image: europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/externalsecretschecker:v20241003-9d1845c9 #gitleaks:allow + image: europe-docker.pkg.dev/kyma-project/prod/externalsecretschecker:v20241002-aac0cb23 #gitleaks:allow imagePullPolicy: IfNotPresent command: - - /ko-app/externalsecretschecker + - /externalsecretschecker args: - "--kubeconfig" - "/etc/kubeconfig/trusted/config" @@ -85,10 +85,10 @@ spec: spec: containers: - name: secret-checker-prow - image: europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/externalsecretschecker:v20241003-9d1845c9 #gitleaks:allow + image: europe-docker.pkg.dev/kyma-project/prod/externalsecretschecker:v20241002-aac0cb23 #gitleaks:allow imagePullPolicy: IfNotPresent command: - - /ko-app/externalsecretschecker + - /externalsecretschecker args: - "--ignored-secrets" - "external-secrets/external-secrets-webhook,prow-monitoring/prometheus-prow-tls-assets,prow-monitoring/prometheus-prow,gmp-system/alertmanager,gmp-system/collection,gmp-system/rules,gatekeeper-system/gatekeeper-webhook-server-cert,prow-monitoring/alertmanager-prow-generated,prow-monitoring/alertmanager-prow-tls-assets-0,prow-monitoring/alertmanager-prow-web-config,prow-monitoring/prometheus-prow-tls-assets-0,prow-monitoring/prometheus-prow-web-config" diff --git a/prow/cluster/resources/gatekeeper-constraints/workloads/kymaAutobumpBotGithubTokenTrustedUsage.yaml b/prow/cluster/resources/gatekeeper-constraints/workloads/kymaAutobumpBotGithubTokenTrustedUsage.yaml index 8741b91aa123..7f72134dc601 100644 --- a/prow/cluster/resources/gatekeeper-constraints/workloads/kymaAutobumpBotGithubTokenTrustedUsage.yaml +++ b/prow/cluster/resources/gatekeeper-constraints/workloads/kymaAutobumpBotGithubTokenTrustedUsage.yaml @@ -13,18 +13,18 @@ spec: - kyma-autobump-bot-github-token trustedImages: # Prowjob name: post-test-infra-markdown-index-autobump - - image: "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/markdown-index:*" + - image: "europe-docker.pkg.dev/kyma-project/prod/markdown-index:*" command: - /tools/entrypoint args: [] - entrypoint_options: '^{.*"args":\["\/ko-app\/markdown-index","--config=configs\/autobump-config\/test-infra-markdown-index-autobump-config\.yaml","--labels-override=kind\/chore,area\/documentation"\],"container_name":"test",.*}$' + entrypoint_options: '^{.*"args":\["\\/markdown-index","--config=configs\/autobump-config\/test-infra-markdown-index-autobump-config\.yaml","--labels-override=kind\/chore,area\/documentation"\],"container_name":"test",.*}$' # Prowjob name: test-infra-image-detector-autobump # Prowjob name: post-test-infra-image-detector-autobump - - image: "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/image-detector:*" + - image: "europe-docker.pkg.dev/kyma-project/prod/image-detector:*" command: - /tools/entrypoint args: [] - entrypoint_options: '^{.*"args":\["\/ko-app\/image-detector","--prow-config=prow\/config\.yaml","--prow-jobs-dir=prow\/jobs","--terraform-dir=configs\/terraform","--sec-scanner-config=sec-scanners-config\.yaml","--kubernetes-dir=prow\/cluster\/components","--autobump-config=configs\/autobump-config\/test-infra-sec-config-autobump-config\.yaml"\],"container_name":"test",.*}$' + entrypoint_options: '^{.*"args":\["\\/image-detector","--prow-config=prow\/config\.yaml","--prow-jobs-dir=prow\/jobs","--terraform-dir=configs\/terraform","--sec-scanner-config=sec-scanners-config\.yaml","--kubernetes-dir=prow\/cluster\/components","--autobump-config=configs\/autobump-config\/test-infra-sec-config-autobump-config\.yaml"\],"container_name":"test",.*}$' # Prowjob name: ci-prow-autobump - image: "gcr.io/k8s-prow/generic-autobumper:*" command: diff --git a/prow/cluster/resources/gatekeeper-constraints/workloads/kymaBotGithubSapTokenTrustedUsage.yaml b/prow/cluster/resources/gatekeeper-constraints/workloads/kymaBotGithubSapTokenTrustedUsage.yaml index 1f85c668c087..e52d3b0fac8b 100644 --- a/prow/cluster/resources/gatekeeper-constraints/workloads/kymaBotGithubSapTokenTrustedUsage.yaml +++ b/prow/cluster/resources/gatekeeper-constraints/workloads/kymaBotGithubSapTokenTrustedUsage.yaml @@ -13,8 +13,8 @@ spec: - kyma-bot-github-sap-token trustedImages: # Prowjob name: pre-main-check-users-map - - image: "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/usersmapchecker:*" + - image: "europe-docker.pkg.dev/kyma-project/prod/usersmapchecker:*" command: - /tools/entrypoint args: [] - entrypoint_options: '^{.*"args":\["/ko-app/usersmapchecker"\],"container_name":"test",.*}$' + entrypoint_options: '^{.*"args":\["/usersmapchecker"\],"container_name":"test",.*}$' diff --git a/prow/cluster/resources/gatekeeper-constraints/workloads/kymaBotGithubSecretTrustedUsage.yaml b/prow/cluster/resources/gatekeeper-constraints/workloads/kymaBotGithubSecretTrustedUsage.yaml index 1f92811fd493..2b864c5b28a4 100644 --- a/prow/cluster/resources/gatekeeper-constraints/workloads/kymaBotGithubSecretTrustedUsage.yaml +++ b/prow/cluster/resources/gatekeeper-constraints/workloads/kymaBotGithubSecretTrustedUsage.yaml @@ -17,13 +17,13 @@ spec: - kyma-bot-github-token trustedImages: # rel-api-gateway-goreleaser - - image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:*" + - image: "europe-docker.pkg.dev/kyma-project/prod/buildpack-go:*" command: - /tools/entrypoint args: [] entrypoint_options: '^.*"args":\["\/bin\/bash","-c","mkdir -p \/prow-tools \\u0026\\u0026 ln -s \/usr\/local\/bin\/jobguard \/prow-tools\/jobguard \\u0026\\u0026 hack/release.sh"\],"container_name":"test",.*$' # rel-kyma-cli - - image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:*" + - image: "europe-docker.pkg.dev/kyma-project/prod/buildpack-go:*" command: - /tools/entrypoint args: [] @@ -40,17 +40,17 @@ spec: args: [] entrypoint_options: '^.*"args":\["\/home\/prow\/go\/src\/github\.com\/kyma-project\/test-infra\/prow\/scripts\/cluster-integration\/skr-aws-upgrade-integration-dev\.sh"\],"container_name":"test",.*$' # post-telemetry-manager-release-module - - image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-gcloud:*" + - image: "europe-docker.pkg.dev/kyma-project/prod/e2e-gcloud:*" command: - /tools/entrypoint args: [] entrypoint_options: '^.*"args":\["make","release"\],"container_name":"test",.*$' # pre-main-check-users-map - - image: "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/usersmapchecker:*" + - image: "europe-docker.pkg.dev/kyma-project/prod/usersmapchecker:*" command: - /tools/entrypoint args: [] - entrypoint_options: '^{.*"args":\["/ko-app/usersmapchecker"\],"container_name":"test",.*}$' + entrypoint_options: '^{.*"args":\["/usersmapchecker"\],"container_name":"test",.*}$' # sidecar - image: "gcr.io/k8s-prow/sidecar:*" command: [] diff --git a/prow/cluster/resources/gatekeeper-constraints/workloads/pjtesterSecretsTrustedUsage.yaml b/prow/cluster/resources/gatekeeper-constraints/workloads/pjtesterSecretsTrustedUsage.yaml index 7e3cbff8509e..ef9b0a29d942 100644 --- a/prow/cluster/resources/gatekeeper-constraints/workloads/pjtesterSecretsTrustedUsage.yaml +++ b/prow/cluster/resources/gatekeeper-constraints/workloads/pjtesterSecretsTrustedUsage.yaml @@ -15,11 +15,11 @@ spec: - pjtester-github-oauth-token trustedImages: # pull-test-infra-pjtester - - image: "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/pjtester:*" + - image: "europe-docker.pkg.dev/kyma-project/prod/pjtester:*" command: - /tools/entrypoint args: [] - entrypoint_options: '^{.*"args":\["\/ko-app\/pjtester","--github-token-path=\/etc\/github\/oauth"\],"container_name":"test",.*}$' + entrypoint_options: '^{.*"args":\["\\/pjtester","--github-token-path=\/etc\/github\/oauth"\],"container_name":"test",.*}$' # sidecar - image: "gcr.io/k8s-prow/sidecar:*" command: [] diff --git a/prow/cluster/resources/gatekeeper-constraints/workloads/saKymaPushImagesSecretTrustedUsage.yaml b/prow/cluster/resources/gatekeeper-constraints/workloads/saKymaPushImagesSecretTrustedUsage.yaml index 610108e35505..e3dacc9256aa 100644 --- a/prow/cluster/resources/gatekeeper-constraints/workloads/saKymaPushImagesSecretTrustedUsage.yaml +++ b/prow/cluster/resources/gatekeeper-constraints/workloads/saKymaPushImagesSecretTrustedUsage.yaml @@ -37,8 +37,7 @@ spec: - /tools/entrypoint args: [ ] entrypoint_options: '^{.*"args":.*,"container_name":"test",.*}$' - #post-test-infra-ko-build - - image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:*" + - image: "europe-docker.pkg.dev/kyma-project/prod/buildpack-go:*" command: - /tools/entrypoint args: [ ] @@ -48,8 +47,8 @@ spec: command: [ ] args: [ ] # image-syncer - - image: "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/image-syncer:*" + - image: "europe-docker.pkg.dev/kyma-project/prod/image-syncer:*" command: - /tools/entrypoint args: [ ] - entrypoint_options: '^{.*"args":\["\/ko-app/image-syncer","--images-file=cmd/image-syncer/external-images.yaml","--target-repo-auth-key=.*"\],"container_name":"test",.*}$' + entrypoint_options: '^{.*"args":\["\/image-syncer","--images-file=cmd/image-syncer/external-images.yaml","--target-repo-auth-key=.*"\],"container_name":"test",.*}$' diff --git a/prow/cluster/resources/gatekeeper-constraints/workloads/seccomp.yaml b/prow/cluster/resources/gatekeeper-constraints/workloads/seccomp.yaml index 4b3da2a001de..c9600d6c83b4 100644 --- a/prow/cluster/resources/gatekeeper-constraints/workloads/seccomp.yaml +++ b/prow/cluster/resources/gatekeeper-constraints/workloads/seccomp.yaml @@ -33,4 +33,4 @@ spec: - "europe-docker.pkg.dev/kyma-project/prod/test-infra/prow-tools:*" - "gcr.io/k8s-prow/generic-autobumper:*" - "gcr.io/k8s-prow/ghproxy:*" - - "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-gcloud:*" + - "europe-docker.pkg.dev/kyma-project/prod/e2e-gcloud:*" diff --git a/prow/jobs/kyma-project/test-infra/image-syncer.yaml b/prow/jobs/kyma-project/test-infra/image-syncer.yaml index 6ba06d8b4822..c1d29dc0a7da 100644 --- a/prow/jobs/kyma-project/test-infra/image-syncer.yaml +++ b/prow/jobs/kyma-project/test-infra/image-syncer.yaml @@ -22,14 +22,14 @@ presubmits: # runs on PRs - ^main$ spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/image-syncer:v20240918-20d00fb8" + - image: "europe-docker.pkg.dev/kyma-project/prod/image-syncer:v20240918-20d00fb8" securityContext: privileged: false seccompProfile: type: RuntimeDefault allowPrivilegeEscalation: false command: - - "/ko-app/image-syncer" + - "/image-syncer" args: - "--dry-run" - "--debug" @@ -61,14 +61,14 @@ postsubmits: # runs on main - ^main$ spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/image-syncer:v20240918-20d00fb8" + - image: "europe-docker.pkg.dev/kyma-project/prod/image-syncer:v20240918-20d00fb8" securityContext: privileged: false seccompProfile: type: RuntimeDefault allowPrivilegeEscalation: false command: - - "/ko-app/image-syncer" + - "/image-syncer" args: - "--images-file=cmd/image-syncer/external-images.yaml" - "--target-repo-auth-key=$(GOOGLE_APPLICATION_CREDENTIALS)" diff --git a/prow/jobs/kyma-project/test-infra/ko-build.yaml b/prow/jobs/kyma-project/test-infra/ko-build.yaml deleted file mode 100644 index 7897b2e2a258..000000000000 --- a/prow/jobs/kyma-project/test-infra/ko-build.yaml +++ /dev/null @@ -1,82 +0,0 @@ -presubmits: - kyma-project/test-infra: - - name: pull-test-infra-ko-build - decorate: true - cluster: untrusted-workload - run_if_changed: ^development/.*.go|cmd/.*.go|^.koapps.yaml|^.ko.yaml|^go.mod|^images/ - annotations: - owner: neighbors - description: Builds go-based toolkit in one go - labels: - prow.k8s.io/pubsub.project: "sap-kyma-prow" - prow.k8s.io/pubsub.runID: "pull-test-infra-ko-build" - prow.k8s.io/pubsub.topic: "prowjobs" - spec: - containers: - - image: europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20241001-f0fc4ad0 - env: - - name: KO_DOCKER_REPO - value: europe-docker.pkg.dev/kyma-project/prod/test-infra - command: ["ko"] - args: - - resolve - - -f - - .koapps.yaml - - --push=false - - --base-import-paths - - -j4 - securityContext: - privileged: false - seccompProfile: - type: RuntimeDefault - allowPrivilegeEscalation: false - resources: - requests: - memory: 6Gi - cpu: 3 - limits: - memory: 6Gi - cpu: 3 -postsubmits: - kyma-project/test-infra: - - name: post-test-infra-ko-build - decorate: true - cluster: trusted-workload - run_if_changed: ^development/.*.go|cmd/.*.go|^.koapps.yaml|^.ko.yaml|^go.mod|^images/ - annotations: - owner: neighbors - description: Builds go-based toolkit in one go - labels: - preset-sa-kyma-push-images: "true" - prow.k8s.io/pubsub.project: "sap-kyma-prow" - prow.k8s.io/pubsub.runID: "post-test-infra-ko-build" - prow.k8s.io/pubsub.topic: "prowjobs" - branches: - - ^main$ - spec: - containers: - - image: europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20241001-f0fc4ad0 - env: - - name: KO_DOCKER_REPO - value: europe-docker.pkg.dev/kyma-project/prod/test-infra/ko - command: ["bash", "-c"] - args: - - |- - TAG="$(date +v%Y%m%d)-${PULL_BASE_SHA::8}" - ko resolve -f .koapps.yaml \ - --base-import-paths \ - --tags=latest \ - --tags="$TAG" \ - -j4 - securityContext: - privileged: false - seccompProfile: - type: RuntimeDefault - allowPrivilegeEscalation: false - resources: - requests: - memory: 6Gi - cpu: 3 - limits: - memory: 6Gi - cpu: 3 diff --git a/prow/jobs/kyma-project/test-infra/kyma-bot.yaml b/prow/jobs/kyma-project/test-infra/kyma-bot.yaml index e50bd7dd8428..1c4f7650fa84 100644 --- a/prow/jobs/kyma-project/test-infra/kyma-bot.yaml +++ b/prow/jobs/kyma-project/test-infra/kyma-bot.yaml @@ -22,7 +22,7 @@ presubmits: # runs on PRs spec: serviceAccountName: sa-prowjob-gcp-logging-client containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/usersmapchecker:v20241003-9d1845c9" + - image: "europe-docker.pkg.dev/kyma-project/prod/usersmapchecker:v20241002-aac0cb23" imagePullPolicy: Always securityContext: privileged: false @@ -30,7 +30,7 @@ presubmits: # runs on PRs type: RuntimeDefault allowPrivilegeEscalation: false command: - - "/ko-app/usersmapchecker" + - "/usersmapchecker" resources: requests: memory: 3Gi diff --git a/prow/jobs/kyma-project/test-infra/periodics.yaml b/prow/jobs/kyma-project/test-infra/periodics.yaml index 34b35d7c57cb..c3da17b46785 100644 --- a/prow/jobs/kyma-project/test-infra/periodics.yaml +++ b/prow/jobs/kyma-project/test-infra/periodics.yaml @@ -15,7 +15,7 @@ periodics: # runs on schedule spec: serviceAccountName: sa-prow-job-resource-cleaners containers: - - image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-gcloud:v20241001-f0fc4ad0 + - image: europe-docker.pkg.dev/kyma-project/prod/e2e-gcloud:v20241001-f0fc4ad0 securityContext: privileged: false seccompProfile: @@ -50,14 +50,14 @@ periodics: # runs on schedule cluster: trusted-workload spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/gcscleaner:v20241003-9d1845c9" + - image: "europe-docker.pkg.dev/kyma-project/prod/gcscleaner:v20241002-aac0cb23" securityContext: privileged: false seccompProfile: type: RuntimeDefault allowPrivilegeEscalation: false command: - - "/ko-app/gcscleaner" + - "/gcscleaner" args: - "-project=$(CLOUDSDK_CORE_PROJECT)" - "-bucketNameRegexp='^.+-([a-z0-9]+$)'" @@ -84,14 +84,14 @@ periodics: # runs on schedule cluster: trusted-workload spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/diskscollector:v20241003-9d1845c9" + - image: "europe-docker.pkg.dev/kyma-project/prod/diskscollector:v20241002-aac0cb23" securityContext: privileged: false seccompProfile: type: RuntimeDefault allowPrivilegeEscalation: false command: - - "/ko-app/diskscollector" + - "/diskscollector" args: - "-project=$(CLOUDSDK_CORE_PROJECT)" - "-dryRun=false" @@ -116,14 +116,14 @@ periodics: # runs on schedule cluster: trusted-workload spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/ipcleaner:v20241003-9d1845c9" + - image: "europe-docker.pkg.dev/kyma-project/prod/ipcleaner:v20241002-aac0cb23" securityContext: privileged: false seccompProfile: type: RuntimeDefault allowPrivilegeEscalation: false command: - - "/ko-app/ipcleaner" + - "/ipcleaner" args: - "-project=$(CLOUDSDK_CORE_PROJECT)" - "-dry-run=false" @@ -148,14 +148,14 @@ periodics: # runs on schedule cluster: trusted-workload spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/clusterscollector:v20241003-9d1845c9" + - image: "europe-docker.pkg.dev/kyma-project/prod/clusterscollector:v20241002-aac0cb23" securityContext: privileged: false seccompProfile: type: RuntimeDefault allowPrivilegeEscalation: false command: - - "/ko-app/clusterscollector" + - "/clusterscollector" args: - "-project=$(CLOUDSDK_CORE_PROJECT)" - "-dryRun=false" @@ -180,14 +180,14 @@ periodics: # runs on schedule cluster: trusted-workload spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/vmscollector:v20241003-9d1845c9" + - image: "europe-docker.pkg.dev/kyma-project/prod/vmscollector:v20241002-aac0cb23" securityContext: privileged: false seccompProfile: type: RuntimeDefault allowPrivilegeEscalation: false command: - - "/ko-app/vmscollector" + - "/vmscollector" args: - "-project=$(CLOUDSDK_CORE_PROJECT)" - "-vmNameRegexp='gke-nightly-.*|gke-weekly.*|shoot--kyma-prow.*|gke-gke-release-.*'" @@ -213,14 +213,14 @@ periodics: # runs on schedule cluster: trusted-workload spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/orphanremover:v20241003-9d1845c9" + - image: "europe-docker.pkg.dev/kyma-project/prod/orphanremover:v20241002-aac0cb23" securityContext: privileged: false seccompProfile: type: RuntimeDefault allowPrivilegeEscalation: false command: - - "/ko-app/orphanremover" + - "/orphanremover" args: - "-project=$(CLOUDSDK_CORE_PROJECT)" - "-dryRun=false" @@ -245,14 +245,14 @@ periodics: # runs on schedule cluster: trusted-workload spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/dnscollector:v20241003-9d1845c9" + - image: "europe-docker.pkg.dev/kyma-project/prod/dnscollector:v20241002-aac0cb23" securityContext: privileged: false seccompProfile: type: RuntimeDefault allowPrivilegeEscalation: false command: - - "/ko-app/dnscollector" + - "/dnscollector" args: - "-project=$(CLOUDSDK_CORE_PROJECT)" - "-dnsZone=$(CLOUDSDK_DNS_ZONE_NAME)" diff --git a/prow/jobs/kyma-project/test-infra/pjtester.yaml b/prow/jobs/kyma-project/test-infra/pjtester.yaml index b0da63ba39aa..de59f8843f63 100644 --- a/prow/jobs/kyma-project/test-infra/pjtester.yaml +++ b/prow/jobs/kyma-project/test-infra/pjtester.yaml @@ -20,7 +20,7 @@ presubmits: # runs on PRs - ^.*$ spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/pjtester:v20241003-9d1845c9" + - image: "europe-docker.pkg.dev/kyma-project/prod/pjtester:v20241002-aac0cb23" imagePullPolicy: Always securityContext: privileged: false @@ -28,7 +28,7 @@ presubmits: # runs on PRs type: RuntimeDefault allowPrivilegeEscalation: false command: - - "/ko-app/pjtester" + - "/pjtester" args: - "--github-token-path=/etc/github/oauth" env: @@ -69,7 +69,7 @@ presubmits: # runs on PRs - ^.*$ spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/testimages/alpine:v20241001-f0fc4ad0" + - image: "europe-docker.pkg.dev/kyma-project/prod/alpine:v20241001-f0fc4ad0" imagePullPolicy: Always securityContext: privileged: false @@ -108,7 +108,7 @@ presubmits: # runs on PRs base_ref: main spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/pjtester:v20241003-9d1845c9" + - image: "europe-docker.pkg.dev/kyma-project/prod/pjtester:v20241002-aac0cb23" imagePullPolicy: Always securityContext: privileged: false @@ -116,7 +116,7 @@ presubmits: # runs on PRs type: RuntimeDefault allowPrivilegeEscalation: false command: - - "/ko-app/pjtester" + - "/pjtester" args: - "--github-token-path=/etc/github/oauth" env: @@ -157,7 +157,7 @@ presubmits: # runs on PRs - ^.*$ spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/testimages/alpine:v20241001-f0fc4ad0" + - image: "europe-docker.pkg.dev/kyma-project/prod/alpine:v20241001-f0fc4ad0" imagePullPolicy: Always securityContext: privileged: false @@ -196,7 +196,7 @@ presubmits: # runs on PRs base_ref: main spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/pjtester:v20241003-9d1845c9" + - image: "europe-docker.pkg.dev/kyma-project/prod/pjtester:v20241002-aac0cb23" imagePullPolicy: Always securityContext: privileged: false @@ -204,7 +204,7 @@ presubmits: # runs on PRs type: RuntimeDefault allowPrivilegeEscalation: false command: - - "/ko-app/pjtester" + - "/pjtester" args: - "--github-token-path=/etc/github/oauth" env: @@ -245,7 +245,7 @@ presubmits: # runs on PRs - ^.*$ spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/testimages/alpine:v20241001-f0fc4ad0" + - image: "europe-docker.pkg.dev/kyma-project/prod/alpine:v20241001-f0fc4ad0" imagePullPolicy: Always securityContext: privileged: false @@ -284,7 +284,7 @@ presubmits: # runs on PRs base_ref: main spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/pjtester:v20241003-9d1845c9" + - image: "europe-docker.pkg.dev/kyma-project/prod/pjtester:v20241002-aac0cb23" imagePullPolicy: Always securityContext: privileged: false @@ -292,7 +292,7 @@ presubmits: # runs on PRs type: RuntimeDefault allowPrivilegeEscalation: false command: - - "/ko-app/pjtester" + - "/pjtester" args: - "--github-token-path=/etc/github/oauth" env: @@ -333,7 +333,7 @@ presubmits: # runs on PRs - ^.*$ spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/testimages/alpine:v20241001-f0fc4ad0" + - image: "europe-docker.pkg.dev/kyma-project/prod/alpine:v20241001-f0fc4ad0" imagePullPolicy: Always securityContext: privileged: false @@ -372,7 +372,7 @@ presubmits: # runs on PRs base_ref: main spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/pjtester:v20241003-9d1845c9" + - image: "europe-docker.pkg.dev/kyma-project/prod/pjtester:v20241002-aac0cb23" imagePullPolicy: Always securityContext: privileged: false @@ -380,7 +380,7 @@ presubmits: # runs on PRs type: RuntimeDefault allowPrivilegeEscalation: false command: - - "/ko-app/pjtester" + - "/pjtester" args: - "--github-token-path=/etc/github/oauth" env: @@ -421,7 +421,7 @@ presubmits: # runs on PRs - ^.*$ spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/testimages/alpine:v20241001-f0fc4ad0" + - image: "europe-docker.pkg.dev/kyma-project/prod/alpine:v20241001-f0fc4ad0" imagePullPolicy: Always securityContext: privileged: false @@ -460,7 +460,7 @@ presubmits: # runs on PRs base_ref: main spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/pjtester:v20241003-9d1845c9" + - image: "europe-docker.pkg.dev/kyma-project/prod/pjtester:v20241002-aac0cb23" imagePullPolicy: Always securityContext: privileged: false @@ -468,7 +468,7 @@ presubmits: # runs on PRs type: RuntimeDefault allowPrivilegeEscalation: false command: - - "/ko-app/pjtester" + - "/pjtester" args: - "--github-token-path=/etc/github/oauth" env: @@ -509,7 +509,7 @@ presubmits: # runs on PRs - ^.*$ spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/testimages/alpine:v20241001-f0fc4ad0" + - image: "europe-docker.pkg.dev/kyma-project/prod/alpine:v20241001-f0fc4ad0" imagePullPolicy: Always securityContext: privileged: false @@ -548,7 +548,7 @@ presubmits: # runs on PRs base_ref: main spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/pjtester:v20241003-9d1845c9" + - image: "europe-docker.pkg.dev/kyma-project/prod/pjtester:v20241002-aac0cb23" imagePullPolicy: Always securityContext: privileged: false @@ -556,7 +556,7 @@ presubmits: # runs on PRs type: RuntimeDefault allowPrivilegeEscalation: false command: - - "/ko-app/pjtester" + - "/pjtester" args: - "--github-token-path=/etc/github/oauth" env: @@ -597,7 +597,7 @@ presubmits: # runs on PRs - ^.*$ spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/testimages/alpine:v20241001-f0fc4ad0" + - image: "europe-docker.pkg.dev/kyma-project/prod/alpine:v20241001-f0fc4ad0" imagePullPolicy: Always securityContext: privileged: false @@ -636,7 +636,7 @@ presubmits: # runs on PRs base_ref: main spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/pjtester:v20241003-9d1845c9" + - image: "europe-docker.pkg.dev/kyma-project/prod/pjtester:v20241002-aac0cb23" imagePullPolicy: Always securityContext: privileged: false @@ -644,7 +644,7 @@ presubmits: # runs on PRs type: RuntimeDefault allowPrivilegeEscalation: false command: - - "/ko-app/pjtester" + - "/pjtester" args: - "--github-token-path=/etc/github/oauth" env: @@ -685,7 +685,7 @@ presubmits: # runs on PRs - ^.*$ spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/testimages/alpine:v20241001-f0fc4ad0" + - image: "europe-docker.pkg.dev/kyma-project/prod/alpine:v20241001-f0fc4ad0" imagePullPolicy: Always securityContext: privileged: false @@ -724,7 +724,7 @@ presubmits: # runs on PRs base_ref: main spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/pjtester:v20241003-9d1845c9" + - image: "europe-docker.pkg.dev/kyma-project/prod/pjtester:v20241002-aac0cb23" imagePullPolicy: Always securityContext: privileged: false @@ -732,7 +732,7 @@ presubmits: # runs on PRs type: RuntimeDefault allowPrivilegeEscalation: false command: - - "/ko-app/pjtester" + - "/pjtester" args: - "--github-token-path=/etc/github/oauth" env: @@ -773,7 +773,7 @@ presubmits: # runs on PRs - ^.*$ spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/testimages/alpine:v20241001-f0fc4ad0" + - image: "europe-docker.pkg.dev/kyma-project/prod/alpine:v20241001-f0fc4ad0" imagePullPolicy: Always securityContext: privileged: false @@ -812,7 +812,7 @@ presubmits: # runs on PRs base_ref: main spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/pjtester:v20241003-9d1845c9" + - image: "europe-docker.pkg.dev/kyma-project/prod/pjtester:v20241002-aac0cb23" imagePullPolicy: Always securityContext: privileged: false @@ -820,7 +820,7 @@ presubmits: # runs on PRs type: RuntimeDefault allowPrivilegeEscalation: false command: - - "/ko-app/pjtester" + - "/pjtester" args: - "--github-token-path=/etc/github/oauth" env: @@ -861,7 +861,7 @@ presubmits: # runs on PRs - ^.*$ spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/testimages/alpine:v20241001-f0fc4ad0" + - image: "europe-docker.pkg.dev/kyma-project/prod/alpine:v20241001-f0fc4ad0" imagePullPolicy: Always securityContext: privileged: false @@ -900,7 +900,7 @@ presubmits: # runs on PRs base_ref: main spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/pjtester:v20241003-9d1845c9" + - image: "europe-docker.pkg.dev/kyma-project/prod/pjtester:v20241002-aac0cb23" imagePullPolicy: Always securityContext: privileged: false @@ -908,7 +908,7 @@ presubmits: # runs on PRs type: RuntimeDefault allowPrivilegeEscalation: false command: - - "/ko-app/pjtester" + - "/pjtester" args: - "--github-token-path=/etc/github/oauth" env: @@ -949,7 +949,7 @@ presubmits: # runs on PRs - ^.*$ spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/testimages/alpine:v20241001-f0fc4ad0" + - image: "europe-docker.pkg.dev/kyma-project/prod/alpine:v20241001-f0fc4ad0" imagePullPolicy: Always securityContext: privileged: false @@ -988,7 +988,7 @@ presubmits: # runs on PRs base_ref: main spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/pjtester:v20241003-9d1845c9" + - image: "europe-docker.pkg.dev/kyma-project/prod/pjtester:v20241002-aac0cb23" imagePullPolicy: Always securityContext: privileged: false @@ -996,7 +996,7 @@ presubmits: # runs on PRs type: RuntimeDefault allowPrivilegeEscalation: false command: - - "/ko-app/pjtester" + - "/pjtester" args: - "--github-token-path=/etc/github/oauth" env: @@ -1037,7 +1037,7 @@ presubmits: # runs on PRs - ^.*$ spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/testimages/alpine:v20241001-f0fc4ad0" + - image: "europe-docker.pkg.dev/kyma-project/prod/alpine:v20241001-f0fc4ad0" imagePullPolicy: Always securityContext: privileged: false @@ -1076,7 +1076,7 @@ presubmits: # runs on PRs base_ref: main spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/pjtester:v20241003-9d1845c9" + - image: "europe-docker.pkg.dev/kyma-project/prod/pjtester:v20241002-aac0cb23" imagePullPolicy: Always securityContext: privileged: false @@ -1084,7 +1084,7 @@ presubmits: # runs on PRs type: RuntimeDefault allowPrivilegeEscalation: false command: - - "/ko-app/pjtester" + - "/pjtester" args: - "--github-token-path=/etc/github/oauth" env: @@ -1125,7 +1125,7 @@ presubmits: # runs on PRs - ^.*$ spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/testimages/alpine:v20241001-f0fc4ad0" + - image: "europe-docker.pkg.dev/kyma-project/prod/alpine:v20241001-f0fc4ad0" imagePullPolicy: Always securityContext: privileged: false @@ -1164,7 +1164,7 @@ presubmits: # runs on PRs base_ref: main spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/pjtester:v20241003-9d1845c9" + - image: "europe-docker.pkg.dev/kyma-project/prod/pjtester:v20241002-aac0cb23" imagePullPolicy: Always securityContext: privileged: false @@ -1172,7 +1172,7 @@ presubmits: # runs on PRs type: RuntimeDefault allowPrivilegeEscalation: false command: - - "/ko-app/pjtester" + - "/pjtester" args: - "--github-token-path=/etc/github/oauth" env: @@ -1213,7 +1213,7 @@ presubmits: # runs on PRs - ^.*$ spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/testimages/alpine:v20241001-f0fc4ad0" + - image: "europe-docker.pkg.dev/kyma-project/prod/alpine:v20241001-f0fc4ad0" imagePullPolicy: Always securityContext: privileged: false diff --git a/prow/jobs/kyma-project/test-infra/prow-periodics.yaml b/prow/jobs/kyma-project/test-infra/prow-periodics.yaml index 37426bb9da09..61a2284bc795 100644 --- a/prow/jobs/kyma-project/test-infra/prow-periodics.yaml +++ b/prow/jobs/kyma-project/test-infra/prow-periodics.yaml @@ -20,14 +20,14 @@ postsubmits: # runs on main channel: kyma-neighbors-alerts spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/markdown-index:v20241003-9d1845c9" + - image: "europe-docker.pkg.dev/kyma-project/prod/markdown-index:v20241002-aac0cb23" securityContext: privileged: false seccompProfile: type: RuntimeDefault allowPrivilegeEscalation: false command: - - "/ko-app/markdown-index" + - "/markdown-index" args: - "--config=configs/autobump-config/test-infra-markdown-index-autobump-config.yaml" - "--labels-override=kind/chore,area/documentation" @@ -52,7 +52,7 @@ postsubmits: # runs on main spec: serviceAccountName: sa-prow-deploy containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-gcloud:v20241001-f0fc4ad0" + - image: "europe-docker.pkg.dev/kyma-project/prod/e2e-gcloud:v20241001-f0fc4ad0" securityContext: privileged: false seccompProfile: diff --git a/prow/jobs/kyma-project/test-infra/validation.yaml b/prow/jobs/kyma-project/test-infra/validation.yaml index b05ec1524fd3..20917042c608 100644 --- a/prow/jobs/kyma-project/test-infra/validation.yaml +++ b/prow/jobs/kyma-project/test-infra/validation.yaml @@ -21,7 +21,7 @@ presubmits: # runs on PRs - ^main$ spec: containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20241001-f0fc4ad0" + - image: "europe-docker.pkg.dev/kyma-project/prod/buildpack-go:v20241001-f0fc4ad0" securityContext: privileged: false seccompProfile: diff --git a/sec-scanners-config.yaml b/sec-scanners-config.yaml index e29c963eb058..417f8f4ef6ff 100644 --- a/sec-scanners-config.yaml +++ b/sec-scanners-config.yaml @@ -1,14 +1,14 @@ module-name: test-infra protecode: - - europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/cors-proxy:v20241003-9d1845c9 - - europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/create-github-issue:v20241003-9d1845c9 - - europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/dashboard-token-proxy:v20241003-9d1845c9 - - europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/github-webhook-gateway:v20241003-9d1845c9 - - europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/move-gcs-bucket:v20241003-9d1845c9 - - europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/scan-logs-for-secrets:v20241003-9d1845c9 - - europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/search-github-issue:v20241003-9d1845c9 - - europe-docker.pkg.dev/kyma-project/prod/test-infra/rotate-service-account:v20241002-f478815a - - europe-docker.pkg.dev/kyma-project/prod/test-infra/service-account-keys-cleaner:v20241002-6e373aa7 + - europe-docker.pkg.dev/kyma-project/prod/cors-proxy:v20241002-aac0cb23 + - europe-docker.pkg.dev/kyma-project/prod/create-github-issue:v20241002-aac0cb23 + - europe-docker.pkg.dev/kyma-project/prod/dashboard-token-proxy:v20241002-aac0cb23 + - europe-docker.pkg.dev/kyma-project/prod/github-webhook-gateway:v20241002-aac0cb23 + - europe-docker.pkg.dev/kyma-project/prod/move-gcs-bucket:v20241002-aac0cb23 + - europe-docker.pkg.dev/kyma-project/prod/scan-logs-for-secrets:v20241002-aac0cb23 + - europe-docker.pkg.dev/kyma-project/prod/search-github-issue:v20241002-aac0cb23 + - europe-docker.pkg.dev/kyma-project/prod/test-infra/rotate-service-account:v20241002-aac0cb23 + - europe-docker.pkg.dev/kyma-project/prod/test-infra/service-account-keys-cleaner:v20241002-aac0cb23 - europe-docker.pkg.dev/kyma-project/prod/test-infra/signify-secret-rotator:v20240924-997e8b7b - europe-docker.pkg.dev/kyma-project/prod/test-infra/slackmessagesender:v20241002-1ca38179 whitesource: diff --git a/templates/config.yaml b/templates/config.yaml index c56289e67b8b..f04e4ab37870 100644 --- a/templates/config.yaml +++ b/templates/config.yaml @@ -122,7 +122,7 @@ globalSets: max_concurrency: "10" optional: "true" decorate: "true" - image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20241001-f0fc4ad0" + image: "europe-docker.pkg.dev/kyma-project/prod/buildpack-go:v20241001-f0fc4ad0" pubsub_project: "sap-kyma-prow" pubsub_topic: "prowjobs" request_memory: 1Gi @@ -140,7 +140,7 @@ globalSets: KYMA_PROJECT_DIR: "/home/prow/go/src/github.com/kyma-project" # Image sets image_buildpack-golang: - image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20241001-f0fc4ad0" + image: "europe-docker.pkg.dev/kyma-project/prod/buildpack-go:v20241001-f0fc4ad0" # JobConfig sets jobConfig_default: skip_report: "false" diff --git a/templates/data/test-infra/image-syncer-data.yaml b/templates/data/test-infra/image-syncer-data.yaml index 04becac67fdb..d3029c389719 100644 --- a/templates/data/test-infra/image-syncer-data.yaml +++ b/templates/data/test-infra/image-syncer-data.yaml @@ -13,8 +13,8 @@ templates: labels: preset-sa-kyma-push-images: "true" run_if_changed: "^(cmd/image-syncer/external-images.yaml)" - image: europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/image-syncer:v20240918-20d00fb8 - command: "/ko-app/image-syncer" + image: europe-docker.pkg.dev/kyma-project/prod/image-syncer:v20240918-20d00fb8 + command: "/image-syncer" args: - --dry-run - --debug @@ -33,8 +33,8 @@ templates: labels: preset-sa-kyma-push-images: "true" run_if_changed: "^(cmd/image-syncer/external-images.yaml)" - image: europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/image-syncer:v20240918-20d00fb8 - command: "/ko-app/image-syncer" + image: europe-docker.pkg.dev/kyma-project/prod/image-syncer:v20240918-20d00fb8 + command: "/image-syncer" args: - --images-file=cmd/image-syncer/external-images.yaml - --target-repo-auth-key=$(GOOGLE_APPLICATION_CREDENTIALS) diff --git a/templates/data/test-infra/pjtester-data.yaml b/templates/data/test-infra/pjtester-data.yaml index b37c8e5dcca3..e2f92ed2a900 100644 --- a/templates/data/test-infra/pjtester-data.yaml +++ b/templates/data/test-infra/pjtester-data.yaml @@ -22,8 +22,8 @@ - "-c" - 'if [ -d /home/prow/go/src/github.com/kyma-project/test-infra/vpath ]; then (echo \"Directory vpath is present. Remove it to merge PR\"; exit 1); else (echo \"Directory vpath is not present\"; exit 0); fi' jobConfig_pjtester: - command: "/ko-app/pjtester" - image: europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/pjtester:v20241003-9d1845c9 + command: "/pjtester" + image: europe-docker.pkg.dev/kyma-project/prod/pjtester:v20241002-aac0cb23 env: KUBECONFIG_PATH: /etc/kubeconfig/pjtester/config volumeMounts: @@ -66,7 +66,7 @@ {{- end}} - jobConfig: name: "pull-{{$repo.name}}-vpathguard" - image: europe-docker.pkg.dev/kyma-project/prod/testimages/alpine:v20241001-f0fc4ad0 + image: europe-docker.pkg.dev/kyma-project/prod/alpine:v20241001-f0fc4ad0 annotations: description: "Run pjtester vpathguard for {{$repo.name}}" owner: "neighbors"