Thanks to visit codestin.com
Credit goes to github.com

Skip to content

ci: update kubernetes build #5612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
haircommander wants to merge 5 commits into from
Closed

ci: update kubernetes build #5612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
701ec43
ci/e2e: test against latest kubernetes
haircommander Feb 8, 2022
3ad3ecd
ci/e2e: use CRI stats in a more idiomatic way
haircommander Feb 8, 2022
9f3851d
ci/e2e: drop RunAsGroup
haircommander Feb 8, 2022
701b9c8
ci/e2e: skip test about having multiple nodes
haircommander Feb 9, 2022
4399b5c
ci/e2e: re-add pod pending test
haircommander Feb 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions contrib/test/integration/build/kubernetes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -53,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 }}'
Expand Down
4 changes: 2 additions & 2 deletions contrib/test/integration/e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
- "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:
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 }}"
Expand Down
20 changes: 10 additions & 10 deletions contrib/test/integration/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@
- name: clone build and install kubernetes
include: "build/kubernetes.yml"
vars:
k8s_git_version: "release-1.21"
k8s_git_version: "master"
Copy link
Contributor

@TomSweeneyRedHat TomSweeneyRedHat Feb 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are they really still using "master" and not "main"? Sigh.

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"
vars:
k8s_git_version: "release-1.21"
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
Expand Down Expand Up @@ -151,9 +151,9 @@
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"
crio_socket: "/run/crio/crio.sock"

- name: clone build and install kubetest
include: "build/kubetest.yml"
Expand All @@ -174,17 +174,17 @@
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"
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"
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"
crio_socket: "/run/crio/crio.sock"
when: "cgroupv2 | bool"

- name: clone build and install kubetest
Expand Down