diff options
Diffstat (limited to 'kud')
10 files changed, 11 insertions, 19 deletions
diff --git a/kud/demo/firewall/charts/sink/templates/configmap.yaml b/kud/demo/firewall/charts/sink/templates/configmap.yaml index 3abfef26..95a30513 100644 --- a/kud/demo/firewall/charts/sink/templates/configmap.yaml +++ b/kud/demo/firewall/charts/sink/templates/configmap.yaml @@ -3,5 +3,5 @@ kind: ConfigMap metadata: name: {{ include "sink.name" .}}-configmap data: - protected_net_gw: {{ .Values.global.protectedNetGw }} + protected_net_gw: {{ .Values.global.protectedNetGwIp }} protected_private_net_cidr: {{ .Values.global.protectedPrivateNetCidr }} diff --git a/kud/demo/firewall/values.yaml b/kud/demo/firewall/values.yaml index e8ab8cdb..4c0431be 100644 --- a/kud/demo/firewall/values.yaml +++ b/kud/demo/firewall/values.yaml @@ -19,10 +19,6 @@ resources: global: #Networks - protectedNetworkName: protected-private-net - protectedNetCidr: 192.168.20.0/24 - protectedNetGw: 192.168.20.100/24 - unprotectedNetworkName: unprotected-private-net protectedPrivateNetCidr: 192.168.10.0/24 protectedPrivateNetGw: 192.168.10.1/24 @@ -31,6 +27,11 @@ global: onapPrivateNetCidr: 10.10.0.0/16 onapPrivateNetGw: 10.10.0.1/16 + protectedNetworkName: protected-private-net + protectedNetCidr: 192.168.20.0/24 + protectedNetGwIp: 192.168.20.100 + protectedNetGw: 192.168.20.100/24 + #vFirewall container vfwPrivateIp0: 192.168.10.3 vfwPrivateIp1: 192.168.20.2 diff --git a/kud/deployment_infra/galaxy-requirements.yml b/kud/deployment_infra/galaxy-requirements.yml index 5d232451..093dec87 100644 --- a/kud/deployment_infra/galaxy-requirements.yml +++ b/kud/deployment_infra/galaxy-requirements.yml @@ -9,8 +9,6 @@ ############################################################################## - src: andrewrothstein.go version: v2.1.10 -- src: andrewrothstein.kubectl - version: v1.1.18 - src: andrewrothstein.kubernetes-helm version: v1.2.9 - src: geerlingguy.docker diff --git a/kud/deployment_infra/playbooks/configure-istio.yml b/kud/deployment_infra/playbooks/configure-istio.yml index 72542e5a..3a1ca8ed 100644 --- a/kud/deployment_infra/playbooks/configure-istio.yml +++ b/kud/deployment_infra/playbooks/configure-istio.yml @@ -14,8 +14,6 @@ include_vars: file: kud-vars.yml roles: - - role: andrewrothstein.kubectl - kubectl_ver: "v{{ kubectl_version }}" - role: andrewrothstein.kubernetes-helm kubernetes_helm_ver: "v{{ helm_client_version }}" tasks: diff --git a/kud/deployment_infra/playbooks/configure-multus.yml b/kud/deployment_infra/playbooks/configure-multus.yml index 91da8746..9cca54d1 100644 --- a/kud/deployment_infra/playbooks/configure-multus.yml +++ b/kud/deployment_infra/playbooks/configure-multus.yml @@ -89,9 +89,6 @@ - name: Load kud variables include_vars: file: kud-vars.yml - roles: - - role: andrewrothstein.kubectl - kubectl_ver: "v{{ kubectl_version }}" tasks: - name: define a CRD network object specification blockinfile: diff --git a/kud/deployment_infra/playbooks/configure-nfd.yml b/kud/deployment_infra/playbooks/configure-nfd.yml index a091d04b..590212cf 100644 --- a/kud/deployment_infra/playbooks/configure-nfd.yml +++ b/kud/deployment_infra/playbooks/configure-nfd.yml @@ -50,9 +50,6 @@ - name: Load kud variables include_vars: file: kud-vars.yml - roles: - - role: andrewrothstein.kubectl - kubectl_ver: "v{{ kubectl_version }}" tasks: - name: create service accounts command: "/usr/local/bin/kubectl apply -f /tmp/{{ item }}" diff --git a/kud/deployment_infra/playbooks/configure-virtlet.yml b/kud/deployment_infra/playbooks/configure-virtlet.yml index aba849a4..18d3740a 100644 --- a/kud/deployment_infra/playbooks/configure-virtlet.yml +++ b/kud/deployment_infra/playbooks/configure-virtlet.yml @@ -15,8 +15,6 @@ include_vars: file: kud-vars.yml roles: - - role: andrewrothstein.kubectl - kubectl_ver: "v{{ kubectl_version }}" - role: geerlingguy.docker when: virtlet_source_type == "source" tasks: diff --git a/kud/deployment_infra/playbooks/kud-vars.yml b/kud/deployment_infra/playbooks/kud-vars.yml index d7ada47e..b11672f3 100644 --- a/kud/deployment_infra/playbooks/kud-vars.yml +++ b/kud/deployment_infra/playbooks/kud-vars.yml @@ -59,7 +59,6 @@ ovn4nfv_url: "https://git.opnfv.org/ovn4nfv-k8s-plugin/" go_version: '1.12.4' kubespray_version: 2.8.2 -kubectl_version: 1.12.2 helm_client_version: 2.9.1 # kud playbooks not compatible with 2.8.0 - see MULTICLOUD-634 ansible_version: 2.7.10 diff --git a/kud/hosting_providers/vagrant/installer.sh b/kud/hosting_providers/vagrant/installer.sh index 2168d0d3..346e2f69 100755 --- a/kud/hosting_providers/vagrant/installer.sh +++ b/kud/hosting_providers/vagrant/installer.sh @@ -131,6 +131,8 @@ function install_k8s { # Configure environment mkdir -p $HOME/.kube cp $kud_inventory_folder/artifacts/admin.conf $HOME/.kube/config + # Copy Kubespray kubectl to be usable in host running Ansible. Requires kubectl_localhost: true in inventory/group_vars/k8s-cluster.yml + sudo cp $kud_inventory_folder/artifacts/kubectl /usr/local/bin/ } # install_addons() - Install Kubenertes AddOns diff --git a/kud/hosting_providers/vagrant/inventory/group_vars/k8s-cluster.yml b/kud/hosting_providers/vagrant/inventory/group_vars/k8s-cluster.yml index 8f719a43..9966ba8a 100644 --- a/kud/hosting_providers/vagrant/inventory/group_vars/k8s-cluster.yml +++ b/kud/hosting_providers/vagrant/inventory/group_vars/k8s-cluster.yml @@ -38,8 +38,10 @@ kube_token_auth: true # Can also be set to 'cloud', which lets the cloud provider setup appropriate routing kube_network_plugin: flannel -# Make a copy of kubeconfig on the host that runs Ansible in GITDIR/artifacts +# Make a copy of kubeconfig (admin.conf) on the host that runs Ansible to inventory/artifacts kubeconfig_localhost: true +# Copy kubectl binary on the host that runs Ansible to inventory/artifacts +kubectl_localhost: true # Enable MountPropagation gate feature local_volumes_enabled: true |