From 6ec7bbea9adf359144d8536f57ea89dd5d2f0f76 Mon Sep 17 00:00:00 2001 From: Grigoriy Mikhalkin Date: Tue, 30 Aug 2022 22:29:26 +0200 Subject: [PATCH 01/29] headscale config --- deploy_control_plane.yaml | 2 ++ docker-compose.yml | 1 + headscale-ingress.yaml | 21 +++++++++++++++++++ inventories/group_vars/all/images.yaml | 2 +- .../group_vars/control-plane/headscale.yaml | 18 ++++++++++++++++ .../group_vars/control-plane/metal.yml | 2 +- 6 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 headscale-ingress.yaml create mode 100644 inventories/group_vars/control-plane/headscale.yaml diff --git a/deploy_control_plane.yaml b/deploy_control_plane.yaml index edbdef95..0ebf2361 100644 --- a/deploy_control_plane.yaml +++ b/deploy_control_plane.yaml @@ -24,3 +24,5 @@ tags: masterdata-db - name: metal-roles/control-plane/roles/metal tags: metal + - name: metal-roles/control-plane/roles/headscale + tags: headscale diff --git a/docker-compose.yml b/docker-compose.yml index 0e2ffd64..a91e864e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,6 +8,7 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock - .:/mini-lab + - /home/grigoriy/Projects/metal-roles:/mini-lab/metal-roles # for developing role dependencies # TODO: make this a switch # - ${HOME}/.ansible/roles/ansible-common:/root/.ansible/roles/ansible-common:ro diff --git a/headscale-ingress.yaml b/headscale-ingress.yaml new file mode 100644 index 00000000..69423e23 --- /dev/null +++ b/headscale-ingress.yaml @@ -0,0 +1,21 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + annotations: + kubernetes.io/ingress.class: nginx + nginx.ingress.kubernetes.io/force-ssl-redirect: "false" + nginx.ingress.kubernetes.io/ssl-redirect: "false" + name: headscale-ingress + namespace: headscale +spec: + rules: + - host: headscale.172.17.0.1.nip.io + http: + paths: + - backend: + service: + name: headscale + port: + number: 8080 + path: / + pathType: ImplementationSpecific diff --git a/inventories/group_vars/all/images.yaml b/inventories/group_vars/all/images.yaml index 86b83341..d3d1896f 100644 --- a/inventories/group_vars/all/images.yaml +++ b/inventories/group_vars/all/images.yaml @@ -5,7 +5,7 @@ metal_stack_release_version: develop ## for development purposes, you can override releases from our image vector here ## -# metal_hammer_image_url: https://images.metal-stack.io/metal-hammer/pull-requests//metal-hammer-initrd.img.lz4 +metal_hammer_image_url: https://images.metal-stack.io/metal-hammer/pull-requests/87-headscale/metal-hammer-initrd.img.lz4 # metal_api_image_name: # metal_api_image_tag: # metal_metalctl_image_name: diff --git a/inventories/group_vars/control-plane/headscale.yaml b/inventories/group_vars/control-plane/headscale.yaml new file mode 100644 index 00000000..7f71db5d --- /dev/null +++ b/inventories/group_vars/control-plane/headscale.yaml @@ -0,0 +1,18 @@ +--- +headscale_image_name: headscale/headscale +headscale_image_tag: 0.15.0-alpine + +headscale_db_image_name: timescale/timescaledb +headscale_db_image_tag: 2.6.1-pg12 +headscale_db_storage_size: 200Mi + +headscale_db_backup_restore_sidecar_image_name: ghcr.io/metal-stack/backup-restore-sidecar +headscale_db_backup_restore_sidecar_image_tag: v0.6.3 +headscale_db_backup_restore_sidecar_provider: local + +headscale_private_key: c8e07b737d04715f1f5c1318334e888f65e6a704ea85d0cddaa31b2c5589ef7f +headscale_ingress_dns: headscale.metal-stack.io + +disable_ingress: true + +headscale_db_resources: {} diff --git a/inventories/group_vars/control-plane/metal.yml b/inventories/group_vars/control-plane/metal.yml index 2c5f070a..78486a30 100644 --- a/inventories/group_vars/control-plane/metal.yml +++ b/inventories/group_vars/control-plane/metal.yml @@ -15,7 +15,7 @@ metal_api_images: - id: firewall-ubuntu-2.0.20220531 name: Firewall 2 Ubuntu 20220531 description: Firewall 2 Ubuntu 20220531 - url: http://images.metal-stack.io/metal-os/firewall/2.0-ubuntu/20220531/img.tar.lz4 + url: https://storage.googleapis.com/images.metal-pod.io/metal-os/pull_requests/141-headscale/firewall/2.0-ubuntu/img.tar.lz4 features: - firewall - id: ubuntu-20.04.20220531 From 03bf0ae198cc7aa5a7333f205609ea30aa090263 Mon Sep 17 00:00:00 2001 From: Grigoriy Mikhalkin Date: Tue, 13 Sep 2022 13:13:11 +0200 Subject: [PATCH 02/29] images update --- inventories/group_vars/all/images.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/inventories/group_vars/all/images.yaml b/inventories/group_vars/all/images.yaml index d3d1896f..cad8c43f 100644 --- a/inventories/group_vars/all/images.yaml +++ b/inventories/group_vars/all/images.yaml @@ -5,9 +5,10 @@ metal_stack_release_version: develop ## for development purposes, you can override releases from our image vector here ## -metal_hammer_image_url: https://images.metal-stack.io/metal-hammer/pull-requests/87-headscale/metal-hammer-initrd.img.lz4 +# metal_hammer_image_url: # metal_api_image_name: # metal_api_image_tag: +#metal_api_image_name: # metal_metalctl_image_name: # metal_metalctl_image_tag: # metal_masterdata_api_image_name: From a4508a0c639a6eb41cf9caebc9a5341d831d2705 Mon Sep 17 00:00:00 2001 From: Grigoriy Mikhalkin Date: Tue, 13 Sep 2022 16:34:08 +0200 Subject: [PATCH 03/29] polishing --- deploy_control_plane.yaml | 6 +++--- docker-compose.yml | 1 - inventories/group_vars/all/images.yaml | 2 +- inventories/group_vars/control-plane/headscale.yaml | 8 +++----- inventories/group_vars/control-plane/metal.yml | 3 +++ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/deploy_control_plane.yaml b/deploy_control_plane.yaml index 0ebf2361..91c7e24b 100644 --- a/deploy_control_plane.yaml +++ b/deploy_control_plane.yaml @@ -20,9 +20,9 @@ tags: metal-db - name: metal-roles/control-plane/roles/ipam-db tags: ipam-db + - name: metal-roles/control-plane/roles/headscale + tags: headscale - name: metal-roles/control-plane/roles/masterdata-db tags: masterdata-db - name: metal-roles/control-plane/roles/metal - tags: metal - - name: metal-roles/control-plane/roles/headscale - tags: headscale + tags: metal \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index a91e864e..0e2ffd64 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,6 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock - .:/mini-lab - - /home/grigoriy/Projects/metal-roles:/mini-lab/metal-roles # for developing role dependencies # TODO: make this a switch # - ${HOME}/.ansible/roles/ansible-common:/root/.ansible/roles/ansible-common:ro diff --git a/inventories/group_vars/all/images.yaml b/inventories/group_vars/all/images.yaml index cad8c43f..0ad8e1b9 100644 --- a/inventories/group_vars/all/images.yaml +++ b/inventories/group_vars/all/images.yaml @@ -8,7 +8,7 @@ metal_stack_release_version: develop # metal_hammer_image_url: # metal_api_image_name: # metal_api_image_tag: -#metal_api_image_name: +# metal_api_image_name: # metal_metalctl_image_name: # metal_metalctl_image_tag: # metal_masterdata_api_image_name: diff --git a/inventories/group_vars/control-plane/headscale.yaml b/inventories/group_vars/control-plane/headscale.yaml index 7f71db5d..bb625832 100644 --- a/inventories/group_vars/control-plane/headscale.yaml +++ b/inventories/group_vars/control-plane/headscale.yaml @@ -1,6 +1,8 @@ --- headscale_image_name: headscale/headscale -headscale_image_tag: 0.15.0-alpine +headscale_image_tag: 0.16.4-alpine + +headscale_tls: no headscale_db_image_name: timescale/timescaledb headscale_db_image_tag: 2.6.1-pg12 @@ -11,8 +13,4 @@ headscale_db_backup_restore_sidecar_image_tag: v0.6.3 headscale_db_backup_restore_sidecar_provider: local headscale_private_key: c8e07b737d04715f1f5c1318334e888f65e6a704ea85d0cddaa31b2c5589ef7f -headscale_ingress_dns: headscale.metal-stack.io - -disable_ingress: true - headscale_db_resources: {} diff --git a/inventories/group_vars/control-plane/metal.yml b/inventories/group_vars/control-plane/metal.yml index 78486a30..26d4c936 100644 --- a/inventories/group_vars/control-plane/metal.yml +++ b/inventories/group_vars/control-plane/metal.yml @@ -122,3 +122,6 @@ metal_api_grpc_certs_server_cert: "{{ lookup('file', 'certs/grpc/server.pem') } metal_api_grpc_certs_client_key: "{{ lookup('file', 'certs/grpc/client-key.pem') }}" metal_api_grpc_certs_client_cert: "{{ lookup('file', 'certs/grpc/client.pem') }}" metal_api_grpc_certs_ca_cert: "{{ lookup('file', 'certs/ca.pem') }}" + +metal_api_headscale_enabled: true +metal_api_headscale_tls: no \ No newline at end of file From 1e312e2c9ca0a3c55da0d891386dafd05267f328 Mon Sep 17 00:00:00 2001 From: Grigoriy Mikhalkin Date: Tue, 13 Sep 2022 16:35:06 +0200 Subject: [PATCH 04/29] remove tmp files --- headscale-ingress.yaml | 21 --------------------- inventories/group_vars/all/images.yaml | 2 +- 2 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 headscale-ingress.yaml diff --git a/headscale-ingress.yaml b/headscale-ingress.yaml deleted file mode 100644 index 69423e23..00000000 --- a/headscale-ingress.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - annotations: - kubernetes.io/ingress.class: nginx - nginx.ingress.kubernetes.io/force-ssl-redirect: "false" - nginx.ingress.kubernetes.io/ssl-redirect: "false" - name: headscale-ingress - namespace: headscale -spec: - rules: - - host: headscale.172.17.0.1.nip.io - http: - paths: - - backend: - service: - name: headscale - port: - number: 8080 - path: / - pathType: ImplementationSpecific diff --git a/inventories/group_vars/all/images.yaml b/inventories/group_vars/all/images.yaml index 0ad8e1b9..e610aa11 100644 --- a/inventories/group_vars/all/images.yaml +++ b/inventories/group_vars/all/images.yaml @@ -5,7 +5,7 @@ metal_stack_release_version: develop ## for development purposes, you can override releases from our image vector here ## -# metal_hammer_image_url: +# metal_hammer_image_url: https://images.metal-stack.io/metal-hammer/pull-requests//metal-hammer-initrd.img.lz4 # metal_api_image_name: # metal_api_image_tag: # metal_api_image_name: From 9fd830927d6be7826e1c393ffb28919f24e3f2e5 Mon Sep 17 00:00:00 2001 From: GrigoriyMikhalkin Date: Wed, 14 Sep 2022 10:44:25 +0200 Subject: [PATCH 05/29] Update inventories/group_vars/control-plane/metal.yml Co-authored-by: Gerrit --- inventories/group_vars/control-plane/metal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventories/group_vars/control-plane/metal.yml b/inventories/group_vars/control-plane/metal.yml index 26d4c936..de34b32e 100644 --- a/inventories/group_vars/control-plane/metal.yml +++ b/inventories/group_vars/control-plane/metal.yml @@ -15,7 +15,7 @@ metal_api_images: - id: firewall-ubuntu-2.0.20220531 name: Firewall 2 Ubuntu 20220531 description: Firewall 2 Ubuntu 20220531 - url: https://storage.googleapis.com/images.metal-pod.io/metal-os/pull_requests/141-headscale/firewall/2.0-ubuntu/img.tar.lz4 + url: https://images.metal-stack.io/metal-os/pull_requests/141-headscale/firewall/2.0-ubuntu/img.tar.lz4 features: - firewall - id: ubuntu-20.04.20220531 From 6a0f8972f8f1c3d0d240d3da58e3fe9ec48bbb31 Mon Sep 17 00:00:00 2001 From: Grigoriy Mikhalkin Date: Wed, 14 Sep 2022 10:51:15 +0200 Subject: [PATCH 06/29] clean group vars --- inventories/group_vars/all/images.yaml | 1 - inventories/group_vars/control-plane/headscale.yaml | 11 ----------- 2 files changed, 12 deletions(-) diff --git a/inventories/group_vars/all/images.yaml b/inventories/group_vars/all/images.yaml index e610aa11..86b83341 100644 --- a/inventories/group_vars/all/images.yaml +++ b/inventories/group_vars/all/images.yaml @@ -8,7 +8,6 @@ metal_stack_release_version: develop # metal_hammer_image_url: https://images.metal-stack.io/metal-hammer/pull-requests//metal-hammer-initrd.img.lz4 # metal_api_image_name: # metal_api_image_tag: -# metal_api_image_name: # metal_metalctl_image_name: # metal_metalctl_image_tag: # metal_masterdata_api_image_name: diff --git a/inventories/group_vars/control-plane/headscale.yaml b/inventories/group_vars/control-plane/headscale.yaml index bb625832..82663e4e 100644 --- a/inventories/group_vars/control-plane/headscale.yaml +++ b/inventories/group_vars/control-plane/headscale.yaml @@ -1,16 +1,5 @@ --- -headscale_image_name: headscale/headscale -headscale_image_tag: 0.16.4-alpine - headscale_tls: no - -headscale_db_image_name: timescale/timescaledb -headscale_db_image_tag: 2.6.1-pg12 headscale_db_storage_size: 200Mi - -headscale_db_backup_restore_sidecar_image_name: ghcr.io/metal-stack/backup-restore-sidecar -headscale_db_backup_restore_sidecar_image_tag: v0.6.3 -headscale_db_backup_restore_sidecar_provider: local - headscale_private_key: c8e07b737d04715f1f5c1318334e888f65e6a704ea85d0cddaa31b2c5589ef7f headscale_db_resources: {} From b0bce3a63e7c15ddb72b42ab7083283993614bb5 Mon Sep 17 00:00:00 2001 From: Grigoriy Mikhalkin Date: Fri, 23 Sep 2022 14:08:57 +0200 Subject: [PATCH 07/29] headscale api url update --- .gitignore | 1 + inventories/group_vars/control-plane/metal.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index df8e92d3..ec84c0b4 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ metal-hammer* requirements.yaml .extra_vars.yaml sonic-vs.img +.mini-lab.cumulus.yml.* diff --git a/inventories/group_vars/control-plane/metal.yml b/inventories/group_vars/control-plane/metal.yml index de34b32e..49843157 100644 --- a/inventories/group_vars/control-plane/metal.yml +++ b/inventories/group_vars/control-plane/metal.yml @@ -1,6 +1,7 @@ --- metal_set_resource_limits: no metal_check_api_health_endpoint: http://api.172.17.0.1.nip.io:8080/metal/v1/health +metal_api_headscale_control_plane_address: "http://headscale.{{ metal_control_plane_ingress_dns }}:8080" # metal_helm_chart_local_path: /helm-charts/charts/metal-control-plane From c6348f70375ee2c850ef1af75a566e4a1b801811 Mon Sep 17 00:00:00 2001 From: Grigoriy Mikhalkin Date: Tue, 30 Aug 2022 22:29:26 +0200 Subject: [PATCH 08/29] headscale config --- deploy_control_plane.yaml | 2 ++ docker-compose.yml | 1 + headscale-ingress.yaml | 21 +++++++++++++++++++ inventories/group_vars/all/images.yaml | 2 +- .../group_vars/control-plane/headscale.yaml | 18 ++++++++++++++++ .../group_vars/control-plane/metal.yml | 16 +++++++------- 6 files changed, 51 insertions(+), 9 deletions(-) create mode 100644 headscale-ingress.yaml create mode 100644 inventories/group_vars/control-plane/headscale.yaml diff --git a/deploy_control_plane.yaml b/deploy_control_plane.yaml index edbdef95..0ebf2361 100644 --- a/deploy_control_plane.yaml +++ b/deploy_control_plane.yaml @@ -24,3 +24,5 @@ tags: masterdata-db - name: metal-roles/control-plane/roles/metal tags: metal + - name: metal-roles/control-plane/roles/headscale + tags: headscale diff --git a/docker-compose.yml b/docker-compose.yml index 0e2ffd64..a91e864e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,6 +8,7 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock - .:/mini-lab + - /home/grigoriy/Projects/metal-roles:/mini-lab/metal-roles # for developing role dependencies # TODO: make this a switch # - ${HOME}/.ansible/roles/ansible-common:/root/.ansible/roles/ansible-common:ro diff --git a/headscale-ingress.yaml b/headscale-ingress.yaml new file mode 100644 index 00000000..69423e23 --- /dev/null +++ b/headscale-ingress.yaml @@ -0,0 +1,21 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + annotations: + kubernetes.io/ingress.class: nginx + nginx.ingress.kubernetes.io/force-ssl-redirect: "false" + nginx.ingress.kubernetes.io/ssl-redirect: "false" + name: headscale-ingress + namespace: headscale +spec: + rules: + - host: headscale.172.17.0.1.nip.io + http: + paths: + - backend: + service: + name: headscale + port: + number: 8080 + path: / + pathType: ImplementationSpecific diff --git a/inventories/group_vars/all/images.yaml b/inventories/group_vars/all/images.yaml index 6a7dce3a..6c5ef0fc 100644 --- a/inventories/group_vars/all/images.yaml +++ b/inventories/group_vars/all/images.yaml @@ -5,7 +5,7 @@ metal_stack_release_version: v0.11.0 ## for development purposes, you can override releases from our image vector here ## -# metal_hammer_image_url: https://images.metal-stack.io/metal-hammer/pull-requests//metal-hammer-initrd.img.lz4 +metal_hammer_image_url: https://images.metal-stack.io/metal-hammer/pull-requests/87-headscale/metal-hammer-initrd.img.lz4 # metal_api_image_name: # metal_api_image_tag: # metal_metalctl_image_name: diff --git a/inventories/group_vars/control-plane/headscale.yaml b/inventories/group_vars/control-plane/headscale.yaml new file mode 100644 index 00000000..7f71db5d --- /dev/null +++ b/inventories/group_vars/control-plane/headscale.yaml @@ -0,0 +1,18 @@ +--- +headscale_image_name: headscale/headscale +headscale_image_tag: 0.15.0-alpine + +headscale_db_image_name: timescale/timescaledb +headscale_db_image_tag: 2.6.1-pg12 +headscale_db_storage_size: 200Mi + +headscale_db_backup_restore_sidecar_image_name: ghcr.io/metal-stack/backup-restore-sidecar +headscale_db_backup_restore_sidecar_image_tag: v0.6.3 +headscale_db_backup_restore_sidecar_provider: local + +headscale_private_key: c8e07b737d04715f1f5c1318334e888f65e6a704ea85d0cddaa31b2c5589ef7f +headscale_ingress_dns: headscale.metal-stack.io + +disable_ingress: true + +headscale_db_resources: {} diff --git a/inventories/group_vars/control-plane/metal.yml b/inventories/group_vars/control-plane/metal.yml index a37b3a25..65e4e3d5 100644 --- a/inventories/group_vars/control-plane/metal.yml +++ b/inventories/group_vars/control-plane/metal.yml @@ -12,16 +12,16 @@ metal_api_admin_key: metal-admin metal_api_nsq_tcp_address: nsqd:4150 metal_api_images: -- id: firewall-ubuntu-2.0.20220830 - name: Firewall 2 Ubuntu 20220830 - description: Firewall 2 Ubuntu 20220830 - url: http://images.metal-stack.io/metal-os/firewall/2.0-ubuntu/20220830/img.tar.lz4 +- id: firewall-ubuntu-2.0.20221025 + name: Firewall 2 Ubuntu 20221025 + description: Firewall 2 Ubuntu 20221025 + url: http://images.metal-stack.io/metal-os/firewall/2.0-ubuntu/20221025/img.tar.lz4 features: - firewall -- id: ubuntu-20.04.20220830 - name: Ubuntu 20.04 20220830 - description: Ubuntu 20.04 20220830 - url: http://images.metal-stack.io/metal-os/ubuntu/20.04/20220830/img.tar.lz4 +- id: ubuntu-20.04.20221025 + name: Ubuntu 20.04 20221025 + description: Ubuntu 20.04 20221025 + url: http://images.metal-stack.io/metal-os/ubuntu/20.04/20221025/img.tar.lz4 features: - machine From f48c54a44562e798b58df9924040f9241d837df4 Mon Sep 17 00:00:00 2001 From: Grigoriy Mikhalkin Date: Tue, 13 Sep 2022 13:13:11 +0200 Subject: [PATCH 09/29] images update --- inventories/group_vars/all/images.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/inventories/group_vars/all/images.yaml b/inventories/group_vars/all/images.yaml index 6c5ef0fc..096ca17f 100644 --- a/inventories/group_vars/all/images.yaml +++ b/inventories/group_vars/all/images.yaml @@ -5,9 +5,10 @@ metal_stack_release_version: v0.11.0 ## for development purposes, you can override releases from our image vector here ## -metal_hammer_image_url: https://images.metal-stack.io/metal-hammer/pull-requests/87-headscale/metal-hammer-initrd.img.lz4 +# metal_hammer_image_url: # metal_api_image_name: # metal_api_image_tag: +#metal_api_image_name: # metal_metalctl_image_name: # metal_metalctl_image_tag: # metal_masterdata_api_image_name: From 343b8831b11ec98527294be616a87dc4539e8590 Mon Sep 17 00:00:00 2001 From: Grigoriy Mikhalkin Date: Tue, 13 Sep 2022 16:34:08 +0200 Subject: [PATCH 10/29] polishing --- deploy_control_plane.yaml | 6 +++--- docker-compose.yml | 1 - inventories/group_vars/all/images.yaml | 2 +- inventories/group_vars/control-plane/headscale.yaml | 8 +++----- inventories/group_vars/control-plane/metal.yml | 3 +++ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/deploy_control_plane.yaml b/deploy_control_plane.yaml index 0ebf2361..91c7e24b 100644 --- a/deploy_control_plane.yaml +++ b/deploy_control_plane.yaml @@ -20,9 +20,9 @@ tags: metal-db - name: metal-roles/control-plane/roles/ipam-db tags: ipam-db + - name: metal-roles/control-plane/roles/headscale + tags: headscale - name: metal-roles/control-plane/roles/masterdata-db tags: masterdata-db - name: metal-roles/control-plane/roles/metal - tags: metal - - name: metal-roles/control-plane/roles/headscale - tags: headscale + tags: metal \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index a91e864e..0e2ffd64 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,6 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock - .:/mini-lab - - /home/grigoriy/Projects/metal-roles:/mini-lab/metal-roles # for developing role dependencies # TODO: make this a switch # - ${HOME}/.ansible/roles/ansible-common:/root/.ansible/roles/ansible-common:ro diff --git a/inventories/group_vars/all/images.yaml b/inventories/group_vars/all/images.yaml index 096ca17f..2179db88 100644 --- a/inventories/group_vars/all/images.yaml +++ b/inventories/group_vars/all/images.yaml @@ -8,7 +8,7 @@ metal_stack_release_version: v0.11.0 # metal_hammer_image_url: # metal_api_image_name: # metal_api_image_tag: -#metal_api_image_name: +# metal_api_image_name: # metal_metalctl_image_name: # metal_metalctl_image_tag: # metal_masterdata_api_image_name: diff --git a/inventories/group_vars/control-plane/headscale.yaml b/inventories/group_vars/control-plane/headscale.yaml index 7f71db5d..bb625832 100644 --- a/inventories/group_vars/control-plane/headscale.yaml +++ b/inventories/group_vars/control-plane/headscale.yaml @@ -1,6 +1,8 @@ --- headscale_image_name: headscale/headscale -headscale_image_tag: 0.15.0-alpine +headscale_image_tag: 0.16.4-alpine + +headscale_tls: no headscale_db_image_name: timescale/timescaledb headscale_db_image_tag: 2.6.1-pg12 @@ -11,8 +13,4 @@ headscale_db_backup_restore_sidecar_image_tag: v0.6.3 headscale_db_backup_restore_sidecar_provider: local headscale_private_key: c8e07b737d04715f1f5c1318334e888f65e6a704ea85d0cddaa31b2c5589ef7f -headscale_ingress_dns: headscale.metal-stack.io - -disable_ingress: true - headscale_db_resources: {} diff --git a/inventories/group_vars/control-plane/metal.yml b/inventories/group_vars/control-plane/metal.yml index 65e4e3d5..64607b7e 100644 --- a/inventories/group_vars/control-plane/metal.yml +++ b/inventories/group_vars/control-plane/metal.yml @@ -122,3 +122,6 @@ metal_api_grpc_certs_server_cert: "{{ lookup('file', 'certs/grpc/server.pem') } metal_api_grpc_certs_client_key: "{{ lookup('file', 'certs/grpc/client-key.pem') }}" metal_api_grpc_certs_client_cert: "{{ lookup('file', 'certs/grpc/client.pem') }}" metal_api_grpc_certs_ca_cert: "{{ lookup('file', 'certs/ca.pem') }}" + +metal_api_headscale_enabled: true +metal_api_headscale_tls: no \ No newline at end of file From d21f162d88093009eaa8a0f1b7d9382983b205f2 Mon Sep 17 00:00:00 2001 From: Grigoriy Mikhalkin Date: Tue, 13 Sep 2022 16:35:06 +0200 Subject: [PATCH 11/29] remove tmp files --- headscale-ingress.yaml | 21 --------------------- inventories/group_vars/all/images.yaml | 2 +- 2 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 headscale-ingress.yaml diff --git a/headscale-ingress.yaml b/headscale-ingress.yaml deleted file mode 100644 index 69423e23..00000000 --- a/headscale-ingress.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - annotations: - kubernetes.io/ingress.class: nginx - nginx.ingress.kubernetes.io/force-ssl-redirect: "false" - nginx.ingress.kubernetes.io/ssl-redirect: "false" - name: headscale-ingress - namespace: headscale -spec: - rules: - - host: headscale.172.17.0.1.nip.io - http: - paths: - - backend: - service: - name: headscale - port: - number: 8080 - path: / - pathType: ImplementationSpecific diff --git a/inventories/group_vars/all/images.yaml b/inventories/group_vars/all/images.yaml index 2179db88..c0bcfed7 100644 --- a/inventories/group_vars/all/images.yaml +++ b/inventories/group_vars/all/images.yaml @@ -5,7 +5,7 @@ metal_stack_release_version: v0.11.0 ## for development purposes, you can override releases from our image vector here ## -# metal_hammer_image_url: +# metal_hammer_image_url: https://images.metal-stack.io/metal-hammer/pull-requests//metal-hammer-initrd.img.lz4 # metal_api_image_name: # metal_api_image_tag: # metal_api_image_name: From 403b96695f33114663c07856df1a37977caee33a Mon Sep 17 00:00:00 2001 From: Grigoriy Mikhalkin Date: Wed, 14 Sep 2022 10:51:15 +0200 Subject: [PATCH 12/29] clean group vars --- inventories/group_vars/all/images.yaml | 1 - inventories/group_vars/control-plane/headscale.yaml | 11 ----------- 2 files changed, 12 deletions(-) diff --git a/inventories/group_vars/all/images.yaml b/inventories/group_vars/all/images.yaml index c0bcfed7..6a7dce3a 100644 --- a/inventories/group_vars/all/images.yaml +++ b/inventories/group_vars/all/images.yaml @@ -8,7 +8,6 @@ metal_stack_release_version: v0.11.0 # metal_hammer_image_url: https://images.metal-stack.io/metal-hammer/pull-requests//metal-hammer-initrd.img.lz4 # metal_api_image_name: # metal_api_image_tag: -# metal_api_image_name: # metal_metalctl_image_name: # metal_metalctl_image_tag: # metal_masterdata_api_image_name: diff --git a/inventories/group_vars/control-plane/headscale.yaml b/inventories/group_vars/control-plane/headscale.yaml index bb625832..82663e4e 100644 --- a/inventories/group_vars/control-plane/headscale.yaml +++ b/inventories/group_vars/control-plane/headscale.yaml @@ -1,16 +1,5 @@ --- -headscale_image_name: headscale/headscale -headscale_image_tag: 0.16.4-alpine - headscale_tls: no - -headscale_db_image_name: timescale/timescaledb -headscale_db_image_tag: 2.6.1-pg12 headscale_db_storage_size: 200Mi - -headscale_db_backup_restore_sidecar_image_name: ghcr.io/metal-stack/backup-restore-sidecar -headscale_db_backup_restore_sidecar_image_tag: v0.6.3 -headscale_db_backup_restore_sidecar_provider: local - headscale_private_key: c8e07b737d04715f1f5c1318334e888f65e6a704ea85d0cddaa31b2c5589ef7f headscale_db_resources: {} From 3c2b6a8859f02d5c6f6cac0fcc5c32c03ca8ae0b Mon Sep 17 00:00:00 2001 From: Grigoriy Mikhalkin Date: Fri, 23 Sep 2022 14:08:57 +0200 Subject: [PATCH 13/29] headscale api url update --- .gitignore | 1 + inventories/group_vars/control-plane/metal.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index df8e92d3..ec84c0b4 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ metal-hammer* requirements.yaml .extra_vars.yaml sonic-vs.img +.mini-lab.cumulus.yml.* diff --git a/inventories/group_vars/control-plane/metal.yml b/inventories/group_vars/control-plane/metal.yml index 64607b7e..447512f5 100644 --- a/inventories/group_vars/control-plane/metal.yml +++ b/inventories/group_vars/control-plane/metal.yml @@ -1,6 +1,7 @@ --- metal_set_resource_limits: no metal_check_api_health_endpoint: http://api.172.17.0.1.nip.io:8080/metal/v1/health +metal_api_headscale_control_plane_address: "http://headscale.{{ metal_control_plane_ingress_dns }}:8080" # metal_helm_chart_local_path: /helm-charts/charts/metal-control-plane From 2d0a903b1047ca1619972653e0e1c3e1df1aa915 Mon Sep 17 00:00:00 2001 From: GrigoriyMikhalkin Date: Tue, 8 Nov 2022 23:02:18 +0100 Subject: [PATCH 14/29] Update inventories/group_vars/all/images.yaml Co-authored-by: Gerrit --- inventories/group_vars/all/images.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventories/group_vars/all/images.yaml b/inventories/group_vars/all/images.yaml index 6a7dce3a..a7a6d566 100644 --- a/inventories/group_vars/all/images.yaml +++ b/inventories/group_vars/all/images.yaml @@ -1,5 +1,5 @@ --- -metal_stack_release_version: v0.11.0 +metal_stack_release_version: v0.11.3 ## ## for development purposes, you can override releases from our image vector here From c7714e574bf4ed59d592ec32bc29815fd6e9b676 Mon Sep 17 00:00:00 2001 From: GrigoriyMikhalkin Date: Tue, 8 Nov 2022 23:02:26 +0100 Subject: [PATCH 15/29] Update inventories/group_vars/control-plane/headscale.yaml Co-authored-by: Gerrit --- inventories/group_vars/control-plane/headscale.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventories/group_vars/control-plane/headscale.yaml b/inventories/group_vars/control-plane/headscale.yaml index 82663e4e..0e5ac2bb 100644 --- a/inventories/group_vars/control-plane/headscale.yaml +++ b/inventories/group_vars/control-plane/headscale.yaml @@ -1,5 +1,5 @@ --- headscale_tls: no headscale_db_storage_size: 200Mi -headscale_private_key: c8e07b737d04715f1f5c1318334e888f65e6a704ea85d0cddaa31b2c5589ef7f +headscale_noise_private_key: c8e07b737d04715f1f5c1318334e888f65e6a704ea85d0cddaa31b2c5589ef7f headscale_db_resources: {} From 7a3162527926cefdf39a2994b3e89e819f360e77 Mon Sep 17 00:00:00 2001 From: Grigoriy Mikhalkin Date: Tue, 30 Aug 2022 22:29:26 +0200 Subject: [PATCH 16/29] headscale config --- deploy_control_plane.yaml | 2 ++ docker-compose.yml | 1 + headscale-ingress.yaml | 21 +++++++++++++++++++ inventories/group_vars/all/images.yaml | 2 +- .../group_vars/control-plane/headscale.yaml | 18 ++++++++++++++++ .../group_vars/control-plane/metal.yml | 16 +++++++------- 6 files changed, 51 insertions(+), 9 deletions(-) create mode 100644 headscale-ingress.yaml create mode 100644 inventories/group_vars/control-plane/headscale.yaml diff --git a/deploy_control_plane.yaml b/deploy_control_plane.yaml index edbdef95..0ebf2361 100644 --- a/deploy_control_plane.yaml +++ b/deploy_control_plane.yaml @@ -24,3 +24,5 @@ tags: masterdata-db - name: metal-roles/control-plane/roles/metal tags: metal + - name: metal-roles/control-plane/roles/headscale + tags: headscale diff --git a/docker-compose.yml b/docker-compose.yml index 0e2ffd64..a91e864e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,6 +8,7 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock - .:/mini-lab + - /home/grigoriy/Projects/metal-roles:/mini-lab/metal-roles # for developing role dependencies # TODO: make this a switch # - ${HOME}/.ansible/roles/ansible-common:/root/.ansible/roles/ansible-common:ro diff --git a/headscale-ingress.yaml b/headscale-ingress.yaml new file mode 100644 index 00000000..69423e23 --- /dev/null +++ b/headscale-ingress.yaml @@ -0,0 +1,21 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + annotations: + kubernetes.io/ingress.class: nginx + nginx.ingress.kubernetes.io/force-ssl-redirect: "false" + nginx.ingress.kubernetes.io/ssl-redirect: "false" + name: headscale-ingress + namespace: headscale +spec: + rules: + - host: headscale.172.17.0.1.nip.io + http: + paths: + - backend: + service: + name: headscale + port: + number: 8080 + path: / + pathType: ImplementationSpecific diff --git a/inventories/group_vars/all/images.yaml b/inventories/group_vars/all/images.yaml index 6a7dce3a..6c5ef0fc 100644 --- a/inventories/group_vars/all/images.yaml +++ b/inventories/group_vars/all/images.yaml @@ -5,7 +5,7 @@ metal_stack_release_version: v0.11.0 ## for development purposes, you can override releases from our image vector here ## -# metal_hammer_image_url: https://images.metal-stack.io/metal-hammer/pull-requests//metal-hammer-initrd.img.lz4 +metal_hammer_image_url: https://images.metal-stack.io/metal-hammer/pull-requests/87-headscale/metal-hammer-initrd.img.lz4 # metal_api_image_name: # metal_api_image_tag: # metal_metalctl_image_name: diff --git a/inventories/group_vars/control-plane/headscale.yaml b/inventories/group_vars/control-plane/headscale.yaml new file mode 100644 index 00000000..7f71db5d --- /dev/null +++ b/inventories/group_vars/control-plane/headscale.yaml @@ -0,0 +1,18 @@ +--- +headscale_image_name: headscale/headscale +headscale_image_tag: 0.15.0-alpine + +headscale_db_image_name: timescale/timescaledb +headscale_db_image_tag: 2.6.1-pg12 +headscale_db_storage_size: 200Mi + +headscale_db_backup_restore_sidecar_image_name: ghcr.io/metal-stack/backup-restore-sidecar +headscale_db_backup_restore_sidecar_image_tag: v0.6.3 +headscale_db_backup_restore_sidecar_provider: local + +headscale_private_key: c8e07b737d04715f1f5c1318334e888f65e6a704ea85d0cddaa31b2c5589ef7f +headscale_ingress_dns: headscale.metal-stack.io + +disable_ingress: true + +headscale_db_resources: {} diff --git a/inventories/group_vars/control-plane/metal.yml b/inventories/group_vars/control-plane/metal.yml index a37b3a25..65e4e3d5 100644 --- a/inventories/group_vars/control-plane/metal.yml +++ b/inventories/group_vars/control-plane/metal.yml @@ -12,16 +12,16 @@ metal_api_admin_key: metal-admin metal_api_nsq_tcp_address: nsqd:4150 metal_api_images: -- id: firewall-ubuntu-2.0.20220830 - name: Firewall 2 Ubuntu 20220830 - description: Firewall 2 Ubuntu 20220830 - url: http://images.metal-stack.io/metal-os/firewall/2.0-ubuntu/20220830/img.tar.lz4 +- id: firewall-ubuntu-2.0.20221025 + name: Firewall 2 Ubuntu 20221025 + description: Firewall 2 Ubuntu 20221025 + url: http://images.metal-stack.io/metal-os/firewall/2.0-ubuntu/20221025/img.tar.lz4 features: - firewall -- id: ubuntu-20.04.20220830 - name: Ubuntu 20.04 20220830 - description: Ubuntu 20.04 20220830 - url: http://images.metal-stack.io/metal-os/ubuntu/20.04/20220830/img.tar.lz4 +- id: ubuntu-20.04.20221025 + name: Ubuntu 20.04 20221025 + description: Ubuntu 20.04 20221025 + url: http://images.metal-stack.io/metal-os/ubuntu/20.04/20221025/img.tar.lz4 features: - machine From b025f57f3edf58f247c258252834f4ebfebc1f40 Mon Sep 17 00:00:00 2001 From: Grigoriy Mikhalkin Date: Tue, 13 Sep 2022 13:13:11 +0200 Subject: [PATCH 17/29] images update --- inventories/group_vars/all/images.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/inventories/group_vars/all/images.yaml b/inventories/group_vars/all/images.yaml index 6c5ef0fc..096ca17f 100644 --- a/inventories/group_vars/all/images.yaml +++ b/inventories/group_vars/all/images.yaml @@ -5,9 +5,10 @@ metal_stack_release_version: v0.11.0 ## for development purposes, you can override releases from our image vector here ## -metal_hammer_image_url: https://images.metal-stack.io/metal-hammer/pull-requests/87-headscale/metal-hammer-initrd.img.lz4 +# metal_hammer_image_url: # metal_api_image_name: # metal_api_image_tag: +#metal_api_image_name: # metal_metalctl_image_name: # metal_metalctl_image_tag: # metal_masterdata_api_image_name: From d3e0aed9483d93d560704fb55ac86db53ab34c84 Mon Sep 17 00:00:00 2001 From: Grigoriy Mikhalkin Date: Tue, 13 Sep 2022 16:34:08 +0200 Subject: [PATCH 18/29] polishing --- deploy_control_plane.yaml | 6 +++--- docker-compose.yml | 1 - inventories/group_vars/all/images.yaml | 2 +- inventories/group_vars/control-plane/headscale.yaml | 8 +++----- inventories/group_vars/control-plane/metal.yml | 3 +++ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/deploy_control_plane.yaml b/deploy_control_plane.yaml index 0ebf2361..91c7e24b 100644 --- a/deploy_control_plane.yaml +++ b/deploy_control_plane.yaml @@ -20,9 +20,9 @@ tags: metal-db - name: metal-roles/control-plane/roles/ipam-db tags: ipam-db + - name: metal-roles/control-plane/roles/headscale + tags: headscale - name: metal-roles/control-plane/roles/masterdata-db tags: masterdata-db - name: metal-roles/control-plane/roles/metal - tags: metal - - name: metal-roles/control-plane/roles/headscale - tags: headscale + tags: metal \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index a91e864e..0e2ffd64 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,6 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock - .:/mini-lab - - /home/grigoriy/Projects/metal-roles:/mini-lab/metal-roles # for developing role dependencies # TODO: make this a switch # - ${HOME}/.ansible/roles/ansible-common:/root/.ansible/roles/ansible-common:ro diff --git a/inventories/group_vars/all/images.yaml b/inventories/group_vars/all/images.yaml index 096ca17f..2179db88 100644 --- a/inventories/group_vars/all/images.yaml +++ b/inventories/group_vars/all/images.yaml @@ -8,7 +8,7 @@ metal_stack_release_version: v0.11.0 # metal_hammer_image_url: # metal_api_image_name: # metal_api_image_tag: -#metal_api_image_name: +# metal_api_image_name: # metal_metalctl_image_name: # metal_metalctl_image_tag: # metal_masterdata_api_image_name: diff --git a/inventories/group_vars/control-plane/headscale.yaml b/inventories/group_vars/control-plane/headscale.yaml index 7f71db5d..bb625832 100644 --- a/inventories/group_vars/control-plane/headscale.yaml +++ b/inventories/group_vars/control-plane/headscale.yaml @@ -1,6 +1,8 @@ --- headscale_image_name: headscale/headscale -headscale_image_tag: 0.15.0-alpine +headscale_image_tag: 0.16.4-alpine + +headscale_tls: no headscale_db_image_name: timescale/timescaledb headscale_db_image_tag: 2.6.1-pg12 @@ -11,8 +13,4 @@ headscale_db_backup_restore_sidecar_image_tag: v0.6.3 headscale_db_backup_restore_sidecar_provider: local headscale_private_key: c8e07b737d04715f1f5c1318334e888f65e6a704ea85d0cddaa31b2c5589ef7f -headscale_ingress_dns: headscale.metal-stack.io - -disable_ingress: true - headscale_db_resources: {} diff --git a/inventories/group_vars/control-plane/metal.yml b/inventories/group_vars/control-plane/metal.yml index 65e4e3d5..64607b7e 100644 --- a/inventories/group_vars/control-plane/metal.yml +++ b/inventories/group_vars/control-plane/metal.yml @@ -122,3 +122,6 @@ metal_api_grpc_certs_server_cert: "{{ lookup('file', 'certs/grpc/server.pem') } metal_api_grpc_certs_client_key: "{{ lookup('file', 'certs/grpc/client-key.pem') }}" metal_api_grpc_certs_client_cert: "{{ lookup('file', 'certs/grpc/client.pem') }}" metal_api_grpc_certs_ca_cert: "{{ lookup('file', 'certs/ca.pem') }}" + +metal_api_headscale_enabled: true +metal_api_headscale_tls: no \ No newline at end of file From d622e608fd642690cd6efc7a3597861cf97cb660 Mon Sep 17 00:00:00 2001 From: Grigoriy Mikhalkin Date: Tue, 13 Sep 2022 16:35:06 +0200 Subject: [PATCH 19/29] remove tmp files --- headscale-ingress.yaml | 21 --------------------- inventories/group_vars/all/images.yaml | 2 +- 2 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 headscale-ingress.yaml diff --git a/headscale-ingress.yaml b/headscale-ingress.yaml deleted file mode 100644 index 69423e23..00000000 --- a/headscale-ingress.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - annotations: - kubernetes.io/ingress.class: nginx - nginx.ingress.kubernetes.io/force-ssl-redirect: "false" - nginx.ingress.kubernetes.io/ssl-redirect: "false" - name: headscale-ingress - namespace: headscale -spec: - rules: - - host: headscale.172.17.0.1.nip.io - http: - paths: - - backend: - service: - name: headscale - port: - number: 8080 - path: / - pathType: ImplementationSpecific diff --git a/inventories/group_vars/all/images.yaml b/inventories/group_vars/all/images.yaml index 2179db88..c0bcfed7 100644 --- a/inventories/group_vars/all/images.yaml +++ b/inventories/group_vars/all/images.yaml @@ -5,7 +5,7 @@ metal_stack_release_version: v0.11.0 ## for development purposes, you can override releases from our image vector here ## -# metal_hammer_image_url: +# metal_hammer_image_url: https://images.metal-stack.io/metal-hammer/pull-requests//metal-hammer-initrd.img.lz4 # metal_api_image_name: # metal_api_image_tag: # metal_api_image_name: From ed6009fa30f874f43030f249c240c66346166842 Mon Sep 17 00:00:00 2001 From: Grigoriy Mikhalkin Date: Wed, 14 Sep 2022 10:51:15 +0200 Subject: [PATCH 20/29] clean group vars --- inventories/group_vars/all/images.yaml | 1 - inventories/group_vars/control-plane/headscale.yaml | 11 ----------- 2 files changed, 12 deletions(-) diff --git a/inventories/group_vars/all/images.yaml b/inventories/group_vars/all/images.yaml index c0bcfed7..6a7dce3a 100644 --- a/inventories/group_vars/all/images.yaml +++ b/inventories/group_vars/all/images.yaml @@ -8,7 +8,6 @@ metal_stack_release_version: v0.11.0 # metal_hammer_image_url: https://images.metal-stack.io/metal-hammer/pull-requests//metal-hammer-initrd.img.lz4 # metal_api_image_name: # metal_api_image_tag: -# metal_api_image_name: # metal_metalctl_image_name: # metal_metalctl_image_tag: # metal_masterdata_api_image_name: diff --git a/inventories/group_vars/control-plane/headscale.yaml b/inventories/group_vars/control-plane/headscale.yaml index bb625832..82663e4e 100644 --- a/inventories/group_vars/control-plane/headscale.yaml +++ b/inventories/group_vars/control-plane/headscale.yaml @@ -1,16 +1,5 @@ --- -headscale_image_name: headscale/headscale -headscale_image_tag: 0.16.4-alpine - headscale_tls: no - -headscale_db_image_name: timescale/timescaledb -headscale_db_image_tag: 2.6.1-pg12 headscale_db_storage_size: 200Mi - -headscale_db_backup_restore_sidecar_image_name: ghcr.io/metal-stack/backup-restore-sidecar -headscale_db_backup_restore_sidecar_image_tag: v0.6.3 -headscale_db_backup_restore_sidecar_provider: local - headscale_private_key: c8e07b737d04715f1f5c1318334e888f65e6a704ea85d0cddaa31b2c5589ef7f headscale_db_resources: {} From a906423a18682b096d4f6fa7afd092451006390f Mon Sep 17 00:00:00 2001 From: Grigoriy Mikhalkin Date: Fri, 23 Sep 2022 14:08:57 +0200 Subject: [PATCH 21/29] headscale api url update --- .gitignore | 1 + inventories/group_vars/control-plane/metal.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index df8e92d3..ec84c0b4 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ metal-hammer* requirements.yaml .extra_vars.yaml sonic-vs.img +.mini-lab.cumulus.yml.* diff --git a/inventories/group_vars/control-plane/metal.yml b/inventories/group_vars/control-plane/metal.yml index 64607b7e..447512f5 100644 --- a/inventories/group_vars/control-plane/metal.yml +++ b/inventories/group_vars/control-plane/metal.yml @@ -1,6 +1,7 @@ --- metal_set_resource_limits: no metal_check_api_health_endpoint: http://api.172.17.0.1.nip.io:8080/metal/v1/health +metal_api_headscale_control_plane_address: "http://headscale.{{ metal_control_plane_ingress_dns }}:8080" # metal_helm_chart_local_path: /helm-charts/charts/metal-control-plane From 51bda84a2b189fcdb541b86cb6b81923af6be2a9 Mon Sep 17 00:00:00 2001 From: Grigoriy Mikhalkin Date: Tue, 30 Aug 2022 22:29:26 +0200 Subject: [PATCH 22/29] headscale config --- deploy_control_plane.yaml | 4 +++- docker-compose.yml | 1 + headscale-ingress.yaml | 21 +++++++++++++++++++++ inventories/group_vars/all/images.yaml | 2 +- 4 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 headscale-ingress.yaml diff --git a/deploy_control_plane.yaml b/deploy_control_plane.yaml index 91c7e24b..c39ee3fb 100644 --- a/deploy_control_plane.yaml +++ b/deploy_control_plane.yaml @@ -25,4 +25,6 @@ - name: metal-roles/control-plane/roles/masterdata-db tags: masterdata-db - name: metal-roles/control-plane/roles/metal - tags: metal \ No newline at end of file + tags: metal + - name: metal-roles/control-plane/roles/headscale + tags: headscale diff --git a/docker-compose.yml b/docker-compose.yml index 0e2ffd64..a91e864e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,6 +8,7 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock - .:/mini-lab + - /home/grigoriy/Projects/metal-roles:/mini-lab/metal-roles # for developing role dependencies # TODO: make this a switch # - ${HOME}/.ansible/roles/ansible-common:/root/.ansible/roles/ansible-common:ro diff --git a/headscale-ingress.yaml b/headscale-ingress.yaml new file mode 100644 index 00000000..69423e23 --- /dev/null +++ b/headscale-ingress.yaml @@ -0,0 +1,21 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + annotations: + kubernetes.io/ingress.class: nginx + nginx.ingress.kubernetes.io/force-ssl-redirect: "false" + nginx.ingress.kubernetes.io/ssl-redirect: "false" + name: headscale-ingress + namespace: headscale +spec: + rules: + - host: headscale.172.17.0.1.nip.io + http: + paths: + - backend: + service: + name: headscale + port: + number: 8080 + path: / + pathType: ImplementationSpecific diff --git a/inventories/group_vars/all/images.yaml b/inventories/group_vars/all/images.yaml index 6a7dce3a..6c5ef0fc 100644 --- a/inventories/group_vars/all/images.yaml +++ b/inventories/group_vars/all/images.yaml @@ -5,7 +5,7 @@ metal_stack_release_version: v0.11.0 ## for development purposes, you can override releases from our image vector here ## -# metal_hammer_image_url: https://images.metal-stack.io/metal-hammer/pull-requests//metal-hammer-initrd.img.lz4 +metal_hammer_image_url: https://images.metal-stack.io/metal-hammer/pull-requests/87-headscale/metal-hammer-initrd.img.lz4 # metal_api_image_name: # metal_api_image_tag: # metal_metalctl_image_name: From 16f24b4c03807b7e17bf097d99429a0aba384f4c Mon Sep 17 00:00:00 2001 From: Grigoriy Mikhalkin Date: Tue, 13 Sep 2022 13:13:11 +0200 Subject: [PATCH 23/29] images update --- inventories/group_vars/all/images.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/inventories/group_vars/all/images.yaml b/inventories/group_vars/all/images.yaml index 6c5ef0fc..096ca17f 100644 --- a/inventories/group_vars/all/images.yaml +++ b/inventories/group_vars/all/images.yaml @@ -5,9 +5,10 @@ metal_stack_release_version: v0.11.0 ## for development purposes, you can override releases from our image vector here ## -metal_hammer_image_url: https://images.metal-stack.io/metal-hammer/pull-requests/87-headscale/metal-hammer-initrd.img.lz4 +# metal_hammer_image_url: # metal_api_image_name: # metal_api_image_tag: +#metal_api_image_name: # metal_metalctl_image_name: # metal_metalctl_image_tag: # metal_masterdata_api_image_name: From 66114d9ffa101bd0dad4c249c1239cb9d1b12871 Mon Sep 17 00:00:00 2001 From: Grigoriy Mikhalkin Date: Tue, 13 Sep 2022 16:34:08 +0200 Subject: [PATCH 24/29] polishing --- deploy_control_plane.yaml | 4 +--- docker-compose.yml | 1 - inventories/group_vars/all/images.yaml | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/deploy_control_plane.yaml b/deploy_control_plane.yaml index c39ee3fb..91c7e24b 100644 --- a/deploy_control_plane.yaml +++ b/deploy_control_plane.yaml @@ -25,6 +25,4 @@ - name: metal-roles/control-plane/roles/masterdata-db tags: masterdata-db - name: metal-roles/control-plane/roles/metal - tags: metal - - name: metal-roles/control-plane/roles/headscale - tags: headscale + tags: metal \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index a91e864e..0e2ffd64 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,6 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock - .:/mini-lab - - /home/grigoriy/Projects/metal-roles:/mini-lab/metal-roles # for developing role dependencies # TODO: make this a switch # - ${HOME}/.ansible/roles/ansible-common:/root/.ansible/roles/ansible-common:ro diff --git a/inventories/group_vars/all/images.yaml b/inventories/group_vars/all/images.yaml index 096ca17f..2179db88 100644 --- a/inventories/group_vars/all/images.yaml +++ b/inventories/group_vars/all/images.yaml @@ -8,7 +8,7 @@ metal_stack_release_version: v0.11.0 # metal_hammer_image_url: # metal_api_image_name: # metal_api_image_tag: -#metal_api_image_name: +# metal_api_image_name: # metal_metalctl_image_name: # metal_metalctl_image_tag: # metal_masterdata_api_image_name: From c9f9c5d1e81210254b613524b72756058df8d5bc Mon Sep 17 00:00:00 2001 From: Grigoriy Mikhalkin Date: Tue, 13 Sep 2022 16:35:06 +0200 Subject: [PATCH 25/29] remove tmp files --- headscale-ingress.yaml | 21 --------------------- inventories/group_vars/all/images.yaml | 2 +- 2 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 headscale-ingress.yaml diff --git a/headscale-ingress.yaml b/headscale-ingress.yaml deleted file mode 100644 index 69423e23..00000000 --- a/headscale-ingress.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - annotations: - kubernetes.io/ingress.class: nginx - nginx.ingress.kubernetes.io/force-ssl-redirect: "false" - nginx.ingress.kubernetes.io/ssl-redirect: "false" - name: headscale-ingress - namespace: headscale -spec: - rules: - - host: headscale.172.17.0.1.nip.io - http: - paths: - - backend: - service: - name: headscale - port: - number: 8080 - path: / - pathType: ImplementationSpecific diff --git a/inventories/group_vars/all/images.yaml b/inventories/group_vars/all/images.yaml index 2179db88..c0bcfed7 100644 --- a/inventories/group_vars/all/images.yaml +++ b/inventories/group_vars/all/images.yaml @@ -5,7 +5,7 @@ metal_stack_release_version: v0.11.0 ## for development purposes, you can override releases from our image vector here ## -# metal_hammer_image_url: +# metal_hammer_image_url: https://images.metal-stack.io/metal-hammer/pull-requests//metal-hammer-initrd.img.lz4 # metal_api_image_name: # metal_api_image_tag: # metal_api_image_name: From 3bc8034c35e3a5be892a1c57f59d7725f4e07e87 Mon Sep 17 00:00:00 2001 From: Grigoriy Mikhalkin Date: Wed, 14 Sep 2022 10:51:15 +0200 Subject: [PATCH 26/29] clean group vars --- inventories/group_vars/all/images.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/inventories/group_vars/all/images.yaml b/inventories/group_vars/all/images.yaml index c0bcfed7..6a7dce3a 100644 --- a/inventories/group_vars/all/images.yaml +++ b/inventories/group_vars/all/images.yaml @@ -8,7 +8,6 @@ metal_stack_release_version: v0.11.0 # metal_hammer_image_url: https://images.metal-stack.io/metal-hammer/pull-requests//metal-hammer-initrd.img.lz4 # metal_api_image_name: # metal_api_image_tag: -# metal_api_image_name: # metal_metalctl_image_name: # metal_metalctl_image_tag: # metal_masterdata_api_image_name: From 05fd71583df2ef1857f214ea684af4f06bbeca3f Mon Sep 17 00:00:00 2001 From: GrigoriyMikhalkin Date: Tue, 8 Nov 2022 23:02:18 +0100 Subject: [PATCH 27/29] Update inventories/group_vars/all/images.yaml Co-authored-by: Gerrit --- inventories/group_vars/all/images.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventories/group_vars/all/images.yaml b/inventories/group_vars/all/images.yaml index 6a7dce3a..a7a6d566 100644 --- a/inventories/group_vars/all/images.yaml +++ b/inventories/group_vars/all/images.yaml @@ -1,5 +1,5 @@ --- -metal_stack_release_version: v0.11.0 +metal_stack_release_version: v0.11.3 ## ## for development purposes, you can override releases from our image vector here From 58af57656f3b7ef16a022cac34fb3ba0a2030652 Mon Sep 17 00:00:00 2001 From: GrigoriyMikhalkin Date: Tue, 8 Nov 2022 23:02:26 +0100 Subject: [PATCH 28/29] Update inventories/group_vars/control-plane/headscale.yaml Co-authored-by: Gerrit --- inventories/group_vars/control-plane/headscale.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventories/group_vars/control-plane/headscale.yaml b/inventories/group_vars/control-plane/headscale.yaml index 82663e4e..0e5ac2bb 100644 --- a/inventories/group_vars/control-plane/headscale.yaml +++ b/inventories/group_vars/control-plane/headscale.yaml @@ -1,5 +1,5 @@ --- headscale_tls: no headscale_db_storage_size: 200Mi -headscale_private_key: c8e07b737d04715f1f5c1318334e888f65e6a704ea85d0cddaa31b2c5589ef7f +headscale_noise_private_key: c8e07b737d04715f1f5c1318334e888f65e6a704ea85d0cddaa31b2c5589ef7f headscale_db_resources: {} From 22d619786e94c9af2bee3a5719eb67537e9915fe Mon Sep 17 00:00:00 2001 From: Grigoriy Mikhalkin Date: Wed, 9 Nov 2022 22:41:48 +0100 Subject: [PATCH 29/29] update noise priv key --- inventories/group_vars/control-plane/headscale.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/inventories/group_vars/control-plane/headscale.yaml b/inventories/group_vars/control-plane/headscale.yaml index 0e5ac2bb..aaa92a37 100644 --- a/inventories/group_vars/control-plane/headscale.yaml +++ b/inventories/group_vars/control-plane/headscale.yaml @@ -1,5 +1,6 @@ --- headscale_tls: no headscale_db_storage_size: 200Mi -headscale_noise_private_key: c8e07b737d04715f1f5c1318334e888f65e6a704ea85d0cddaa31b2c5589ef7f +headscale_private_key: c8e07b737d04715f1f5c1318334e888f65e6a704ea85d0cddaa31b2c5589ef7f +headscale_noise_private_key: 580b8691e0e1f7cd74cf6154e890df015b3d7a0611a06efa5e2fd543ab13be4b headscale_db_resources: {}