Skip to content
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

Jump to bottom

vendor: Update k8s dependencies and tests to 1.22.0-rc.0 #16989

Merged
merged 1 commit into from Oct 27, 2021
Merged

vendor: Update k8s dependencies and tests to 1.22.0-rc.0 #16989

merged 1 commit into from Oct 27, 2021

Conversation

nathanjsweet
Copy link
Member

@nathanjsweet nathanjsweet commented Jul 23, 2021 •
edited by aanm

Signed-off-by: Nate Sweet nathanjsweet@pm.me

Update libraries for Kubernetes 1.22.0

@nathanjsweet nathanjsweet added sig/k8s Impacts the kubernetes API, or kubernetes -> cilium internals translation layers. release-note/misc This PR makes changes that have no direct user impact. labels Jul 23, 2021
@nathanjsweet nathanjsweet requested review from a team as code owners July 23, 2021 21:35
@nathanjsweet nathanjsweet requested a review from rolinh July 23, 2021 21:35
@aanm aanm added the dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. label Jul 23, 2021
@nathanjsweet nathanjsweet force-pushed the pr/nathanjsweet/update-k8s-to-1-22-0-rc0 branch from 1daf907 to cd3f883 Compare July 26, 2021 19:17
@nathanjsweet nathanjsweet removed the dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. label Jul 26, 2021
christarazi
christarazi approved these changes Jul 26, 2021
View reviewed changes
test/provision/k8s_install.sh Show resolved Hide resolved
@nathanjsweet nathanjsweet added ready-to-merge This PR has passed all tests and received consensus from code owners to merge. and removed ready-to-merge This PR has passed all tests and received consensus from code owners to merge. labels Jul 27, 2021
@nathanjsweet
Copy link
Member Author

nathanjsweet commented Jul 27, 2021 •
edited by maintainer-s-little-helper bot

test-me-please

Job 'Cilium-PR-K8s-1.19-kernel-5.4' failed and looks like it's a real failure:

Click to show.

Test Name

K8sBookInfoDemoTest

Failure Output

FAIL: Vagrant status on failure:

Job 'Cilium-PR-Runtime-4.9' failed and looks like it's a real failure:

Click to show.

Test Name

RuntimeCassandra Tests policy allowing all actions

Failure Output

FAIL: Vagrant status on failure:

@nathanjsweet nathanjsweet force-pushed the pr/nathanjsweet/update-k8s-to-1-22-0-rc0 branch from cd3f883 to 7492305 Compare July 27, 2021 22:05
@nathanjsweet nathanjsweet requested a review from a team as a code owner July 27, 2021 22:05
@nathanjsweet nathanjsweet requested a review from a team July 27, 2021 22:05
@nathanjsweet
Copy link
Member Author

nathanjsweet commented Jul 28, 2021 •
edited by maintainer-s-little-helper bot

test-me-please

Job 'Cilium-PR-Runtime-4.9' failed and has not been observed before, so may be related to your PR:

Click to show.

Test Name

RuntimeCassandra Tests policy allowing all actions

Failure Output

FAIL: Vagrant status on failure:

If it is a flake, comment /mlh new-flake Cilium-PR-Runtime-4.9 so I can create a new GitHub issue to track it.

Job 'Cilium-PR-K8s-1.19-kernel-5.4' failed and has not been observed before, so may be related to your PR:

Click to show.

Test Name

K8sLRPTests

Failure Output

FAIL: Vagrant status on failure:

If it is a flake, comment /mlh new-flake Cilium-PR-K8s-1.19-kernel-5.4 so I can create a new GitHub issue to track it.

@maintainer-s-little-helper
Copy link

Commit f9f23e0799d22f3484771cb635edaf4ab034bc6c does not contain "Signed-off-by".

Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin

@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. label Aug 2, 2021
@nathanjsweet nathanjsweet force-pushed the pr/nathanjsweet/update-k8s-to-1-22-0-rc0 branch from f9f23e0 to 382180c Compare August 2, 2021 20:55
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. label Aug 2, 2021
@aanm
Copy link
Member

aanm commented Aug 3, 2021 •
edited by maintainer-s-little-helper bot

test-me-please

Job 'Cilium-PR-Runtime-4.9' failed and has not been observed before, so may be related to your PR:

Click to show.

Test Name

RuntimeKafka Kafka Policy Ingress

Failure Output

FAIL: Vagrant status on failure:

If it is a flake, comment /mlh new-flake Cilium-PR-Runtime-4.9 so I can create a new GitHub issue to track it.

Job 'Cilium-PR-K8s-1.19-kernel-5.4' failed and has not been observed before, so may be related to your PR:

Click to show.

Test Name

K8sBookInfoDemoTest

Failure Output

FAIL: Vagrant status on failure:

If it is a flake, comment /mlh new-flake Cilium-PR-K8s-1.19-kernel-5.4 so I can create a new GitHub issue to track it.

aanm
aanm requested changes Aug 5, 2021
View reviewed changes
Copy link
Member

@aanm aanm left a comment •
edited by nathanjsweet

Choose a reason for hiding this comment

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

There are a couple of things that are missing:

  • test/provision/manifest needs a directory with the coredns released with 1.22.0, the location of those paths are available in the header of 1.21 files
  • All files under pkg/k8s/slim need to be updated with the changes from the 1.22 files. Instructions are available under pkg/k8s/slim/README.md
  • There are some changes needed in the DaemonSet as some fields are deprecated:
Warning: spec.template.spec.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[1].matchExpressions[0].key: beta.kubernetes.io/os is deprecated since v1.14; use "kubernetes.io/os" instead
Warning: spec.template.metadata.annotations[scheduler.alpha.kubernetes.io/critical-pod]: non-functional in v1.16+; use the "priorityClassName" field instead
  • Some Jenkins files need to be modified to pick up the new k8s version
  • The default k8s version needs to change in

    cilium/test/test_suite_test.go

    Line 31 in a8e3fa2

    "K8S_VERSION": "1.21",
  • contrib/vagrant/scripts/helpers.bash needs to be updated as well

Mostly following the similar changes performed in commit 382e7e4

@nathanjsweet nathanjsweet force-pushed the pr/nathanjsweet/update-k8s-to-1-22-0-rc0 branch from 382180c to 4908a59 Compare August 5, 2021 16:03
@nathanjsweet
Copy link
Member Author

nathanjsweet commented Oct 20, 2021 •
edited by maintainer-s-little-helper bot

/test

Job 'Cilium-PR-K8s-1.21-kernel-4.9' failed and has not been observed before, so may be related to your PR:

Click to show.

Test Name

K8sHubbleTest Hubble Observe Test FQDN Policy with Relay

Failure Output

FAIL: Found 1 k8s-app=cilium logs matching list of errors that must be investigated:

If it is a flake, comment /mlh new-flake Cilium-PR-K8s-1.21-kernel-4.9 so I can create a new GitHub issue to track it.

@nathanjsweet
Copy link
Member Author

Seems like it must be a flake, but I can't figure it out.

@nathanjsweet nathanjsweet added ready-to-merge This PR has passed all tests and received consensus from code owners to merge. and removed ready-to-merge This PR has passed all tests and received consensus from code owners to merge. labels Oct 21, 2021
@nbusseneau
Copy link
Member

/test-1.22-4.9

@nathanjsweet nathanjsweet force-pushed the pr/nathanjsweet/update-k8s-to-1-22-0-rc0 branch from c74d1be to 73ba07f Compare October 25, 2021 14:40
@nathanjsweet
Copy link
Member Author

/test-1.22-4.9

1 similar comment
@nathanjsweet
Copy link
Member Author

/test-1.22-4.9

christarazi
christarazi approved these changes Oct 25, 2021
View reviewed changes
Copy link
Member

@christarazi christarazi left a comment

Choose a reason for hiding this comment

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

LGTM :shipit:

@nathanjsweet nathanjsweet force-pushed the pr/nathanjsweet/update-k8s-to-1-22-0-rc0 branch from 25eb4c7 to 735c231 Compare October 26, 2021 14:51
@nathanjsweet
vendor: Update k8s dependencies and tests to 1.22.0-rc.0
0660aaf 
Signed-off-by: Nate Sweet <nathanjsweet@pm.me>
@nathanjsweet nathanjsweet force-pushed the pr/nathanjsweet/update-k8s-to-1-22-0-rc0 branch from 735c231 to 0660aaf Compare October 26, 2021 14:52
@nathanjsweet
Copy link
Member Author

/test-1.22-4.9

@nathanjsweet nathanjsweet added ready-to-merge This PR has passed all tests and received consensus from code owners to merge. and removed ready-to-merge This PR has passed all tests and received consensus from code owners to merge. labels Oct 26, 2021
@aanm aanm added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Oct 26, 2021
@nbusseneau
Copy link
Member

nbusseneau commented Oct 26, 2021 •
edited

Once this is actually merged, we need to rotate the /test (master branch) Jenkins triggers and Jenkins pipelines. This entails:

  • Adding Kernel 4.9 / K8s 1.22 testing
  • Testing Kernel 4.19 on 1.21 instead of 1.20
  • Testing Kernel 5.4 on 1.20 instead of 1.19
  • Rolling back 1.19 to 4.9 kernel
  • Updating the Table of Truth:tm:

Please ping me on Slack when merging 🚀

@kkourt kkourt merged commit cd8f5de into master Oct 27, 2021
@kkourt kkourt deleted the pr/nathanjsweet/update-k8s-to-1-22-0-rc0 branch October 27, 2021 14:50
nbusseneau added a commit to nbusseneau/cilium that referenced this pull request Oct 27, 2021
@nbusseneau
mlh: update Jenkins jobs following 1.22 support
975c821 
Following merge of cilium#16989, we now support K8s 1.22 and have rotated
the Jenkins test jobs as follow:

- Added: Kernel 4.9 testing on K8s 1.22
- Changed: Kernel 4.19 testing on K8s 1.21 (instead of 1.20)
- Changed: Kernel 5.4 testing on K8s 1.20 (instead of 1.19)
- Added: Kernel 4.9 testing on K8s 1.20
- Removed: Kernel 4.9 testing on K8s 1.21

See the Table of Truth:tm: for up to date status on all trigger phrases:
https://docs.google.com/spreadsheets/d/1TThkqvVZxaqLR-Ela4ZrcJ0lrTJByCqrbdCjnI32_X0/edit#gid=0

Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
@nbusseneau nbusseneau mentioned this pull request Oct 27, 2021
Merged
@nbusseneau nbusseneau mentioned this pull request Oct 27, 2021
Merged
nbusseneau added a commit to nbusseneau/cilium that referenced this pull request Nov 3, 2021
@nbusseneau
docs: add K8s 1.22 compatibility
6666c62 
Following merge of cilium#16989, we now support K8s 1.22 and the default K8s
version for Vagrant VMs is 1.21.

Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
nathanjsweet pushed a commit that referenced this pull request Nov 3, 2021
@nbusseneau @nathanjsweet
mlh: update Jenkins jobs following 1.22 support
6c0ea20 
Following merge of #16989, we now support K8s 1.22 and have rotated
the Jenkins test jobs as follow:

- Added: Kernel 4.9 testing on K8s 1.22
- Changed: Kernel 4.19 testing on K8s 1.21 (instead of 1.20)
- Changed: Kernel 5.4 testing on K8s 1.20 (instead of 1.19)
- Added: Kernel 4.9 testing on K8s 1.20
- Removed: Kernel 4.9 testing on K8s 1.21

See the Table of Truth:tm: for up to date status on all trigger phrases:
https://docs.google.com/spreadsheets/d/1TThkqvVZxaqLR-Ela4ZrcJ0lrTJByCqrbdCjnI32_X0/edit#gid=0

Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
nathanjsweet pushed a commit that referenced this pull request Nov 3, 2021
@nbusseneau @nathanjsweet
docs: add K8s 1.22 compatibility
ca78f91 
Following merge of #16989, we now support K8s 1.22 and the default K8s
version for Vagrant VMs is 1.21.

Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
@pchaigno pchaigno mentioned this pull request Nov 5, 2021
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aanm aanm aanm approved these changes

@aditighag aditighag aditighag left review comments

@rolinh rolinh rolinh approved these changes

@christarazi christarazi christarazi approved these changes

@nbusseneau nbusseneau nbusseneau approved these changes

Assignees

@aditighag aditighag

Labels
ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/minor This PR changes functionality that users may find relevant to operating Cilium. sig/k8s Impacts the kubernetes API, or kubernetes -> cilium internals translation layers.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@nathanjsweet @aanm @christarazi @nbusseneau @rolinh @aditighag @kkourt