diff options
Diffstat (limited to 'kud')
-rw-r--r-- | kud/demo/firewall/charts/sink/templates/configmap.yaml | 2 | ||||
-rw-r--r-- | kud/deployment_infra/playbooks/configure-multus.yml | 38 |
2 files changed, 19 insertions, 21 deletions
diff --git a/kud/demo/firewall/charts/sink/templates/configmap.yaml b/kud/demo/firewall/charts/sink/templates/configmap.yaml index 95a30513..89be1f77 100644 --- a/kud/demo/firewall/charts/sink/templates/configmap.yaml +++ b/kud/demo/firewall/charts/sink/templates/configmap.yaml @@ -1,4 +1,4 @@ -piVersion: v1 +apiVersion: v1 kind: ConfigMap metadata: name: {{ include "sink.name" .}}-configmap diff --git a/kud/deployment_infra/playbooks/configure-multus.yml b/kud/deployment_infra/playbooks/configure-multus.yml index 9cca54d1..47109162 100644 --- a/kud/deployment_infra/playbooks/configure-multus.yml +++ b/kud/deployment_infra/playbooks/configure-multus.yml @@ -62,27 +62,25 @@ mode: 0755 when: multus_source_type == "tarball" - name: create multus configuration file - blockinfile: - marker: "" - path: /etc/cni/net.d/00-multus.conf - create: yes - block: | - { - "type": "multus", - "name": "multus-cni", - "cniVersion": "0.3.1", - "kubeconfig": "/etc/kubernetes/admin.conf", - "delegates": [ - { - "type": "flannel", + copy: + dest: /etc/cni/net.d/00-multus.conf + content: | + { + "type": "multus", + "name": "multus-cni", "cniVersion": "0.3.1", - "masterplugin": true, - "delegate": { - "isDefaultGateway": true - } - } - ] - } + "kubeconfig": "/etc/kubernetes/admin.conf", + "delegates": [ + { + "type": "flannel", + "cniVersion": "0.3.1", + "masterplugin": true, + "delegate": { + "isDefaultGateway": true + } + } + ] + } - hosts: localhost pre_tasks: |