Skip to content

Update k8s to latest v1.20.x#4926

Merged
mxpv merged 1 commit intocontainerd:masterfrom
dims:update-k8s-to-latest-v1.20.x
Jan 13, 2021
Merged

Update k8s to latest v1.20.x#4926
mxpv merged 1 commit intocontainerd:masterfrom
dims:update-k8s-to-latest-v1.20.x

Conversation

@dims
Copy link
Copy Markdown
Member

@dims dims commented Jan 12, 2021

No description provided.

@dims dims force-pushed the update-k8s-to-latest-v1.20.x branch from a84512e to 1732d6a Compare January 12, 2021 02:18
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jan 12, 2021

Build succeeded.

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jan 12, 2021

Build succeeded.

  • containerd-build-arm64 : RETRY_LIMIT in 1m 00s (non-voting)

@dims dims force-pushed the update-k8s-to-latest-v1.20.x branch from a1e2e70 to 5a8d25c Compare January 12, 2021 04:19
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jan 12, 2021

Build succeeded.

thaJeztah
thaJeztah reviewed Jan 12, 2021
View reviewed changes
Comment thread pkg/cri/server/container_create_linux.go Outdated
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah Jan 12, 2021

Choose a reason for hiding this comment

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

Looks like this was deprecated in kubernetes/kubernetes@7b9d7fd (part of kubernetes/kubernetes#95876)

Can we replace this for GetApparmor, and use the new type? (or at least add a TODO and a tracking issue)?

Copy link
Copy Markdown
Member Author

@dims dims Jan 12, 2021

Choose a reason for hiding this comment

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

yep, will switch to the new API, hence the WIP. Also it's weird that the lint:ignore is being ignored!

Copy link
Copy Markdown
Member

@thaJeztah thaJeztah Jan 12, 2021

Choose a reason for hiding this comment

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

Can you try;

Suggested change
securityContext.GetApparmorProfile(), //lint:ignore SA1019 ignore deprecated warning
securityContext.GetApparmorProfile(), //nolint:staticcheck // ignore SA1019 ignore deprecated warning

(looked up how we ignore these in the docker code, and that seems to work there)

Copy link
Copy Markdown
Member Author

@dims dims Jan 12, 2021

Choose a reason for hiding this comment

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

Looks like @mikebrow wrapped up these in #4700 yay!

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jan 12, 2021

Build succeeded.

  • containerd-build-arm64 : RETRY_LIMIT in 1m 00s (non-voting)

@dims dims force-pushed the update-k8s-to-latest-v1.20.x branch from e001beb to ac8d82b Compare January 12, 2021 16:15
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jan 12, 2021

Build succeeded.

  • containerd-build-arm64 : RETRY_LIMIT in 1m 00s (non-voting)

@dims dims force-pushed the update-k8s-to-latest-v1.20.x branch from ac8d82b to ba1c2d5 Compare January 12, 2021 16:27
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jan 12, 2021

Build succeeded.

  • containerd-build-arm64 : RETRY_LIMIT in 1m 00s (non-voting)

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jan 12, 2021

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.

@dims dims force-pushed the update-k8s-to-latest-v1.20.x branch 2 times, most recently from ee0e87d to 591769c Compare January 12, 2021 19:13
@dims dims changed the title [WIP] Update k8s to latest v1.20.x Update k8s to latest v1.20.x Jan 12, 2021
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jan 12, 2021

Build succeeded.

@dims dims force-pushed the update-k8s-to-latest-v1.20.x branch from 591769c to 981d940 Compare January 12, 2021 20:35
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jan 12, 2021

Build succeeded.

@dims
Bump k8s deps to v1.20.1
378c119 
Signed-off-by: Davanum Srinivas <[email protected]>
@dims dims force-pushed the update-k8s-to-latest-v1.20.x branch from 981d940 to 378c119 Compare January 12, 2021 21:44
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jan 12, 2021

Build succeeded.

mikebrow
mikebrow approved these changes Jan 12, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

LGTM

cpuguy83
cpuguy83 approved these changes Jan 13, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

LGTM

@mxpv mxpv merged commit 124fc14 into containerd:master Jan 13, 2021
@bobbypage bobbypage mentioned this pull request Jan 26, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@thaJeztah thaJeztah thaJeztah left review comments

@cpuguy83 cpuguy83 cpuguy83 approved these changes

@mxpv mxpv mxpv approved these changes

@mikebrow mikebrow mikebrow approved these changes

Assignees

@mikebrow mikebrow

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@dims @cpuguy83 @mxpv @thaJeztah @mikebrow