Add the option to auto generate 00-multus.conf #160
Conversation
Kusanagi9999
force-pushed
the
add-auto-config-generation
branch
2 times, most recently
from
00345c2
to
3781593
Compare
Kusanagi9999
force-pushed
the
add-auto-config-generation
branch
2 times, most recently
from
c780187
to
a0ea2c8
Compare
Dockerfile
Outdated
| @@ -12,6 +12,11 @@ RUN yum install -y $INSTALL_PKGS && \ | |||
| yum clean all && \ | |||
| rm -rf /tmp/* | |||
|
|
|||
| # Install jq : command-line JSON processor | |||
| RUN curl -L https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 > jq && \ | |||
There was a problem hiding this comment.
@Kusanagi9999 -- I think for the time being if we can remove the use of jq / including the jq binary here, we could be OK to get this merged into master. Granted, it'll make the resulting config a little less human legible, but... I think that'll be OK, it'll still parse. One of my colleagues mentioned that idea of making a go application to pretty print JSON and doing a multi-stage build, but... I think that might be overkill for now.
Thank you a bunch for the pull request -- cool feature!
There was a problem hiding this comment.
OK, sounds good. I removed jq for now.
Kusanagi9999
force-pushed
the
add-auto-config-generation
branch
2 times, most recently
from
4baea26
to
7d55e28
Compare
|
Changed the grep expression to a more precise regex : |
images/entrypoint.sh
Outdated
| { | ||
| "name": "multus-cni-network", | ||
| "type": "multus", | ||
| "kubeconfig": "$MULTUS_KUBECONFIG", |
There was a problem hiding this comment.
This will generate Err in loading K8s Delegates k8s args: GetK8sClient: failed to get context for the kubeconfig /host/etc/cni/net.d/multus.d/multus.kubeconfig it should be /etc/cni/net.d/multus.d/multus.kubeconfig
When `--multus-conf-file=auto` is used, 00-multus.conf will be automatically generated from the CNI configuration file of the master plugin (the first file in lexicographical order in cni-conf-dir).
Kusanagi9999
force-pushed
the
add-auto-config-generation
branch
from
7d55e28
to
91eaf6d
Compare
…ion-bump OCPBUGS-12519: Bump golang.org/x/net from 0.1.0 to 0.7.0 (k8snetworkplumbingwg#1039)
When
--multus-conf-file=autois used, 00-multus.conf will be automatically generated from the CNI configuration file of the master plugin (the first file in lexicographical order in cni-conf-dir).@rkamudhan @dougbtv @tomo