diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2020-05-17 22:47:48 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2020-05-17 22:47:48 +0200 |
| commit | 30b03ed29bbdc276efc1dbd3322e6563c65f6f42 (patch) | |
| tree | 37b1a560d736f15f14a5f6d95e9178f751852b77 /inventory | |
| parent | jitsi-meet: actually use real secrets (diff) | |
| parent | sk-cloudia: switch to improved portmapping (diff) | |
Merge branch 'topic/kubernetes-standalone-portmap-fix'
Diffstat (limited to 'inventory')
| -rw-r--r-- | inventory/host_vars/sk-cloudia/vars.yml | 4 | ||||
| -rw-r--r-- | inventory/host_vars/sk-testvm.yml | 50 | ||||
| -rw-r--r-- | inventory/hosts.ini | 1 |
3 files changed, 51 insertions, 4 deletions
diff --git a/inventory/host_vars/sk-cloudia/vars.yml b/inventory/host_vars/sk-cloudia/vars.yml index f3b832e9..15dcb860 100644 --- a/inventory/host_vars/sk-cloudia/vars.yml +++ b/inventory/host_vars/sk-cloudia/vars.yml @@ -33,10 +33,10 @@ kubelet_zfs: kubernetes_version: 1.18.2 kubernetes_container_runtime: docker -kubernetes_standalone_max_pods: 42 +kubernetes_standalone_max_pods: 100 kubernetes_standalone_resolv_conf: /var/run/systemd/resolve/resolv.conf kubernetes_standalone_pod_cidr: 192.168.255.0/24 -kubernetes_standalone_cni_variant: with-localonly-portmap +kubernetes_standalone_cni_variant: with-portmap acmetool_directory_server: "{{ acmetool_directory_server_le_live_v2 }}" diff --git a/inventory/host_vars/sk-testvm.yml b/inventory/host_vars/sk-testvm.yml index 8ffb8ac7..e1a94c60 100644 --- a/inventory/host_vars/sk-testvm.yml +++ b/inventory/host_vars/sk-testvm.yml @@ -3,8 +3,8 @@ vm_host: sk-2019vm install: host: "{{ vm_host }}" - mem: 1024 - numcpu: 1 + mem: 10240 + numcpu: 4 disks: primary: /dev/sda scsi: @@ -36,3 +36,49 @@ external_ip: "{{ network.primary.overlay }}" # # https://owncloud.org/news/upgrading-owncloud-on-debian-stable-to-official-packages/ # + +docker_lvm: + vg: "{{ host_name }}" + lv: docker + size: 10G + fs: ext4 + +kubelet_lvm: + vg: "{{ host_name }}" + lv: kubelet + size: 5G + fs: ext4 + + +kubernetes_version: 1.18.2 +kubernetes_container_runtime: docker +kubernetes_standalone_max_pods: 42 +kubernetes_standalone_pod_cidr: 192.168.255.0/24 +kubernetes_standalone_cni_variant: with-portmap + + +nginx_server_names_hash_bucket_size: 64 +acmetool_directory_server: "{{ acmetool_directory_server_le_live_v2 }}" + + +jitsi_meet_base_path: /srv/jitsi/meet + +jitsi_meet_version: stable-4548-1 +jitsi_meet_hostnames: + - meet-dev.elev8.at + +jitsi_meet_secrets: "{{ vault_jitsi_meet_secrets }}" + + +nextcloud_base_path: /srv/nextcloud +nextcloud_instances: + wolke-dev.elev8.at: + # new: true + version: 18.0.4 + port: 8100 + hostnames: + - wolke-dev.elev8.at + database: + type: mariadb + version: 10.4.13 + password: "{{ vault_nextcloud_database_passwords['wolke-dev.elev8.at'] }}" diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 89d073a8..a6a2c75e 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -305,6 +305,7 @@ k8s-lwl sk-cloudia ele-thetys lw-thetys +sk-testvm [kubernetes:children] kubernetes-cluster |