From 701ec433fa3620e468eeaa889f904edfe12dff1e Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Tue, 8 Feb 2022 15:31:44 -0500 Subject: [PATCH 1/5] ci/e2e: test against latest kubernetes Signed-off-by: Peter Hunt --- contrib/test/integration/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/test/integration/main.yml b/contrib/test/integration/main.yml index 7667efa7358..9927b63bf46 100644 --- a/contrib/test/integration/main.yml +++ b/contrib/test/integration/main.yml @@ -25,7 +25,7 @@ - name: clone build and install kubernetes include: "build/kubernetes.yml" vars: - k8s_git_version: "release-1.21" + k8s_git_version: "master" k8s_github_fork: "kubernetes" crio_socket: "/var/run/crio/crio.sock" when: "(cgroupv2 is undefined) or (cgroupv2 == False) | bool" @@ -33,7 +33,7 @@ - name: clone build and install kubernetes for cgroup v2 include: "build/kubernetes.yml" vars: - k8s_git_version: "release-1.21" + k8s_git_version: "master" k8s_github_fork: "kubernetes" crio_socket: "/var/run/crio/crio.sock" when: "cgroupv2 | bool" @@ -151,7 +151,7 @@ include: "build/kubernetes.yml" vars: force_clone: true - k8s_git_version: "release-1.21" + k8s_git_version: "master" k8s_github_fork: "kubernetes" crio_socket: "/var/run/crio/crio.sock" @@ -174,7 +174,7 @@ include: "build/kubernetes.yml" vars: force_clone: true - k8s_git_version: "release-1.21" + k8s_git_version: "master" k8s_github_fork: "kubernetes" crio_socket: "/var/run/crio/crio.sock" when: "(cgroupv2 is undefined) or (cgroupv2 == False) | bool" @@ -182,7 +182,7 @@ include: "build/kubernetes.yml" vars: force_clone: true - k8s_git_version: "release-1.21" + k8s_git_version: "master" k8s_github_fork: "kubernetes" crio_socket: "/var/run/crio/crio.sock" when: "cgroupv2 | bool" From 3ad3ecd573af142750ceafc5a63565c78c59d1a0 Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Tue, 8 Feb 2022 15:33:34 -0500 Subject: [PATCH 2/5] ci/e2e: use CRI stats in a more idiomatic way Signed-off-by: Peter Hunt --- contrib/test/integration/build/kubernetes.yml | 9 --------- contrib/test/integration/main.yml | 10 +++++----- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/contrib/test/integration/build/kubernetes.yml b/contrib/test/integration/build/kubernetes.yml index 12340f6525e..9f9d58646ed 100644 --- a/contrib/test/integration/build/kubernetes.yml +++ b/contrib/test/integration/build/kubernetes.yml @@ -8,15 +8,6 @@ version: "{{ k8s_git_version }}" force: "{{ force_clone | default(False) | bool}}" -# replace hardcoded line not to use legacy stats provider -- name: use CRI stats - lineinfile: - path: "{{ ansible_env.GOPATH }}/src/k8s.io/kubernetes/pkg/kubelet/cadvisor/util.go" - regexp: '^(\s*)runtimeEndpoint == CrioSocket \|\| runtimeEndpoint == \"unix\:\/\/\"\+CrioSocket$' - # keep the whitespace to ensure the file still looks pretty :) - line: '\1false' - backrefs: yes - - name: install etcd command: "hack/install-etcd.sh" args: diff --git a/contrib/test/integration/main.yml b/contrib/test/integration/main.yml index 9927b63bf46..b14ced42d1a 100644 --- a/contrib/test/integration/main.yml +++ b/contrib/test/integration/main.yml @@ -27,7 +27,7 @@ vars: k8s_git_version: "master" k8s_github_fork: "kubernetes" - crio_socket: "/var/run/crio/crio.sock" + crio_socket: "/run/crio/crio.sock" when: "(cgroupv2 is undefined) or (cgroupv2 == False) | bool" - name: clone build and install kubernetes for cgroup v2 @@ -35,7 +35,7 @@ vars: k8s_git_version: "master" k8s_github_fork: "kubernetes" - crio_socket: "/var/run/crio/crio.sock" + crio_socket: "/run/crio/crio.sock" when: "cgroupv2 | bool" - name: clone build and install kubetest @@ -153,7 +153,7 @@ force_clone: true k8s_git_version: "master" k8s_github_fork: "kubernetes" - crio_socket: "/var/run/crio/crio.sock" + crio_socket: "/run/crio/crio.sock" - name: clone build and install kubetest include: "build/kubetest.yml" @@ -176,7 +176,7 @@ force_clone: true k8s_git_version: "master" k8s_github_fork: "kubernetes" - crio_socket: "/var/run/crio/crio.sock" + crio_socket: "/run/crio/crio.sock" when: "(cgroupv2 is undefined) or (cgroupv2 == False) | bool" - name: clone build and install kubernetes for cgroup v2 include: "build/kubernetes.yml" @@ -184,7 +184,7 @@ force_clone: true k8s_git_version: "master" k8s_github_fork: "kubernetes" - crio_socket: "/var/run/crio/crio.sock" + crio_socket: "/run/crio/crio.sock" when: "cgroupv2 | bool" - name: clone build and install kubetest From 9f3851d6bfa32faa932f4e61389ba5ca31ddebc7 Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Tue, 8 Feb 2022 17:16:23 -0500 Subject: [PATCH 3/5] ci/e2e: drop RunAsGroup Signed-off-by: Peter Hunt --- contrib/test/integration/build/kubernetes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/test/integration/build/kubernetes.yml b/contrib/test/integration/build/kubernetes.yml index 9f9d58646ed..9281a4be780 100644 --- a/contrib/test/integration/build/kubernetes.yml +++ b/contrib/test/integration/build/kubernetes.yml @@ -44,7 +44,7 @@ # Whole script added by Ansible from build/kubernetes.yml export PATH=/usr/local/go/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/root/bin:{{ ansible_env.GOPATH }}/bin:{{ ansible_env.GOPATH }}/src/k8s.io/kubernetes/third_party/etcd:{{ ansible_env.GOPATH }}/src/k8s.io/kubernetes/_output/local/bin/linux/amd64/ - export FEATURE_GATES="AllAlpha=false,RunAsGroup=true" + export FEATURE_GATES="AllAlpha=false" export CONTAINER_RUNTIME=remote export CGROUP_DRIVER=systemd export CONTAINER_RUNTIME_ENDPOINT='{{ crio_socket }}' From 701b9c8d5374f3c5a63ad150c2dd7858eb050ec7 Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Wed, 9 Feb 2022 09:42:22 -0500 Subject: [PATCH 4/5] ci/e2e: skip test about having multiple nodes Signed-off-by: Peter Hunt --- contrib/test/integration/e2e.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/test/integration/e2e.yml b/contrib/test/integration/e2e.yml index 7cd53022adc..cb88a94eff6 100644 --- a/contrib/test/integration/e2e.yml +++ b/contrib/test/integration/e2e.yml @@ -27,6 +27,8 @@ - "ServiceAccountIssuerDiscovery should support OIDC discovery of service account issuer" # TODO: remove once https://github.com/kubernetes/kubernetes/issues/96565 is fixed - "Pods Extended [k8s.io] Pod Container Status should never report success for a pending container" + # Tests run on a single node + - "Conformance Tests should have at least two untainted nodes" set_fact: e2e_shell_cmd: > DBUS_SESSION_BUS_ADDRESS="unix:path=/var/run/dbus/system_bus_socket" KUBE_CONTAINER_RUNTIME="remote" GINKGO_TOLERATE_FLAKES="y" GINKGO_PARALLEL_NODES=6 GINKGO_PARALLEL=y KUBE_SSH_USER="{{ ssh_user }}" LOCAL_SSH_KEY="{{ ssh_location }}" From 4399b5cde45baaef70ef1498c57167e38be42834 Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Wed, 9 Feb 2022 09:42:42 -0500 Subject: [PATCH 5/5] ci/e2e: re-add pod pending test Signed-off-by: Peter Hunt --- contrib/test/integration/e2e.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/contrib/test/integration/e2e.yml b/contrib/test/integration/e2e.yml index cb88a94eff6..53c40540b51 100644 --- a/contrib/test/integration/e2e.yml +++ b/contrib/test/integration/e2e.yml @@ -25,8 +25,6 @@ - "CSI Volumes [Driver: csi-hostpath] [Testpattern: Dynamic PV (block volmode)] volumes should store data" # Started failing at https://github.com/kubernetes/kubernetes/pull/98587, and tests something out of the scope of CRI-O - "ServiceAccountIssuerDiscovery should support OIDC discovery of service account issuer" - # TODO: remove once https://github.com/kubernetes/kubernetes/issues/96565 is fixed - - "Pods Extended [k8s.io] Pod Container Status should never report success for a pending container" # Tests run on a single node - "Conformance Tests should have at least two untainted nodes" set_fact: