diff --git a/kinder/ci/tools/update-workflows/config.yaml b/kinder/ci/tools/update-workflows/config.yaml index fb516be4..2e9d2136 100644 --- a/kinder/ci/tools/update-workflows/config.yaml +++ b/kinder/ci/tools/update-workflows/config.yaml @@ -201,18 +201,6 @@ jobGroups: - kubernetesVersion: -3 upgradeVersion: -2 -- name: learner-mode - testInfraJobSpec: - targetFile: kubeadm-kinder-learner-mode.yaml - template: ./templates/testinfra/kubeadm-kinder-learner-mode.yaml - kinderWorkflowSpec: - targetFile: learner-mode-{{ .KubernetesVersion }}.yaml - template: ./templates/workflows/learner-mode.yaml - additionalFiles: - - ./templates/workflows/learner-mode-tasks.yaml - jobs: - - kubernetesVersion: latest - - name: super-admin testInfraJobSpec: targetFile: kubeadm-kinder-super-admin.yaml diff --git a/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-learner-mode.yaml b/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-learner-mode.yaml deleted file mode 100644 index 5ecd4a2b..00000000 --- a/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-learner-mode.yaml +++ /dev/null @@ -1,42 +0,0 @@ -- name: ci-kubernetes-e2e-kubeadm-kinder-learner-mode-{{ dashVer .KubernetesVersion }} - cluster: eks-prow-build-cluster - interval: {{ .JobInterval }} - decorate: true - labels: - preset-dind-enabled: "true" - preset-kind-volume-mounts: "true" - annotations: - testgrid-dashboards: sig-cluster-lifecycle-kubeadm - testgrid-tab-name: kubeadm-kinder-learner-mode-{{ dashVer .KubernetesVersion }} - testgrid-alert-email: sig-cluster-lifecycle-kubeadm-alerts@kubernetes.io - description: "OWNER: sig-cluster-lifecycle (kinder); Uses kubeadm/kinder to create a cluster using etcd learner mode to join control-plane and run kubeadm-e2e and the conformance suite" - testgrid-num-columns-recent: "20" -{{ .AlertAnnotations }} - decoration_config: - timeout: 60m - extra_refs: - - org: kubernetes - repo: kubernetes - base_ref: {{ branchFor .KubernetesVersion }} - path_alias: k8s.io/kubernetes - - org: kubernetes - repo: kubeadm - base_ref: main - path_alias: k8s.io/kubeadm - spec: - containers: - - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:{{ .TestInfraImage }}-{{ imageVer .KubernetesVersion }} - command: - - runner.sh - - "../kubeadm/kinder/ci/kinder-run.sh" - args: - - {{ .WorkflowFile }} - securityContext: - privileged: true - resources: - limits: - memory: "9000Mi" - cpu: 2000m - requests: - memory: "9000Mi" - cpu: 2000m diff --git a/kinder/ci/tools/update-workflows/templates/workflows/learner-mode-tasks.yaml b/kinder/ci/tools/update-workflows/templates/workflows/learner-mode-tasks.yaml deleted file mode 100644 index 3922dbd5..00000000 --- a/kinder/ci/tools/update-workflows/templates/workflows/learner-mode-tasks.yaml +++ /dev/null @@ -1,157 +0,0 @@ -# IMPORTANT! this workflow is imported by learner-mode-* workflows. -version: 1 -summary: | - This workflow implements a sequence of tasks used test the proper functioning - of kubeadm not in etcd learner mode during joining control plane. -vars: - # vars defines default values for variable used by tasks in this workflow; - # those values might be overridden when importing this files. - kubernetesVersion: v1.26.0 - upgradeVersion: v1.26.0 - controlPlaneNodes: 3 - workerNodes: 2 - baseImage: kindest/base:v20221102-76f15095 # has containerd - image: kindest/node:test - clusterName: kinder-learner-mode - kubeadmVerbosity: 6 -tasks: -- name: pull-base-image - description: | - pulls kindest/base image with docker in docker and all the prerequisites necessary for running kind(er) - cmd: docker - args: - - pull - - "{{ .vars.baseImage }}" -- name: add-kubernetes-versions - description: | - creates a node-image-variant by adding a Kubernetes version - cmd: kinder - args: - - build - - node-image-variant - - --base-image={{ .vars.baseImage }} - - --image={{ .vars.image }} - - --with-init-artifacts={{ .vars.kubernetesVersion }} - - --with-upgrade-artifacts={{ .vars.upgradeVersion }} - - --loglevel=debug - timeout: 15m -- name: create-cluster - description: | - create a set of nodes ready for hosting the Kubernetes cluster - cmd: kinder - args: - - create - - cluster - - --name={{ .vars.clusterName }} - - --image={{ .vars.image }} - - --control-plane-nodes={{ .vars.controlPlaneNodes }} - - --worker-nodes={{ .vars.workerNodes }} - - --loglevel=debug - timeout: 5m -- name: init - description: | - Initializes the Kubernetes cluster with version "initVersion" - by starting the boostrap control-plane nodes - cmd: kinder - args: - - do - - kubeadm-init - - --name={{ .vars.clusterName }} - - --loglevel=debug - - --kubeadm-verbosity={{ .vars.kubeadmVerbosity }} - - --kubeadm-feature-gate="EtcdLearnerMode=false" - - --copy-certs=auto - timeout: 5m -- name: join - description: | - Join the other nodes to the Kubernetes cluster - cmd: kinder - args: - - do - - kubeadm-join - - --name={{ .vars.clusterName }} - - --loglevel=debug - - --kubeadm-verbosity={{ .vars.kubeadmVerbosity }} - - --copy-certs=auto - timeout: 10m -- name: upgrade - description: | - upgrades the cluster to Kubernetes "upgradeVersion" - cmd: kinder - args: - - do - - kubeadm-upgrade - - --upgrade-version={{ .vars.upgradeVersion }} - - --name={{ .vars.clusterName }} - - --loglevel=debug - - --kubeadm-verbosity={{ .vars.kubeadmVerbosity }} - timeout: 15m -- name: cluster-info - description: | - Runs cluster-info - cmd: kinder - args: - - do - - cluster-info - - --name={{ .vars.clusterName }} - - --loglevel=debug -- name: e2e-kubeadm - description: | - Runs kubeadm e2e tests - cmd: kinder - args: - - test - - e2e-kubeadm - - --test-flags=--report-dir={{ .env.ARTIFACTS }} --report-prefix=e2e-kubeadm - - --name={{ .vars.clusterName }} - - --loglevel=debug - timeout: 10m -- name: e2e - description: | - Runs Kubernetes e2e test (conformance) - cmd: kinder - args: - - test - - e2e - - --test-flags=--report-dir={{ .env.ARTIFACTS }} --report-prefix=e2e - - --parallel - - --name={{ .vars.clusterName }} - - --loglevel=debug - timeout: 35m -- name: get-logs - description: | - Collects all the test logs - cmd: kinder - args: - - export - - logs - - --loglevel=debug - - --name={{ .vars.clusterName }} - - "{{ .env.ARTIFACTS }}" - force: true - timeout: 5m - # kind export log is know to be flaky, so we are temporary ignoring errors in order - # to make the test pass in case everything else passed - # see https://github.com/kubernetes-sigs/kind/issues/456 - ignoreError: true -- name: reset - description: | - Exec kubeadm reset - cmd: kinder - args: - - do - - kubeadm-reset - - --name={{ .vars.clusterName }} - - --loglevel=debug - - --kubeadm-verbosity={{ .vars.kubeadmVerbosity }} - force: true -- name: delete - description: | - Deletes the cluster - cmd: kinder - args: - - delete - - cluster - - --name={{ .vars.clusterName }} - - --loglevel=debug - force: true diff --git a/kinder/ci/tools/update-workflows/templates/workflows/learner-mode.yaml b/kinder/ci/tools/update-workflows/templates/workflows/learner-mode.yaml deleted file mode 100644 index d01e71f4..00000000 --- a/kinder/ci/tools/update-workflows/templates/workflows/learner-mode.yaml +++ /dev/null @@ -1,11 +0,0 @@ -version: 1 -summary: | - This workflow tests the proper functioning of the {{ .KubernetesVersion }} version of both kubeadm and Kubernetes using - etcd learner mode to join control plane. - test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-learner-mode{{ dashVer .KubernetesVersion }} - config > https://git.k8s.io/test-infra/config/jobs/kubernetes/sig-cluster-lifecycle/{{ .TargetFile }} -vars: - kubernetesVersion: "\{\{ resolve `ci/{{ ciLabelFor .KubernetesVersion }}` \}\}" - upgradeVersion: "\{\{ resolve `ci/{{ ciLabelFor .KubernetesVersion }}` \}\}" -tasks: -- import: learner-mode-tasks.yaml diff --git a/kinder/ci/workflows/learner-mode-latest.yaml b/kinder/ci/workflows/learner-mode-latest.yaml deleted file mode 100644 index bc8f9d24..00000000 --- a/kinder/ci/workflows/learner-mode-latest.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# AUTOGENERATED by https://git.k8s.io/kubeadm/kinder/ci/tools/update-workflows -version: 1 -summary: | - This workflow tests the proper functioning of the latest version of both kubeadm and Kubernetes using - etcd learner mode to join control plane. - test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-learner-modelatest - config > https://git.k8s.io/test-infra/config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm-kinder-learner-mode.yaml -vars: - kubernetesVersion: "{{ resolve `ci/latest` }}" - upgradeVersion: "{{ resolve `ci/latest` }}" -tasks: -- import: learner-mode-tasks.yaml diff --git a/kinder/ci/workflows/learner-mode-tasks.yaml b/kinder/ci/workflows/learner-mode-tasks.yaml deleted file mode 100644 index c77cfd43..00000000 --- a/kinder/ci/workflows/learner-mode-tasks.yaml +++ /dev/null @@ -1,158 +0,0 @@ -# AUTOGENERATED by https://git.k8s.io/kubeadm/kinder/ci/tools/update-workflows -# IMPORTANT! this workflow is imported by learner-mode-* workflows. -version: 1 -summary: | - This workflow implements a sequence of tasks used test the proper functioning - of kubeadm not in etcd learner mode during joining control plane. -vars: - # vars defines default values for variable used by tasks in this workflow; - # those values might be overridden when importing this files. - kubernetesVersion: v1.26.0 - upgradeVersion: v1.26.0 - controlPlaneNodes: 3 - workerNodes: 2 - baseImage: kindest/base:v20221102-76f15095 # has containerd - image: kindest/node:test - clusterName: kinder-learner-mode - kubeadmVerbosity: 6 -tasks: -- name: pull-base-image - description: | - pulls kindest/base image with docker in docker and all the prerequisites necessary for running kind(er) - cmd: docker - args: - - pull - - "{{ .vars.baseImage }}" -- name: add-kubernetes-versions - description: | - creates a node-image-variant by adding a Kubernetes version - cmd: kinder - args: - - build - - node-image-variant - - --base-image={{ .vars.baseImage }} - - --image={{ .vars.image }} - - --with-init-artifacts={{ .vars.kubernetesVersion }} - - --with-upgrade-artifacts={{ .vars.upgradeVersion }} - - --loglevel=debug - timeout: 15m -- name: create-cluster - description: | - create a set of nodes ready for hosting the Kubernetes cluster - cmd: kinder - args: - - create - - cluster - - --name={{ .vars.clusterName }} - - --image={{ .vars.image }} - - --control-plane-nodes={{ .vars.controlPlaneNodes }} - - --worker-nodes={{ .vars.workerNodes }} - - --loglevel=debug - timeout: 5m -- name: init - description: | - Initializes the Kubernetes cluster with version "initVersion" - by starting the boostrap control-plane nodes - cmd: kinder - args: - - do - - kubeadm-init - - --name={{ .vars.clusterName }} - - --loglevel=debug - - --kubeadm-verbosity={{ .vars.kubeadmVerbosity }} - - --kubeadm-feature-gate="EtcdLearnerMode=false" - - --copy-certs=auto - timeout: 5m -- name: join - description: | - Join the other nodes to the Kubernetes cluster - cmd: kinder - args: - - do - - kubeadm-join - - --name={{ .vars.clusterName }} - - --loglevel=debug - - --kubeadm-verbosity={{ .vars.kubeadmVerbosity }} - - --copy-certs=auto - timeout: 10m -- name: upgrade - description: | - upgrades the cluster to Kubernetes "upgradeVersion" - cmd: kinder - args: - - do - - kubeadm-upgrade - - --upgrade-version={{ .vars.upgradeVersion }} - - --name={{ .vars.clusterName }} - - --loglevel=debug - - --kubeadm-verbosity={{ .vars.kubeadmVerbosity }} - timeout: 15m -- name: cluster-info - description: | - Runs cluster-info - cmd: kinder - args: - - do - - cluster-info - - --name={{ .vars.clusterName }} - - --loglevel=debug -- name: e2e-kubeadm - description: | - Runs kubeadm e2e tests - cmd: kinder - args: - - test - - e2e-kubeadm - - --test-flags=--report-dir={{ .env.ARTIFACTS }} --report-prefix=e2e-kubeadm - - --name={{ .vars.clusterName }} - - --loglevel=debug - timeout: 10m -- name: e2e - description: | - Runs Kubernetes e2e test (conformance) - cmd: kinder - args: - - test - - e2e - - --test-flags=--report-dir={{ .env.ARTIFACTS }} --report-prefix=e2e - - --parallel - - --name={{ .vars.clusterName }} - - --loglevel=debug - timeout: 35m -- name: get-logs - description: | - Collects all the test logs - cmd: kinder - args: - - export - - logs - - --loglevel=debug - - --name={{ .vars.clusterName }} - - "{{ .env.ARTIFACTS }}" - force: true - timeout: 5m - # kind export log is know to be flaky, so we are temporary ignoring errors in order - # to make the test pass in case everything else passed - # see https://github.com/kubernetes-sigs/kind/issues/456 - ignoreError: true -- name: reset - description: | - Exec kubeadm reset - cmd: kinder - args: - - do - - kubeadm-reset - - --name={{ .vars.clusterName }} - - --loglevel=debug - - --kubeadm-verbosity={{ .vars.kubeadmVerbosity }} - force: true -- name: delete - description: | - Deletes the cluster - cmd: kinder - args: - - delete - - cluster - - --name={{ .vars.clusterName }} - - --loglevel=debug - force: true