From 2f1128345cd2b1acb5c6399e0079911bed93393a Mon Sep 17 00:00:00 2001 From: Chwila Date: Fri, 26 Jan 2024 14:37:06 +0100 Subject: [PATCH 1/3] Remove Goat jobs from prow --- .../kyma-project/istio/istio-integration.yaml | 127 ----------- .../kyma-project/istio/istio-manager.yaml | 214 ------------------ templates/data/istio-module-data.yaml | 142 +----------- 3 files changed, 1 insertion(+), 482 deletions(-) delete mode 100644 prow/jobs/kyma-project/istio/istio-integration.yaml diff --git a/prow/jobs/kyma-project/istio/istio-integration.yaml b/prow/jobs/kyma-project/istio/istio-integration.yaml deleted file mode 100644 index 17f6171b2daf..000000000000 --- a/prow/jobs/kyma-project/istio/istio-integration.yaml +++ /dev/null @@ -1,127 +0,0 @@ -presubmits: - kyma-project/istio: - - name: pull-istio-integration - annotations: - owner: goat - description: Runs integration suite for istio operator - labels: - prow.k8s.io/pubsub.project: "sap-kyma-prow" - prow.k8s.io/pubsub.runID: "pull-istio-integration" - prow.k8s.io/pubsub.topic: "prowjobs" - preset-kind-volume-mounts: "true" - preset-dind-enabled: "true" - cluster: untrusted-workload - decorate: true - skip_if_only_changed: '^docs/|^tests/performance/|\.md$|^(OWNERS|CODEOWNERS)$|^\.' - spec: - hostAliases: - - ip: "127.0.0.1" - hostnames: - - "k3d-registry.localhost" - containers: - - image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-k3d:v20240119-3f73fa41 - command: ["/init.sh"] - securityContext: - privileged: true - seccompProfile: - type: Unconfined - allowPrivilegeEscalation: true - args: - - "bash" - - "-c" - - | - set -e - k3d registry create registry.localhost --port 5000 - k3d cluster create -a 0 --registry-use k3d-registry.localhost:5000 --servers-memory=10g --port 80:80@loadbalancer --port 443:443@loadbalancer --k3s-arg --disable=traefik@server:0 - IMG="k3d-registry.localhost:5000/istio-operator:latest" make docker-build docker-push istio-integration-test - resources: - requests: - cpu: 1 - memory: 1Gi - limits: - cpu: 1.5 - memory: 2Gi - - name: pull-istio-integration-evaluation - annotations: - owner: goat - description: Runs integration suite for istio operator in evaluation profile - labels: - prow.k8s.io/pubsub.project: "sap-kyma-prow" - prow.k8s.io/pubsub.runID: "pull-istio-integration-evaluation" - prow.k8s.io/pubsub.topic: "prowjobs" - preset-kind-volume-mounts: "true" - preset-dind-enabled: "true" - cluster: untrusted-workload - decorate: true - skip_if_only_changed: '^docs/|^tests/performance/|\.md$|^(OWNERS|CODEOWNERS)$|^\.' - spec: - hostAliases: - - ip: "127.0.0.1" - hostnames: - - "k3d-registry.localhost" - containers: - - image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-k3d:v20240119-3f73fa41 - command: ["/init.sh"] - securityContext: - privileged: true - seccompProfile: - type: Unconfined - allowPrivilegeEscalation: true - args: - - "bash" - - "-c" - - | - set -e - k3d registry create registry.localhost --port 5000 - k3d cluster create -a 0 --registry-use k3d-registry.localhost:5000 --servers-memory=4g --port 80:80@loadbalancer --port 443:443@loadbalancer --k3s-arg --disable=traefik@server:0 - IMG="k3d-registry.localhost:5000/istio-operator:latest" TEST_EVALUATION=TRUE make docker-build docker-push istio-integration-test - resources: - requests: - cpu: 1 - memory: 1Gi - limits: - cpu: 1.5 - memory: 2Gi -postsubmits: - kyma-project/istio: - - name: post-istio-integration - annotations: - owner: goat - description: Runs integration suite for istio operator - labels: - prow.k8s.io/pubsub.project: "sap-kyma-prow" - prow.k8s.io/pubsub.runID: "post-istio-integration" - prow.k8s.io/pubsub.topic: "prowjobs" - preset-kind-volume-mounts: "true" - preset-dind-enabled: "true" - cluster: untrusted-workload - decorate: true - skip_if_only_changed: '^docs/|^tests/performance/|\.md$|^(OWNERS|CODEOWNERS)$|^\.' - spec: - hostAliases: - - ip: "127.0.0.1" - hostnames: - - "k3d-registry.localhost" - containers: - - image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-k3d:v20240119-3f73fa41 - command: ["/init.sh"] - securityContext: - privileged: true - seccompProfile: - type: Unconfined - allowPrivilegeEscalation: true - args: - - "bash" - - "-c" - - | - set -e - k3d registry create registry.localhost --port 5000 - k3d cluster create -a 0 --registry-use k3d-registry.localhost:5000 --servers-memory=10g --port 80:80@loadbalancer --port 443:443@loadbalancer --k3s-arg --disable=traefik@server:0 - IMG="k3d-registry.localhost:5000/istio-operator:latest" make docker-build docker-push istio-integration-test - resources: - requests: - cpu: 1 - memory: 1Gi - limits: - cpu: 1.5 - memory: 2Gi \ No newline at end of file diff --git a/prow/jobs/kyma-project/istio/istio-manager.yaml b/prow/jobs/kyma-project/istio/istio-manager.yaml index c9de343d3c22..9cb20865db71 100644 --- a/prow/jobs/kyma-project/istio/istio-manager.yaml +++ b/prow/jobs/kyma-project/istio/istio-manager.yaml @@ -54,109 +54,6 @@ presubmits: # runs on PRs - name: signify-secret secret: secretName: signify-dev-secret - - name: pull-istio-operator-integration-gcp - annotations: - description: "runs istio operator integration tests on Gardener GCP cluster" - owner: "goat" - labels: - prow.k8s.io/pubsub.project: "sap-kyma-prow" - prow.k8s.io/pubsub.runID: "pull-istio-operator-integration-gcp" - prow.k8s.io/pubsub.topic: "prowjobs" - preset-cluster-version: "true" - preset-gardener-gcp-kyma-integration: "true" - preset-kyma-guard-bot-github-token: "true" - preset-sa-kyma-dns-serviceuser: "true" - skip_if_only_changed: 'sec-scanners-config\.yaml$|^docs/|^tests/performance/|\.md$|^(OWNERS|CODEOWNERS)$|^\.' - optional: false - skip_report: false - decorate: true - decoration_config: - grace_period: 600000000000 - timeout: 14400000000000 - cluster: untrusted-workload - max_concurrency: 10 - branches: - - ^main$ - - ^release-\d+\.\d+$ - spec: - containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-garden:v20240119-3f73fa41" - securityContext: - privileged: false - seccompProfile: - type: RuntimeDefault - allowPrivilegeEscalation: false - runAsUser: 0 - command: - - "make" - args: - - "gardener-istio-integration-test" - env: - - name: DISK_SIZE - value: "50" - - name: DISK_TYPE - value: "pd-standard" - - name: GARDENER_REGION - value: "europe-west3" - - name: GARDENER_ZONES - value: "europe-west3-c,europe-west3-b,europe-west3-a" - - name: MACHINE_TYPE - value: "n2-standard-4" - - name: SCALER_MAX - value: "20" - - name: SCALER_MIN - value: "3" - - name: TEST_SA_ACCESS_KEY_PATH - value: "/sa-kyma-dns-serviceuser/service-account.json" - resources: - requests: - memory: 3Gi - cpu: 2 - - name: pull-istio-integration-aws-specific - annotations: - description: "runs istio operator integration tests specific to AWS" - owner: "goat" - labels: - prow.k8s.io/pubsub.project: "sap-kyma-prow" - prow.k8s.io/pubsub.runID: "pull-istio-integration-aws-specific" - prow.k8s.io/pubsub.topic: "prowjobs" - preset-cluster-version: "true" - preset-gardener-aws-kyma-integration: "true" - preset-kyma-guard-bot-github-token: "true" - skip_if_only_changed: 'sec-scanners-config\.yaml$|^docs/|^tests/performance/|\.md$|^(OWNERS|CODEOWNERS)$|^\.' - optional: false - skip_report: false - decorate: true - decoration_config: - grace_period: 600000000000 - timeout: 14400000000000 - cluster: untrusted-workload - max_concurrency: 10 - branches: - - ^release-\d+\.\d+$ - spec: - containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-garden:v20240119-3f73fa41" - securityContext: - privileged: false - seccompProfile: - type: RuntimeDefault - allowPrivilegeEscalation: false - runAsUser: 0 - command: - - "bash" - args: - - "-c" - - "mkdir -p /prow-tools && ln -s /usr/local/bin/jobguard /prow-tools/jobguard && ./tests/integration/scripts/integration-test-aws-specific.sh" - env: - - name: IMG - value: "europe-docker.pkg.dev/kyma-project/dev/istio-manager:PR-${PULL_NUMBER}" - - name: WAIT_FOR_JOB_NAME - value: "pull-istio-operator-build" - resources: - requests: - memory: 3Gi - cpu: 2 postsubmits: # runs on main kyma-project/istio: @@ -270,115 +167,4 @@ postsubmits: # runs on main - name: signify-secret secret: secretName: signify-dev-secret - - name: post-istio-integration-aws-specific - annotations: - description: "runs istio operator integration tests specific to AWS" - owner: "goat" - labels: - prow.k8s.io/pubsub.project: "sap-kyma-prow" - prow.k8s.io/pubsub.runID: "post-istio-integration-aws-specific" - prow.k8s.io/pubsub.topic: "prowjobs" - preset-cluster-version: "true" - preset-gardener-aws-kyma-integration: "true" - preset-kyma-guard-bot-github-token: "true" - skip_if_only_changed: 'sec-scanners-config\.yaml$|^docs/|^tests/performance/|\.md$|^(OWNERS|CODEOWNERS)$|^\.' - optional: false - skip_report: false - decorate: true - decoration_config: - grace_period: 600000000000 - timeout: 14400000000000 - cluster: trusted-workload - max_concurrency: 10 - branches: - - ^main$ - reporter_config: - slack: - channel: goat-int - spec: - containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-garden:v20240119-3f73fa41" - securityContext: - privileged: false - seccompProfile: - type: RuntimeDefault - allowPrivilegeEscalation: false - runAsUser: 0 - command: - - "bash" - args: - - "-c" - - "mkdir -p /prow-tools && ln -s /usr/local/bin/jobguard /prow-tools/jobguard && ./tests/integration/scripts/integration-test-aws-specific.sh" - env: - - name: IMG - value: "europe-docker.pkg.dev/kyma-project/prod/istio-manager:${PULL_BASE_SHA}" - - name: WAIT_FOR_JOB_NAME - value: "post-istio-operator-build" - resources: - requests: - memory: 3Gi - cpu: 2 -periodics: # runs on schedule - - name: nightly-istio-performance-test-gcp - annotations: - description: "runs istio performance tests on Gardener GCP cluster" - owner: "goat" - labels: - prow.k8s.io/pubsub.project: "sap-kyma-prow" - prow.k8s.io/pubsub.runID: "nightly-istio-performance-test-gcp" - prow.k8s.io/pubsub.topic: "prowjobs" - preset-cluster-version: "true" - preset-gardener-gcp-kyma-integration: "true" - preset-kyma-guard-bot-github-token: "true" - preset-sa-kyma-dns-serviceuser: "true" - cron: "0 0 * * *" - optional: false - skip_report: false - decorate: true - decoration_config: - grace_period: 600000000000 - timeout: 14400000000000 - cluster: untrusted-workload - extra_refs: - - org: kyma-project - repo: istio - base_ref: main - reporter_config: - slack: - channel: goat-int - spec: - containers: - - image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-gcloud:v20240119-3f73fa41" - securityContext: - privileged: false - seccompProfile: - type: RuntimeDefault - allowPrivilegeEscalation: false - runAsUser: 0 - command: - - "make" - args: - - "gardener-perf-test" - env: - - name: DISK_SIZE - value: "50" - - name: DISK_TYPE - value: "pd-standard" - - name: GARDENER_REGION - value: "europe-west3" - - name: GARDENER_ZONES - value: "europe-west3-c,europe-west3-b,europe-west3-a" - - name: MACHINE_TYPE - value: "n2-standard-8" - - name: SCALER_MAX - value: "20" - - name: SCALER_MIN - value: "3" - - name: TEST_SA_ACCESS_KEY_PATH - value: "/sa-kyma-dns-serviceuser/service-account.json" - resources: - requests: - memory: 3Gi - cpu: 2 - \ No newline at end of file diff --git a/templates/data/istio-module-data.yaml b/templates/data/istio-module-data.yaml index c69022d4bf2c..114d083a58ac 100644 --- a/templates/data/istio-module-data.yaml +++ b/templates/data/istio-module-data.yaml @@ -119,144 +119,4 @@ templates: - job_default - job_build - job_skip_config - - jobConfig: - name: pull-istio-operator-integration-gcp - annotations: - owner: goat - description: runs istio operator integration tests on Gardener GCP cluster - always_run: true - command: "make" - args: - - "gardener-istio-integration-test" - branches: - - ^main$ - - ^release-\d+\.\d+$ - decoration_config: - timeout: 14400000000000 # 4h - grace_period: 600000000000 # 10min - labels: - preset-gardener-gcp-kyma-integration: "true" - preset-cluster-version: "true" - preset-sa-kyma-dns-serviceuser: "true" - preset-kyma-guard-bot-github-token: "true" - env: - TEST_SA_ACCESS_KEY_PATH: "/sa-kyma-dns-serviceuser/service-account.json" - GARDENER_REGION: "europe-west3" - GARDENER_ZONES: "europe-west3-c,europe-west3-b,europe-west3-a" - MACHINE_TYPE: "n2-standard-4" - DISK_SIZE: 50 - DISK_TYPE: "pd-standard" - SCALER_MAX: 20 - SCALER_MIN: 3 - inheritedConfigs: - global: - - jobConfig_presubmit - - jobConfig_default - local: - - job_default - - e2e - - job_skip_config - - jobConfig: - name: nightly-istio-performance-test-gcp - cron: "0 0 * * *" - extra_refs: - istio: - - org: kyma-project - repo: istio - base_ref: main - annotations: - owner: goat - description: runs istio performance tests on Gardener GCP cluster - image: "europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-gcloud:v20240119-3f73fa41" - securityContext: #temporary we need permissions to create folders for tooling, see `make install` - runAsRoot: true - command: "make" - args: - - "gardener-perf-test" - decoration_config: - timeout: 14400000000000 # 4h - grace_period: 600000000000 # 10min - labels: - preset-gardener-gcp-kyma-integration: "true" - preset-cluster-version: "true" - preset-sa-kyma-dns-serviceuser: "true" - preset-kyma-guard-bot-github-token: "true" - env: - TEST_SA_ACCESS_KEY_PATH: "/sa-kyma-dns-serviceuser/service-account.json" - GARDENER_REGION: "europe-west3" - GARDENER_ZONES: "europe-west3-c,europe-west3-b,europe-west3-a" - MACHINE_TYPE: "n2-standard-8" - DISK_SIZE: 50 - DISK_TYPE: "pd-standard" - SCALER_MAX: 20 - SCALER_MIN: 3 - inheritedConfigs: - global: - - jobConfig_default - - jobConfig_periodic - - jobConfig_slack_goat - local: - - job_default - - jobConfig: - name: post-istio-integration-aws-specific - annotations: - owner: goat - description: runs istio operator integration tests specific to AWS - always_run: true - command: bash - args: - - -c - - >- - mkdir -p /prow-tools && ln -s /usr/local/bin/jobguard /prow-tools/jobguard && ./tests/integration/scripts/integration-test-aws-specific.sh - branches: - - ^main$ - decoration_config: - timeout: 14400000000000 # 4h - grace_period: 600000000000 # 10min - labels: - preset-gardener-aws-kyma-integration: "true" - preset-cluster-version: "true" - preset-kyma-guard-bot-github-token: "true" - env: - IMG: "europe-docker.pkg.dev/kyma-project/prod/istio-manager:${PULL_BASE_SHA}" - WAIT_FOR_JOB_NAME: "post-istio-operator-build" - inheritedConfigs: - global: - - jobConfig_postsubmit - - jobConfig_default - - jobConfig_slack_goat - local: - - job_default - - e2e - - job_skip_config - - jobConfig: - name: pull-istio-integration-aws-specific - annotations: - owner: goat - description: runs istio operator integration tests specific to AWS - always_run: true - command: bash - args: - - -c - - >- - mkdir -p /prow-tools && ln -s /usr/local/bin/jobguard /prow-tools/jobguard && ./tests/integration/scripts/integration-test-aws-specific.sh - branches: - - ^release-\d+\.\d+$ - decoration_config: - timeout: 14400000000000 # 4h - grace_period: 600000000000 # 10min - labels: - preset-gardener-aws-kyma-integration: "true" - preset-cluster-version: "true" - preset-kyma-guard-bot-github-token: "true" - env: - IMG: "europe-docker.pkg.dev/kyma-project/dev/istio-manager:PR-${PULL_NUMBER}" - WAIT_FOR_JOB_NAME: "pull-istio-operator-build" - inheritedConfigs: - global: - - jobConfig_presubmit - - jobConfig_default - local: - - job_default - - e2e - - job_skip_config + From 273df7894ccc93c13a2a198ada0983616d71d4bd Mon Sep 17 00:00:00 2001 From: Chwila Date: Fri, 26 Jan 2024 14:41:11 +0100 Subject: [PATCH 2/3] Job def --- prow/jobs/kyma-project/istio/istio-manager.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/prow/jobs/kyma-project/istio/istio-manager.yaml b/prow/jobs/kyma-project/istio/istio-manager.yaml index 95cc833d2e52..7db2b6a2ea8c 100644 --- a/prow/jobs/kyma-project/istio/istio-manager.yaml +++ b/prow/jobs/kyma-project/istio/istio-manager.yaml @@ -54,7 +54,7 @@ presubmits: # runs on PRs - name: signify-secret secret: secretName: signify-dev-secret - + postsubmits: # runs on main kyma-project/istio: - name: rel-istio-build @@ -167,3 +167,4 @@ postsubmits: # runs on main - name: signify-secret secret: secretName: signify-dev-secret + \ No newline at end of file From affabbf5fe179a7f369ea13b7da4f24a6c1f1bc1 Mon Sep 17 00:00:00 2001 From: Chwila Date: Fri, 26 Jan 2024 14:42:05 +0100 Subject: [PATCH 3/3] Remove leftover --- .../kyma-project/istio/istio-integration.yaml | 127 ------------------ 1 file changed, 127 deletions(-) delete mode 100644 prow/jobs/kyma-project/istio/istio-integration.yaml diff --git a/prow/jobs/kyma-project/istio/istio-integration.yaml b/prow/jobs/kyma-project/istio/istio-integration.yaml deleted file mode 100644 index d5807711fd11..000000000000 --- a/prow/jobs/kyma-project/istio/istio-integration.yaml +++ /dev/null @@ -1,127 +0,0 @@ -presubmits: - kyma-project/istio: - - name: pull-istio-integration - annotations: - owner: goat - description: Runs integration suite for istio operator - labels: - prow.k8s.io/pubsub.project: "sap-kyma-prow" - prow.k8s.io/pubsub.runID: "pull-istio-integration" - prow.k8s.io/pubsub.topic: "prowjobs" - preset-kind-volume-mounts: "true" - preset-dind-enabled: "true" - cluster: untrusted-workload - decorate: true - skip_if_only_changed: '^docs/|^tests/performance/|\.md$|^(OWNERS|CODEOWNERS)$|^\.' - spec: - hostAliases: - - ip: "127.0.0.1" - hostnames: - - "k3d-registry.localhost" - containers: - - image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-k3d:v20240124-628d6dc7 - command: ["/init.sh"] - securityContext: - privileged: true - seccompProfile: - type: Unconfined - allowPrivilegeEscalation: true - args: - - "bash" - - "-c" - - | - set -e - k3d registry create registry.localhost --port 5000 - k3d cluster create -a 0 --registry-use k3d-registry.localhost:5000 --servers-memory=10g --port 80:80@loadbalancer --port 443:443@loadbalancer --k3s-arg --disable=traefik@server:0 - IMG="k3d-registry.localhost:5000/istio-operator:latest" make docker-build docker-push istio-integration-test - resources: - requests: - cpu: 1 - memory: 1Gi - limits: - cpu: 1.5 - memory: 2Gi - - name: pull-istio-integration-evaluation - annotations: - owner: goat - description: Runs integration suite for istio operator in evaluation profile - labels: - prow.k8s.io/pubsub.project: "sap-kyma-prow" - prow.k8s.io/pubsub.runID: "pull-istio-integration-evaluation" - prow.k8s.io/pubsub.topic: "prowjobs" - preset-kind-volume-mounts: "true" - preset-dind-enabled: "true" - cluster: untrusted-workload - decorate: true - skip_if_only_changed: '^docs/|^tests/performance/|\.md$|^(OWNERS|CODEOWNERS)$|^\.' - spec: - hostAliases: - - ip: "127.0.0.1" - hostnames: - - "k3d-registry.localhost" - containers: - - image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-k3d:v20240124-628d6dc7 - command: ["/init.sh"] - securityContext: - privileged: true - seccompProfile: - type: Unconfined - allowPrivilegeEscalation: true - args: - - "bash" - - "-c" - - | - set -e - k3d registry create registry.localhost --port 5000 - k3d cluster create -a 0 --registry-use k3d-registry.localhost:5000 --servers-memory=4g --port 80:80@loadbalancer --port 443:443@loadbalancer --k3s-arg --disable=traefik@server:0 - IMG="k3d-registry.localhost:5000/istio-operator:latest" TEST_EVALUATION=TRUE make docker-build docker-push istio-integration-test - resources: - requests: - cpu: 1 - memory: 1Gi - limits: - cpu: 1.5 - memory: 2Gi -postsubmits: - kyma-project/istio: - - name: post-istio-integration - annotations: - owner: goat - description: Runs integration suite for istio operator - labels: - prow.k8s.io/pubsub.project: "sap-kyma-prow" - prow.k8s.io/pubsub.runID: "post-istio-integration" - prow.k8s.io/pubsub.topic: "prowjobs" - preset-kind-volume-mounts: "true" - preset-dind-enabled: "true" - cluster: untrusted-workload - decorate: true - skip_if_only_changed: '^docs/|^tests/performance/|\.md$|^(OWNERS|CODEOWNERS)$|^\.' - spec: - hostAliases: - - ip: "127.0.0.1" - hostnames: - - "k3d-registry.localhost" - containers: - - image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-k3d:v20240124-628d6dc7 - command: ["/init.sh"] - securityContext: - privileged: true - seccompProfile: - type: Unconfined - allowPrivilegeEscalation: true - args: - - "bash" - - "-c" - - | - set -e - k3d registry create registry.localhost --port 5000 - k3d cluster create -a 0 --registry-use k3d-registry.localhost:5000 --servers-memory=10g --port 80:80@loadbalancer --port 443:443@loadbalancer --k3s-arg --disable=traefik@server:0 - IMG="k3d-registry.localhost:5000/istio-operator:latest" make docker-build docker-push istio-integration-test - resources: - requests: - cpu: 1 - memory: 1Gi - limits: - cpu: 1.5 - memory: 2Gi \ No newline at end of file