Update install script to allow conf name changes #392
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
k8s-install/scripts/install-cni.sh
Outdated
| @@ -128,18 +128,23 @@ sed -i s~__ETCD_CA_CERT_FILE__~${CNI_CONF_ETCD_CA:-}~g $TMP_CONF | |||
| sed -i s~__ETCD_ENDPOINTS__~${ETCD_ENDPOINTS:-}~g $TMP_CONF | |||
| sed -i s~__LOG_LEVEL__~${LOG_LEVEL:-warn}~g $TMP_CONF | |||
|
|
|||
| FILENAME=${CNI_CONF_NAME:-10-calico.conf} | |||
| CNI_CONF_NAME=${CNI_CONF_NAME:-10-calico.conf} | |||
| CNI_OLD_NAME=${CNI_OLD_NAME:-10-calico.conf} | |||
There was a problem hiding this comment.
One minor thing - I think it would be good to name the config option CNI_OLD_CONF_NAME to make it more clear it's referring to the old CNI configuration file name, not something else.
weikinhuang
force-pushed
the
conf-conflist-upgrade
branch
from
a461fbd to
ec0e68c
Compare
caseydavenport
approved these changes
Oct 11, 2017
|
Thanks! |
|
will a release be cut for this? I see that this has a v2.6.2 milestone label. |
|
@weikinhuang sorry for the long delay. This exists now in Calico v3.0.0-beta1. We also need to port this to v2.6.x, which is now looking like v2.6.4. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This will allow users to upgrade the calico cni config to a different name while at the same time will clean up the old config files. This change is useful in the case where we want to move to a
.conflistextension to enable additional plugins such asportmapduring a upgrade.This mirrors changes in coreos/flannel-cni#5.
Todos
Release Note