Skip to content

Commit

Permalink
resolved merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
mfaizanse committed Aug 10, 2023
2 parents d448675 + 86df4bd commit 6084a69
Show file tree
Hide file tree
Showing 142 changed files with 466 additions and 473 deletions.
10 changes: 5 additions & 5 deletions .ko.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
baseImageOverrides:
github.com/kyma-project/test-infra/development/tools/cmd/pjtester: europe-docker.pkg.dev/kyma-project/prod/testimages/alpine-git:v20230804-a5b27764
github.com/kyma-project/test-infra/development/markdown-index: europe-docker.pkg.dev/kyma-project/prod/testimages/alpine-git:v20230804-a5b27764
github.com/kyma-project/test-infra/development/image-detector: europe-docker.pkg.dev/kyma-project/prod/testimages/alpine-git:v20230804-a5b27764
github.com/kyma-project/test-infra/development/external-plugins/needs-tws: europe-docker.pkg.dev/kyma-project/prod/testimages/alpine-git:v20230804-a5b27764
github.com/kyma-project/test-infra/development/external-plugins/automerge-notification: europe-docker.pkg.dev/kyma-project/prod/testimages/alpine-git:v20230804-a5b27764
github.com/kyma-project/test-infra/development/tools/cmd/pjtester: europe-docker.pkg.dev/kyma-project/prod/testimages/alpine-git:v20230809-ddf0733f
github.com/kyma-project/test-infra/development/markdown-index: europe-docker.pkg.dev/kyma-project/prod/testimages/alpine-git:v20230809-ddf0733f
github.com/kyma-project/test-infra/development/image-detector: europe-docker.pkg.dev/kyma-project/prod/testimages/alpine-git:v20230809-ddf0733f
github.com/kyma-project/test-infra/development/external-plugins/needs-tws: europe-docker.pkg.dev/kyma-project/prod/testimages/alpine-git:v20230809-ddf0733f
github.com/kyma-project/test-infra/development/external-plugins/automerge-notification: europe-docker.pkg.dev/kyma-project/prod/testimages/alpine-git:v20230809-ddf0733f
defaultPlatforms:
- linux/arm64
- linux/amd64
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,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:v20230808-b797f009"
image = "europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/github-webhook-gateway:v20230810-671e968d"
env {
name = "PROJECT_ID"
value = var.gcp_project_id
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: automerge-notification
image: europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/automerge-notification:v20230808-b281686e
image: europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/automerge-notification:v20230810-a917845a
args:
- --dry-run=false
- --github-endpoint=http://ghproxy
Expand Down
2 changes: 1 addition & 1 deletion prow/cluster/components/cla-assistant_external-plugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: cla-assistant
image: europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/cla-assistant:v20230808-b281686e
image: europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/cla-assistant:v20230810-a917845a
args:
- --dry-run=false
- --hmac-secret-file=/etc/webhook/hmac
Expand Down
2 changes: 1 addition & 1 deletion prow/cluster/components/needs-tws_external-plugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: needs-tws
image: europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/needs-tws:v20230808-b281686e
image: europe-docker.pkg.dev/kyma-project/prod/test-infra/ko/needs-tws:v20230810-a917845a
args:
- --dry-run=false
- --github-endpoint=http://ghproxy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,6 @@ spec:
- /tools/entrypoint
args: []
entrypoint_options: '^.*"args":\["\/ko-app\/githubissues","--githubOrgName=kyma-project","--bqProjectID=sap-kyma-prow","--bqDataset=github_issues","--bqTable=github_com_kyma_project","--bqCredentials=\$\(GOOGLE_APPLICATION_CREDENTIALS\)","--githubToken=\$\(BOT_GITHUB_TOKEN\)"\],"container_name":"test",.*$'
# pre-release-pr-image-guard
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/governance-toolkit:*"
command:
- /tools/entrypoint
args: []
entrypoint_options: '^.*"args":\["\/home\/prow\/go\/src\/github\.com\/kyma-project\/test-infra\/prow\/scripts\/pr-image-guard\.sh"\],"container_name":"test",.*$'
# skr-aws-upgrade-integration-dev
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-nodejs:*"
command:
Expand Down
8 changes: 4 additions & 4 deletions prow/jobs/api-gateway/api-gateway-integration-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ presubmits: # runs on PRs
base_ref: main
spec:
containers:
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-garden:v20230804-a5b27764"
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-garden:v20230809-ddf0733f"
securityContext:
privileged: false
seccompProfile:
Expand Down Expand Up @@ -91,7 +91,7 @@ postsubmits: # runs on main
channel: goat-int
spec:
containers:
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-garden:v20230804-a5b27764"
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-garden:v20230809-ddf0733f"
securityContext:
privileged: false
seccompProfile:
Expand Down Expand Up @@ -139,7 +139,7 @@ postsubmits: # runs on main
channel: goat-int
spec:
containers:
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-garden:v20230804-a5b27764"
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-garden:v20230809-ddf0733f"
securityContext:
privileged: false
seccompProfile:
Expand Down Expand Up @@ -189,7 +189,7 @@ postsubmits: # runs on main
channel: goat-int
spec:
containers:
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-garden:v20230804-a5b27764"
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-garden:v20230809-ddf0733f"
securityContext:
privileged: false
seccompProfile:
Expand Down
2 changes: 1 addition & 1 deletion prow/jobs/api-gateway/api-gateway-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ postsubmits: # runs on main
channel: goat-int
spec:
containers:
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20230804-a5b27764"
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20230809-ddf0733f"
securityContext:
privileged: false
command:
Expand Down
2 changes: 1 addition & 1 deletion prow/jobs/api-gateway/api-gateway-validation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ presubmits: # runs on PRs
max_concurrency: 10
spec:
containers:
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20230804-a5b27764"
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20230809-ddf0733f"
securityContext:
privileged: false
seccompProfile:
Expand Down
4 changes: 2 additions & 2 deletions prow/jobs/btp-manager/btp-manager-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ presubmits: # runs on PRs
- ^main$
spec:
containers:
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20230804-a5b27764"
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20230809-ddf0733f"
securityContext:
privileged: false
seccompProfile:
Expand Down Expand Up @@ -165,7 +165,7 @@ postsubmits: # runs on main
- ^\d+\.\d+\.\d+(?:-.*)?$
spec:
containers:
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20230804-a5b27764"
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20230809-ddf0733f"
securityContext:
privileged: false
seccompProfile:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ presubmits: # runs on PRs
- ^main$
spec:
containers:
- image: europe-docker.pkg.dev/kyma-project/prod/testimages/alpine:v20230804-a5b27764
- image: europe-docker.pkg.dev/kyma-project/prod/testimages/alpine:v20230809-ddf0733f
securityContext:
privileged: false
seccompProfile:
Expand Down
4 changes: 2 additions & 2 deletions prow/jobs/busola/busola-integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ presubmits: # runs on PRs
- ^main$
spec:
containers:
- image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-nodejs:v20230804-a5b27764
- image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-nodejs:v20230809-ddf0733f
securityContext:
privileged: true
seccompProfile:
Expand Down Expand Up @@ -60,7 +60,7 @@ presubmits: # runs on PRs
- ^main$
spec:
containers:
- image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-nodejs:v20230804-a5b27764
- image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-nodejs:v20230809-ddf0733f
securityContext:
privileged: true
seccompProfile:
Expand Down
2 changes: 1 addition & 1 deletion prow/jobs/busola/busola-web/web-deployment-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ presubmits: # runs on PRs
- ^main$
spec:
containers:
- image: europe-docker.pkg.dev/kyma-project/prod/testimages/alpine:v20230804-a5b27764
- image: europe-docker.pkg.dev/kyma-project/prod/testimages/alpine:v20230809-ddf0733f
securityContext:
privileged: false
seccompProfile:
Expand Down
2 changes: 1 addition & 1 deletion prow/jobs/busola/lighthouse.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ presubmits: # runs on PRs
- ^main$
spec:
containers:
- image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-nodejs:v20230804-a5b27764
- image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-nodejs:v20230809-ddf0733f
securityContext:
privileged: true
seccompProfile:
Expand Down
4 changes: 2 additions & 2 deletions prow/jobs/cli/cli-k3d.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ postsubmits:
channel: jellyfish-notifications
spec:
containers:
- image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-gcloud:v20230804-a5b27764
- image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-gcloud:v20230809-ddf0733f
command: [ "bash" ]
securityContext:
privileged: false
Expand Down Expand Up @@ -72,7 +72,7 @@ presubmits:
channel: jellyfish-notifications
spec:
containers:
- image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-k3d:v20230804-a5b27764
- image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-k3d:v20230809-ddf0733f
command: [ "/init.sh" ]
securityContext:
privileged: true
Expand Down
8 changes: 4 additions & 4 deletions prow/jobs/cli/cli.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ presubmits: # runs on PRs
- ^release-\d+\.\d+$
spec:
containers:
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20230804-a5b27764"
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20230809-ddf0733f"
securityContext:
privileged: false
seccompProfile:
Expand Down Expand Up @@ -50,7 +50,7 @@ presubmits: # runs on PRs
max_concurrency: 10
spec:
containers:
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20230804-a5b27764"
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20230809-ddf0733f"
securityContext:
privileged: false
seccompProfile:
Expand Down Expand Up @@ -86,7 +86,7 @@ postsubmits: # runs on main
- ^release-\d+\.\d+$
spec:
containers:
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20230804-a5b27764"
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20230809-ddf0733f"
securityContext:
privileged: false
seccompProfile:
Expand Down Expand Up @@ -121,7 +121,7 @@ postsubmits: # runs on main
channel: jellyfish-notifications
spec:
containers:
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20230804-a5b27764"
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20230809-ddf0733f"
securityContext:
privileged: false
seccompProfile:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ presubmits: # runs on PRs
- ^main$
spec:
containers:
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20230804-a5b27764"
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20230809-ddf0733f"
securityContext:
privileged: false
seccompProfile:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ presubmits: # runs on PRs
- ^main$
spec:
containers:
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-k3d:v20230804-a5b27764"
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-k3d:v20230809-ddf0733f"
securityContext:
privileged: true
seccompProfile:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ presubmits: # runs on PRs
- ^main$
spec:
containers:
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20230804-a5b27764"
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20230809-ddf0733f"
securityContext:
privileged: false
seccompProfile:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ presubmits: # runs on PRs
- ^main$
spec:
containers:
- image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-k3d:v20230804-a5b27764
- image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-k3d:v20230809-ddf0733f
command: ["/init.sh"]
args:
- components/provisioner/e2e_test/test.sh
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ presubmits: # runs on PRs
- ^main$
spec:
containers:
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-k3d:v20230804-a5b27764"
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-k3d:v20230809-ddf0733f"
securityContext:
privileged: true
seccompProfile:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ presubmits: # runs on PRs
base_ref: main
spec:
containers:
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-nodejs:v20230804-a5b27764"
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-nodejs:v20230809-ddf0733f"
securityContext:
privileged: false
seccompProfile:
Expand Down Expand Up @@ -87,7 +87,7 @@ presubmits: # runs on PRs
base_ref: main
spec:
containers:
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-nodejs:v20230804-a5b27764"
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-nodejs:v20230809-ddf0733f"
securityContext:
privileged: false
seccompProfile:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ presubmits: # runs on PRs
base_ref: main
spec:
containers:
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-nodejs:v20230804-a5b27764"
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-nodejs:v20230809-ddf0733f"
securityContext:
privileged: false
seccompProfile:
Expand Down
2 changes: 1 addition & 1 deletion prow/jobs/control-plane/control-plane-validation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ presubmits: # runs on PRs
base_ref: main
spec:
containers:
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/governance-toolkit:v20230804-a5b27764"
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/alpine-hadolint:v20230809-ddf0733f"
securityContext:
privileged: false
seccompProfile:
Expand Down
4 changes: 2 additions & 2 deletions prow/jobs/control-plane/kcp-cli.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ presubmits: # runs on PRs
base_ref: main
spec:
containers:
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-gcloud:v20230804-a5b27764"
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-gcloud:v20230809-ddf0733f"
securityContext:
privileged: false
seccompProfile:
Expand Down Expand Up @@ -67,7 +67,7 @@ postsubmits: # runs on main
base_ref: main
spec:
containers:
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-gcloud:v20230804-a5b27764"
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-gcloud:v20230809-ddf0733f"
securityContext:
privileged: false
seccompProfile:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ presubmits: # runs on PRs
- ^main$
spec:
containers:
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20230804-a5b27764"
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20230809-ddf0733f"
securityContext:
privileged: false
seccompProfile:
Expand Down
2 changes: 1 addition & 1 deletion prow/jobs/eventing-auth-manager/eam-integration-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ presubmits: # runs on PRs
hostnames:
- "k3d-registry.localhost"
containers:
- image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-k3d:v20230804-a5b27764
- image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-k3d:v20230809-ddf0733f
command: ["/init.sh"]
securityContext:
privileged: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ presubmits: # runs on PRs
max_concurrency: 10
spec:
containers:
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20230804-a5b27764"
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20230809-ddf0733f"
securityContext:
privileged: false
seccompProfile:
Expand Down
2 changes: 1 addition & 1 deletion prow/jobs/governance.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ presubmits: # runs on PRs
- ^main$
spec:
containers:
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20230804-a5b27764"
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20230809-ddf0733f"
securityContext:
privileged: false
seccompProfile:
Expand Down
4 changes: 2 additions & 2 deletions prow/jobs/incubator/compass-console/compass/compass-ui.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ presubmits: # runs on PRs
max_concurrency: 10
spec:
containers:
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-nodejs:v20230804-a5b27764"
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-nodejs:v20230809-ddf0733f"
securityContext:
privileged: false
seccompProfile:
Expand Down Expand Up @@ -107,7 +107,7 @@ presubmits: # runs on PRs
max_concurrency: 10
spec:
containers:
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-nodejs:v20230804-a5b27764"
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-nodejs:v20230809-ddf0733f"
securityContext:
privileged: false
seccompProfile:
Expand Down
2 changes: 1 addition & 1 deletion prow/jobs/incubator/compass/compass-gke-benchmark.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ presubmits: # runs on PRs
base_ref: main
spec:
containers:
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20230804-a5b27764"
- image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20230809-ddf0733f"
securityContext:
privileged: false
seccompProfile:
Expand Down
Loading

0 comments on commit 6084a69

Please sign in to comment.