[WIP] Tuning parameters to make end-to-end testing work.
Please don't merge this patch, it's not ready yet.
When it's ready, this message will be gone.
- Disble Hugepage to avoid ngic-dp crash.
- Adding debug parameter in accelleran.
Change-Id: I98edeaef82d2bae9759bd1a4157694a709c3fbe8
diff --git a/mcord/cni-config/04-sriov-device-plugin-configmap.yaml b/mcord/cni-config/04-sriov-device-plugin-configmap.yaml
index 086b9e7..3069f96 100644
--- a/mcord/cni-config/04-sriov-device-plugin-configmap.yaml
+++ b/mcord/cni-config/04-sriov-device-plugin-configmap.yaml
@@ -17,7 +17,7 @@
kind: ConfigMap
apiVersion: v1
metadata:
- name: multus-certs
+ name: multus-scripts
namespace: kube-system
data:
install-certs.sh: |
@@ -29,7 +29,7 @@
KUBE_CA_FILE=$SERVICE_ACCOUNT_PATH/ca.crt
TLS_CFG="certificate-authority-data: $(cat $KUBE_CA_FILE | base64 | tr -d '\n')"
SERVICEACCOUNT_TOKEN=$(cat $SERVICE_ACCOUNT_PATH/token)
- #cat > /host/etc/cni/net.d/multus-kubeconfig <<EOF
+ cat > /host/etc/cni/net.d/multus-kubeconfig <<EOF
# Kubeconfig file for Multus CNI plugin.
apiVersion: v1
kind: Config
@@ -49,6 +49,23 @@
user: multus
current-context: multus-context
EOF
+ install-multus-conf.sh: |
+ # copied from https://github.com/intel/multus-cni/blob/master/images/entrypoint.sh
+ rm -f /host/etc/cni/net.d/00-multus.conf
+ MASTER_PLUGIN="$(ls /host/etc/cni/net.d | grep -E '\.conf(list)?$' | head -1)"
+ MASTER_PLUGIN_JSON="$(cat /host/etc/cni/net.d/$MASTER_PLUGIN)"
+ cat > /host/etc/cni/net.d/00-multus.conf <<EOF
+ {
+ "name": "multus-cni-network",
+ "type": "multus",
+ "logFile": "/var/log/multus.log",
+ "logLevel": "debug",
+ "kubeconfig": "/etc/cni/net.d/multus-kubeconfig",
+ "delegates": [
+ $MASTER_PLUGIN_JSON
+ ]
+ }
+ EOF
---
kind: ConfigMap
apiVersion: v1
@@ -68,27 +85,3 @@
}
]
}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: multus-conf
- namespace: kube-system
-data:
- 01-cni-conf.json: |
- {
- "name": "multus-cni-network",
- "type": "multus",
- "logLevel": "debug",
- "logFile": "/tmp/multus.log",
- "kubeconfig": "/etc/cni/net.d/multus-kubeconfig",
- "delegates": [
- {
- "name": "cbr0",
- "type": "flannel",
- "delegate": {
- "isDefaultGateway": true
- }
- }
- ]
- }