From 04912e8c33ba778359954a03d4e0238e6398c20d Mon Sep 17 00:00:00 2001 From: Furkat Gofurov Date: Fri, 9 Jun 2023 15:50:02 +0300 Subject: [PATCH] CAPI Operator: move jobs to EKS prow cluster Signed-off-by: Furkat Gofurov --- .../cluster-api-operator-periodics-main.yaml | 16 ++++++ ...er-api-operator-periodics-release-0-3.yaml | 16 ++++++ .../cluster-api-operator-presubmits-main.yaml | 56 +++++++++++++++++-- ...r-api-operator-presubmits-release-0-3.yaml | 56 +++++++++++++++++-- 4 files changed, 136 insertions(+), 8 deletions(-) diff --git a/config/jobs/kubernetes-sigs/cluster-api-operator/cluster-api-operator-periodics-main.yaml b/config/jobs/kubernetes-sigs/cluster-api-operator/cluster-api-operator-periodics-main.yaml index e71052efd96ad..e2def8f90122c 100644 --- a/config/jobs/kubernetes-sigs/cluster-api-operator/cluster-api-operator-periodics-main.yaml +++ b/config/jobs/kubernetes-sigs/cluster-api-operator/cluster-api-operator-periodics-main.yaml @@ -1,5 +1,6 @@ periodics: - name: periodic-cluster-api-operator-test-main + cluster: eks-prow-build-cluster interval: 24h decorate: true labels: @@ -14,12 +15,20 @@ periodics: - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230513-7e1db2f1bb-1.25 command: - "./scripts/ci-test.sh" + resources: + requests: + cpu: "1" + memory: "2Gi" + limits: + cpu: "1" + memory: "2Gi" annotations: testgrid-dashboards: sig-cluster-lifecycle-cluster-api-operator testgrid-tab-name: capi-operator-test-main testgrid-alert-email: sig-cluster-lifecycle-cluster-api-operator-alerts@kubernetes.io testgrid-num-failures-to-alert: "2" - name: periodic-cluster-api-operator-e2e-main + cluster: eks-prow-build-cluster interval: 24h decorate: true decoration_config: @@ -41,6 +50,13 @@ periodics: # we need privileged mode in order to do docker in docker securityContext: privileged: true + resources: + requests: + cpu: "1" + memory: "2Gi" + limits: + cpu: "1" + memory: "2Gi" annotations: testgrid-dashboards: sig-cluster-lifecycle-cluster-api-operator testgrid-tab-name: capi-operator-e2e-main diff --git a/config/jobs/kubernetes-sigs/cluster-api-operator/cluster-api-operator-periodics-release-0-3.yaml b/config/jobs/kubernetes-sigs/cluster-api-operator/cluster-api-operator-periodics-release-0-3.yaml index e8235c13f58b5..35c1daf6580f9 100644 --- a/config/jobs/kubernetes-sigs/cluster-api-operator/cluster-api-operator-periodics-release-0-3.yaml +++ b/config/jobs/kubernetes-sigs/cluster-api-operator/cluster-api-operator-periodics-release-0-3.yaml @@ -1,5 +1,6 @@ periodics: - name: periodic-cluster-api-operator-test-release-0-3 + cluster: eks-prow-build-cluster interval: 24h decorate: true labels: @@ -14,12 +15,20 @@ periodics: - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230513-7e1db2f1bb-1.25 command: - "./scripts/ci-test.sh" + resources: + requests: + cpu: "1" + memory: "2Gi" + limits: + cpu: "1" + memory: "2Gi" annotations: testgrid-dashboards: sig-cluster-lifecycle-cluster-api-operator-0.3 testgrid-tab-name: capi-operator-test-release-0-3 testgrid-alert-email: sig-cluster-lifecycle-cluster-api-operator-alerts@kubernetes.io testgrid-num-failures-to-alert: "2" - name: periodic-cluster-api-operator-e2e-release-0-3 + cluster: eks-prow-build-cluster interval: 24h decorate: true decoration_config: @@ -41,6 +50,13 @@ periodics: # we need privileged mode in order to do docker in docker securityContext: privileged: true + resources: + requests: + cpu: "1" + memory: "2Gi" + limits: + cpu: "1" + memory: "2Gi" annotations: testgrid-dashboards: sig-cluster-lifecycle-cluster-api-operator-0.3 testgrid-tab-name: capi-operator-e2e-release-0-3 diff --git a/config/jobs/kubernetes-sigs/cluster-api-operator/cluster-api-operator-presubmits-main.yaml b/config/jobs/kubernetes-sigs/cluster-api-operator/cluster-api-operator-presubmits-main.yaml index 441142c5f5206..f287f7eaa8c60 100644 --- a/config/jobs/kubernetes-sigs/cluster-api-operator/cluster-api-operator-presubmits-main.yaml +++ b/config/jobs/kubernetes-sigs/cluster-api-operator/cluster-api-operator-presubmits-main.yaml @@ -1,6 +1,7 @@ presubmits: kubernetes-sigs/cluster-api-operator: - name: pull-cluster-api-operator-build-main + cluster: eks-prow-build-cluster decorate: true path_alias: sigs.k8s.io/cluster-api-operator always_run: true @@ -15,10 +16,18 @@ presubmits: command: - runner.sh - ./scripts/ci-build.sh + resources: + requests: + cpu: "1" + memory: "2Gi" + limits: + cpu: "1" + memory: "2Gi" annotations: testgrid-dashboards: sig-cluster-lifecycle-cluster-api-operator testgrid-tab-name: capi-operator-pr-build-main - name: pull-cluster-api-operator-make-main + cluster: eks-prow-build-cluster decorate: true path_alias: sigs.k8s.io/cluster-api-operator always_run: true @@ -30,17 +39,25 @@ presubmits: - ^main$ spec: containers: - - command: + - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230513-7e1db2f1bb-1.25 + command: - runner.sh - ./scripts/ci-make.sh # docker-in-docker needs privileged mode securityContext: privileged: true - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230513-7e1db2f1bb-1.25 + resources: + requests: + cpu: "1" + memory: "2Gi" + limits: + cpu: "1" + memory: "2Gi" annotations: testgrid-dashboards: sig-cluster-lifecycle-cluster-api-operator testgrid-tab-name: capi-operator-pr-make-main - name: pull-cluster-api-operator-apidiff-main + cluster: eks-prow-build-cluster decorate: true path_alias: sigs.k8s.io/cluster-api-operator always_run: true @@ -52,14 +69,22 @@ presubmits: - ^main$ spec: containers: - - command: + - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230513-7e1db2f1bb-1.25 + command: - runner.sh - ./scripts/ci-apidiff.sh - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230513-7e1db2f1bb-1.25 + resources: + requests: + cpu: "1" + memory: "2Gi" + limits: + cpu: "1" + memory: "2Gi" annotations: testgrid-dashboards: sig-cluster-lifecycle-cluster-api-operator testgrid-tab-name: capi-operator-pr-apidiff-main - name: pull-cluster-api-operator-verify-main + cluster: eks-prow-build-cluster decorate: true path_alias: sigs.k8s.io/cluster-api-operator always_run: true @@ -74,10 +99,18 @@ presubmits: command: - "runner.sh" - ./scripts/ci-verify.sh + resources: + requests: + cpu: "1" + memory: "2Gi" + limits: + cpu: "1" + memory: "2Gi" annotations: testgrid-dashboards: sig-cluster-lifecycle-cluster-api-operator testgrid-tab-name: capi-operator-pr-verify-main - name: pull-cluster-api-operator-test-main + cluster: eks-prow-build-cluster decorate: true path_alias: sigs.k8s.io/cluster-api-operator always_run: true @@ -92,10 +125,18 @@ presubmits: args: - runner.sh - ./scripts/ci-test.sh + resources: + requests: + cpu: "1" + memory: "2Gi" + limits: + cpu: "1" + memory: "2Gi" annotations: testgrid-dashboards: sig-cluster-lifecycle-cluster-api-operator testgrid-tab-name: capi-operator-pr-test-main - name: pull-cluster-api-operator-e2e-main + cluster: eks-prow-build-cluster path_alias: "sigs.k8s.io/cluster-api-operator" optional: false decorate: true @@ -123,6 +164,13 @@ presubmits: secretKeyRef: name: cluster-lifecycle-github-token key: cluster-lifecycle-github-token + resources: + requests: + cpu: "1" + memory: "2Gi" + limits: + cpu: "1" + memory: "2Gi" annotations: testgrid-dashboards: sig-cluster-lifecycle-cluster-api-operator testgrid-tab-name: capi-operator-pr-e2e-main diff --git a/config/jobs/kubernetes-sigs/cluster-api-operator/cluster-api-operator-presubmits-release-0-3.yaml b/config/jobs/kubernetes-sigs/cluster-api-operator/cluster-api-operator-presubmits-release-0-3.yaml index bd49d8a1b523a..3c4754446a3e7 100644 --- a/config/jobs/kubernetes-sigs/cluster-api-operator/cluster-api-operator-presubmits-release-0-3.yaml +++ b/config/jobs/kubernetes-sigs/cluster-api-operator/cluster-api-operator-presubmits-release-0-3.yaml @@ -1,6 +1,7 @@ presubmits: kubernetes-sigs/cluster-api-operator: - name: pull-cluster-api-operator-build-release-0-3 + cluster: eks-prow-build-cluster decorate: true path_alias: sigs.k8s.io/cluster-api-operator always_run: true @@ -15,10 +16,18 @@ presubmits: command: - runner.sh - ./scripts/ci-build.sh + resources: + requests: + cpu: "1" + memory: "2Gi" + limits: + cpu: "1" + memory: "2Gi" annotations: testgrid-dashboards: sig-cluster-lifecycle-cluster-api-operator-0.3 testgrid-tab-name: capi-operator-pr-build-release-0-3 - name: pull-cluster-api-operator-make-release-0-3 + cluster: eks-prow-build-cluster decorate: true path_alias: sigs.k8s.io/cluster-api-operator always_run: true @@ -30,17 +39,25 @@ presubmits: - ^release-0.3$ spec: containers: - - command: + - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230513-7e1db2f1bb-1.25 + command: - runner.sh - ./scripts/ci-make.sh # docker-in-docker needs privileged mode securityContext: privileged: true - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230513-7e1db2f1bb-1.25 + resources: + requests: + cpu: "1" + memory: "2Gi" + limits: + cpu: "1" + memory: "2Gi" annotations: testgrid-dashboards: sig-cluster-lifecycle-cluster-api-operator-0.3 testgrid-tab-name: capi-operator-pr-make-release-0-3 - name: pull-cluster-api-operator-apidiff-release-0-3 + cluster: eks-prow-build-cluster decorate: true path_alias: sigs.k8s.io/cluster-api-operator always_run: true @@ -52,14 +69,22 @@ presubmits: - ^release-0.3$ spec: containers: - - command: + - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230513-7e1db2f1bb-1.25 + command: - runner.sh - ./scripts/ci-apidiff.sh - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230513-7e1db2f1bb-1.25 + resources: + requests: + cpu: "1" + memory: "2Gi" + limits: + cpu: "1" + memory: "2Gi" annotations: testgrid-dashboards: sig-cluster-lifecycle-cluster-api-operator-0.3 testgrid-tab-name: capi-operator-pr-apidiff-release-0-3 - name: pull-cluster-api-operator-verify-release-0-3 + cluster: eks-prow-build-cluster decorate: true path_alias: sigs.k8s.io/cluster-api-operator always_run: true @@ -74,10 +99,18 @@ presubmits: command: - "runner.sh" - ./scripts/ci-verify.sh + resources: + requests: + cpu: "1" + memory: "2Gi" + limits: + cpu: "1" + memory: "2Gi" annotations: testgrid-dashboards: sig-cluster-lifecycle-cluster-api-operator-0.3 testgrid-tab-name: capi-operator-pr-verify-release-0-3 - name: pull-cluster-api-operator-test-release-0-3 + cluster: eks-prow-build-cluster decorate: true path_alias: sigs.k8s.io/cluster-api-operator always_run: true @@ -92,10 +125,18 @@ presubmits: args: - runner.sh - ./scripts/ci-test.sh + resources: + requests: + cpu: "1" + memory: "2Gi" + limits: + cpu: "1" + memory: "2Gi" annotations: testgrid-dashboards: sig-cluster-lifecycle-cluster-api-operator-0.3 testgrid-tab-name: capi-operator-pr-test-release-0-3 - name: pull-cluster-api-operator-e2e-release-0-3 + cluster: eks-prow-build-cluster path_alias: "sigs.k8s.io/cluster-api-operator" optional: false decorate: true @@ -123,6 +164,13 @@ presubmits: secretKeyRef: name: cluster-lifecycle-github-token key: cluster-lifecycle-github-token + resources: + requests: + cpu: "1" + memory: "2Gi" + limits: + cpu: "1" + memory: "2Gi" annotations: testgrid-dashboards: sig-cluster-lifecycle-cluster-api-operator-0.3 testgrid-tab-name: capi-operator-pr-e2e-release-0-3