Cleanup and reorganize vars by environment

inventories/prod/group_vars/k8s-cluster.yml

@@ -0,0 +1,3 @@
+---
+cluster_name: banditlair
+dns_domain: banditlair.com

inventories/prod/groups

@@ -0,0 +1,17 @@
+[prod-master]
+[prod-etcd]
+[prod-node]
+
+[kube-master:children]
+prod-master
+
+[etcd:children]
+prod-etcd
+
+[kube-node:children]
+prod-node
+
+[k8s-cluster:children]
+kube-master
+etcd
+kube-node

inventories/prod/scaleway_inventory.yml

@@ -0,0 +1,12 @@
+plugin: scaleway
+hostnames:
+  - hostname
+regions:
+  - par1
+  - ams1
+tags:
+  - prod-master
+  - prod-etcd
+  - prod-node
+variables:
+  ansible_host: public_ip.address

inventories/test/group_vars/all.yml

@@ -1,10 +0,0 @@
----
-kubeadm_enabled: true
-kube_api_anonymous_auth: true
-skip_non_kubeadm_warning: false
-helm_enabled: true
-ingress_nginx_enabled: true
-ingress_nginx_host_network: true
-ingress_nginx_nodeselector:
-  node-role.kubernetes.io/node: ""
-cert_manager_enabled: true

inventories/test/group_vars/k8s-cluster.yml

@@ -1,6 +1,3 @@
 ---
-ip: "{{vpn_ip}}"
-kube_network_plugin: flannel
-bin_dir: /usr/local/bin
-cluster_name: banditlair-staging
-dns_domain: staging.k8s.banditlair.com
+cluster_name: banditlair-test
+dns_domain: test.k8s.banditlair.com

inventories/test/group_vars/kube-master.yml

@@ -1,2 +0,0 @@
----
-vpn_ip: 192.168.66.{{ 0 +(inventory_hostname|regex_replace('\D+','')|int) }}

inventories/test/group_vars/kube-node.yml

@@ -1,2 +0,0 @@
----
-vpn_ip: 192.168.66.{{ 100 +( inventory_hostname|regex_replace('\D+','')|int) }}