diff --git a/bin/gen_list.sh b/bin/gen_list.sh old mode 100644 new mode 100755 diff --git a/tasks/main.yml b/tasks/main.yml index 5dc7215..a788166 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -5,6 +5,7 @@ k8s: state: present context: "{{ my_context }}" + merge_type: merge resource_definition: "{{ lookup('file', item) | from_yaml }}" with_items: - "{{ calico_files }}" diff --git a/vars/calico-files.yaml b/vars/calico-files.yaml new file mode 100644 index 0000000..9532c7b --- /dev/null +++ b/vars/calico-files.yaml @@ -0,0 +1,25 @@ +--- +calico_files: + - "version/calico-config-ConfigMap.yaml" + - "version/bgpconfigurations.crd.projectcalico.org-CustomResourceDefinition.yaml" + - "version/bgppeers.crd.projectcalico.org-CustomResourceDefinition.yaml" + - "version/blockaffinities.crd.projectcalico.org-CustomResourceDefinition.yaml" + - "version/clusterinformations.crd.projectcalico.org-CustomResourceDefinition.yaml" + - "version/felixconfigurations.crd.projectcalico.org-CustomResourceDefinition.yaml" + - "version/globalnetworkpolicies.crd.projectcalico.org-CustomResourceDefinition.yaml" + - "version/globalnetworksets.crd.projectcalico.org-CustomResourceDefinition.yaml" + - "version/hostendpoints.crd.projectcalico.org-CustomResourceDefinition.yaml" + - "version/ipamblocks.crd.projectcalico.org-CustomResourceDefinition.yaml" + - "version/ipamconfigs.crd.projectcalico.org-CustomResourceDefinition.yaml" + - "version/ipamhandles.crd.projectcalico.org-CustomResourceDefinition.yaml" + - "version/ippools.crd.projectcalico.org-CustomResourceDefinition.yaml" + - "version/networkpolicies.crd.projectcalico.org-CustomResourceDefinition.yaml" + - "version/networksets.crd.projectcalico.org-CustomResourceDefinition.yaml" + - "version/calico-kube-controllers-ClusterRole.yaml" + - "version/calico-kube-controllers-ClusterRoleBinding.yaml" + - "version/calico-node-ClusterRole.yaml" + - "version/calico-node-ClusterRoleBinding.yaml" + - "version/calico-node-DaemonSet.yaml" + - "version/calico-node-ServiceAccount.yaml" + - "version/calico-kube-controllers-Deployment.yaml" + - "version/calico-kube-controllers-ServiceAccount.yaml"