diff --git a/IaC-test/vars.tf b/IaC-test/vars.tf index 3f3481c..4b94c13 100644 --- a/IaC-test/vars.tf +++ b/IaC-test/vars.tf @@ -93,6 +93,7 @@ variable "k8sports" { {"12379" = "tcp"}, {"10257" = "tcp"}, {"10259" = "tcp"}, + {"19001" = "tcp"}, {"4789" = "udp"}, {"51820" = "udp"} ] diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index 8a7dc83..b6c1f06 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -4,7 +4,7 @@ ssh_allow_from_anywhere: false '^k8sc[1-9].matrix.test.sunet.se$': sunet::microk8s::node: - channel: 1.28/stable + channel: 1.31/stable peers: - 89.47.191.38 k8sc1 - 89.45.237.236 k8sc2 @@ -15,6 +15,7 @@ - 89.47.190.78 k8sw4 - 89.45.236.6 k8sw5 - 89.46.21.195 k8sw6 + traefik: false sunet::frontend::register_sites: sites: 'kube-matrixtest.matrix.test.sunet.se': @@ -24,7 +25,7 @@ port: '443' '^k8sw[1-9].matrix.test.sunet.se$': sunet::microk8s::node: - channel: 1.28/stable + channel: 1.31/stable peers: - 89.47.191.38 k8sc1 - 89.45.237.236 k8sc2 @@ -35,6 +36,7 @@ - 89.47.190.78 k8sw4 - 89.45.236.6 k8sw5 - 89.46.21.195 k8sw6 + traefik: false '^k8sc[1-9].matrix.sunet.se$': sunet::microk8s::node: channel: 1.30/stable diff --git a/global/overlay/etc/puppet/setup_cosmos_modules b/global/overlay/etc/puppet/setup_cosmos_modules index 44cddea..aa910ef 100755 --- a/global/overlay/etc/puppet/setup_cosmos_modules +++ b/global/overlay/etc/puppet/setup_cosmos_modules @@ -118,7 +118,7 @@ def main(): # When/if we want we can do stuff to modules here if host_info: if host_info["environment"] == "test": - modules["sunet"]["tag"] = "testing-2024-05-07-*" + modules["sunet"]["tag"] = "testing-2*" # if host_info["fqdn"] == "k8sw1.matrix.test..sunet.se": # modules["sunet"]["tag"] = "mandersson-test*" # Build list of expected file content