Skip to content

Use right CCNP validation#12106

Merged
aanm merged 2 commits intocilium:masterfrom
aanm:pr/fix-ccnp-validation
Jun 17, 2020
Merged

Use right CCNP validation#12106
aanm merged 2 commits intocilium:masterfrom
aanm:pr/fix-ccnp-validation

Conversation

@aanm
Copy link
Copy Markdown
Member

@aanm aanm commented Jun 16, 2020 •
edited
Loading 

Use right schema when validating CCNP in pre-flight upgrade step

Note for backporters, ping me if this does not apply cleanly for 1.6 branch

aanm added 2 commits June 16, 2020 17:41
@aanm
pkg/k8s: replace init with specific functions
a6f9436 
Having a init function to initialize all structures does not initialize
the different fields of 'CNPCRV' in case this variable is accessed
outside the 'v2/client' package. Replacing the 'init' function with
dedicated functions that initialize those fields allows 'CNPCRV' to have
the fields rightfully initialized.

Signed-off-by: André Martins <andre@cilium.io>
@aanm
cilium/cmd: use right CCNP validation
eb8ec18 
The CCNP validation is different from the CNP validation so we need to
validate the CCNP with the right schema validation.

Fixes: 9b0ae85 ("k8s: Fix CCNP for host policies")
Signed-off-by: André Martins <andre@cilium.io>
@aanm aanm added needs-backport/1.6 release-note/misc This PR makes changes that have no direct user impact. labels Jun 16, 2020
@aanm aanm requested a review from a team as a code owner June 16, 2020 15:45
@aanm aanm requested a review from a team June 16, 2020 15:45
@aanm
Copy link
Copy Markdown
Member Author

aanm commented Jun 16, 2020

test-me-please

@coveralls
Copy link
Copy Markdown

coveralls commented Jun 16, 2020

Coverage Status

Coverage increased (+0.01%) to 37.081% when pulling eb8ec18 on aanm:pr/fix-ccnp-validation into 331aab4 on cilium:master.

christarazi
christarazi approved these changes Jun 16, 2020
View reviewed changes
Copy link
Copy Markdown
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

@aanm
Copy link
Copy Markdown
Member Author

aanm commented Jun 16, 2020

test-me-please

@aanm aanm mentioned this pull request Jun 16, 2020
Merged
@aanm
Copy link
Copy Markdown
Member Author

aanm commented Jun 16, 2020

k8s 4.19 hit #12120

@aanm aanm merged commit 35501c7 into cilium:master Jun 17, 2020
@jrajahalme jrajahalme mentioned this pull request Jun 18, 2020
Merged
@christarazi christarazi mentioned this pull request Jun 30, 2020
Merged
@nebril nebril mentioned this pull request Jun 30, 2020
Merged
@aanm aanm deleted the pr/fix-ccnp-validation branch June 30, 2020 20:43
@joestringer
Copy link
Copy Markdown
Member

joestringer commented Jun 30, 2020

@aanm what's the v1.6 aspect of this? CCNP didn't land until v1.7.

@aanm aanm mentioned this pull request Jun 30, 2020
Merged
@christarazi christarazi mentioned this pull request Jul 1, 2020
Merged
@joestringer joestringer mentioned this pull request Oct 12, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@christarazi christarazi christarazi approved these changes

Assignees

No one assigned

Labels

release-note/misc This PR makes changes that have no direct user impact.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@aanm @coveralls @joestringer @christarazi @borkmann @jrajahalme