Skip to content

Commit

Permalink
cleanup of ko
Browse files Browse the repository at this point in the history
  • Loading branch information
akiioto committed Oct 3, 2024
1 parent a24f416 commit 0bbc9e8
Show file tree
Hide file tree
Showing 34 changed files with 123 additions and 235 deletions.
7 changes: 0 additions & 7 deletions .ko.yaml

This file was deleted.

21 changes: 0 additions & 21 deletions .koapps.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion cmd/image-builder/images/buildkit/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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:v20240523-9d9961f1 AS builder

WORKDIR /
COPY . /app/
Expand Down
2 changes: 1 addition & 1 deletion cmd/image-builder/images/kaniko/Dockerfile
Original file line number Diff line number Diff line change
@@ -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:v20240523-9d9961f1 AS builder

WORKDIR /
COPY . /app/
Expand Down
2 changes: 1 addition & 1 deletion configs/autobump-config/test-infra-autobump-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion configs/terraform/modules/cors-proxy/cors-proxy.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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:v20241001-0e7d9b5c"
image = "europe-docker.pkg.dev/kyma-project/prod/cors-proxy:v20241001-0e7d9b5c"
env {
name = "COMPONENT_NAME"
value = "cors-proxy"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:v20241001-0e7d9b5c"
image = "europe-docker.pkg.dev/kyma-project/prod/github-webhook-gateway:v20241001-0e7d9b5c"
env {
name = "PROJECT_ID"
value = var.gcp_project_id
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:v20241001-0e7d9b5c"
image = "europe-docker.pkg.dev/kyma-project/prod/move-gcs-bucket:v20241001-0e7d9b5c"
env {
name = "PROJECT_ID"
value = var.gcp_project_id
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:v20241001-0e7d9b5c"
image = "europe-docker.pkg.dev/kyma-project/prod/create-github-issue:v20241001-0e7d9b5c"
env {
name = "PROJECT_ID"
value = var.gcp_project_id
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:v20241001-0e7d9b5c"
image = "europe-docker.pkg.dev/kyma-project/prod/search-github-issue:v20241001-0e7d9b5c"
env {
name = "PROJECT_ID"
value = var.gcp_project_id
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:v20241001-0e7d9b5c" #gitleaks:allow
image = "europe-docker.pkg.dev/kyma-project/prod/scan-logs-for-secrets:v20241001-0e7d9b5c" #gitleaks:allow
env {
name = "PROJECT_ID"
value = var.gcp_project_id
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:v20241001-0e7d9b5c" #gitleaks:allow ignore gitleaks detection
image = "europe-docker.pkg.dev/kyma-project/prod/dashboard-token-proxy:v20241001-0e7d9b5c" #gitleaks:allow ignore gitleaks detection
env {
name = "CLIENT_SECRET"
value_from {
Expand Down
1 change: 0 additions & 1 deletion images/buildpack/go/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ set -e
docker run --rm "$IMG" bash -c '
set -e
go version
ko version
kubebuilder version
kustomize version
jobguard -help
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
},
{
"command": [
"/ko-app/entrypoint",
"/entrypoint",
"init",
"/ko-app/entrypoint",
"/entrypoint",
"/tekton/bin/entrypoint",
"step-build-image"
],
Expand All @@ -39,9 +39,9 @@
"containers": [
{
"command": [
"/ko-app/entrypoint",
"/entrypoint",
"init",
"/ko-app/entrypoint",
"/entrypoint",
"/tekton/bin/entrypoint",
"step-build-image"
],
Expand Down
4 changes: 2 additions & 2 deletions pkg/securityconfig/securityconfig_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: automated-approver
image: europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/automated-approver:v20241001-0e7d9b5c
image: europe-docker.pkg.dev/kyma-project/prod/automated-approver:v20241001-0e7d9b5c
imagePullPolicy: Always
args:
- --dry-run=false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ spec:
spec:
containers:
- name: secret-checker-untrusted
image: europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/externalsecretschecker:v20241001-0e7d9b5c #gitleaks:allow
image: europe-docker.pkg.dev/kyma-project/prod/externalsecretschecker:v20241001-0e7d9b5c #gitleaks:allow
imagePullPolicy: IfNotPresent
command:
- /ko-app/externalsecretschecker
- /externalsecretschecker
args:
- "--kubeconfig"
- "/etc/kubeconfig/untrusted/config"
Expand Down Expand Up @@ -49,10 +49,10 @@ spec:
spec:
containers:
- name: secret-checker-trusted
image: europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/externalsecretschecker:v20241001-0e7d9b5c #gitleaks:allow
image: europe-docker.pkg.dev/kyma-project/prod/externalsecretschecker:v20241001-0e7d9b5c #gitleaks:allow
imagePullPolicy: IfNotPresent
command:
- /ko-app/externalsecretschecker
- /externalsecretschecker
args:
- "--kubeconfig"
- "/etc/kubeconfig/trusted/config"
Expand Down Expand Up @@ -85,10 +85,10 @@ spec:
spec:
containers:
- name: secret-checker-prow
image: europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/externalsecretschecker:v20241001-0e7d9b5c #gitleaks:allow
image: europe-docker.pkg.dev/kyma-project/prod/externalsecretschecker:v20241001-0e7d9b5c #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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",.*}$'
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
Expand All @@ -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: []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: [ ]
Expand All @@ -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",.*}$'
Original file line number Diff line number Diff line change
Expand Up @@ -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:*"
8 changes: 4 additions & 4 deletions prow/jobs/kyma-project/test-infra/image-syncer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)"
Expand Down
Loading

0 comments on commit 0bbc9e8

Please sign in to comment.