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.

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

Backport of CNI: Add support for OpenShift and Multus into release/0.49.x #1539

Conversation

hc-github-team-consul-ecosystem
Copy link
Contributor

Backport

This PR is auto-generated from #1527 to be assessed for backporting due to the inclusion of the label backport/0.49.x.

The below text is copied from the body of the original PR.


Changes proposed in this PR:

This PR adds support for OpenShift and Multus in CNI. OpenShift uses Multus as the base CNI plugin.

  • Added SecurityContextConstraints CRD so that CNI has the permissions to run on OpenShift and gave the consul-cni service account permissions to reach OpenShifts SCC CRD.
  • Added a --multus flag to the CNI installer so that the flag can be used by the CNI plugin.
  • When --multus flag is set, create a default Network Attachment Definition CRD for Multus to use. Note, Pods require an annotation in order for Multus to run the consul-cni plugin. Please see Multus documentation for more information about how to use Multus.
  • Fix: Fixed installer to rename .conf file .conflist file when consul-cni is added to a base plugin.
  • Improvement: The plugin is now more consistent at updating annotations.

How I've tested this PR:

  • Manual testing of Multus on OpenShift
  • Manual testing of Multus on Kind
  • Acceptance and unit tests.

How I expect reviewers to test this PR:

👀

Checklist:

  • Tests added
  • CHANGELOG entry added

    HashiCorp engineers only, community PRs should not add a changelog entry.
    Entries should use present tense (e.g. Add support for...)


Overview of commits

@hc-github-team-consul-ecosystem hc-github-team-consul-ecosystem force-pushed the backport/curtbushko/cni-openshift/jointly-viable-swift branch from fb398b0 to c6811ed Compare September 27, 2022 16:12
@hc-github-team-consul-ecosystem hc-github-team-consul-ecosystem merged commit d1bfbd5 into release/0.49.x Sep 27, 2022
@hc-github-team-consul-ecosystem hc-github-team-consul-ecosystem deleted the backport/curtbushko/cni-openshift/jointly-viable-swift branch September 27, 2022 16:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants