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

Use CNI private for Calico Enterprise installs #514

Merged
merged 1 commit into from Apr 22, 2020
Merged

Use CNI private for Calico Enterprise installs #514

merged 1 commit into from Apr 22, 2020

Conversation

Brian-McM
Copy link
Contributor

Multi NICs is only going to be available for Calico Enterprise installations which is why this change needs to happen

@tmjd tmjd added this to the v1.6.0 milestone Apr 17, 2020
Copy link
Member

@tmjd tmjd left a comment

Choose a reason for hiding this comment

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

LGTM

@Brian-McM Brian-McM added enterprise Feature applies to enterprise only kind/enhancement New feature or request and removed enterprise Feature applies to enterprise only labels Apr 17, 2020
@ozdanborne
Copy link
Member

ozdanborne commented Apr 17, 2020

If we're no longer using OS calico/cni, we should update versions.yml of calico-private accordingly, since it's used to generate the image pull/retag/push instructions for airgapped clusters.

Remove this entry: https://github.com/tigera/calico-private/blob/master/_data/versions.yml#L94-L97

And add a new entry for "tigera-cni".

I skimmed through the calico-private repo and no other place uses it (except helm charts which i'm removing)

@ozdanborne
Copy link
Member

You'll also need to update tigera/process to set "tigera-cni" when it's generating versions.yml to pass to gen-versions.

Multi NICs is only going to be available for Calico Enterprise installations which is why this change needs to happen
@Brian-McM Brian-McM merged commit 7abbdf8 into tigera:master Apr 22, 2020
@Brian-McM Brian-McM deleted the bm-use-cni-priate branch April 22, 2020 16:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants