diff --git a/.tln.conf b/.tln.conf index a8e7bcb..d859c51 100644 --- a/.tln.conf +++ b/.tln.conf @@ -185,20 +185,20 @@ sshuttle --dns${daemon} -vr ${script.env.TLN_CLOUDS_BASTION} 0/0 --ssh-cmd 'ssh$ } }, { id: 'connect', builder: async (tln, script) => { - script.set([ + script.set([ `tln sshuttle -- --conn-opts ${script.env.TLN_CLOUDS_CONN_OPTS} --bastion $(tln get-bastion -- --conn-opts ${script.env.TLN_CLOUDS_CONN_OPTS})` ]); } }, { id: 'whoami', builder: async (tln, script) => { const op = script.env.TLN_CLOUDS_DELETE ? 'delete' : 'apply'; - script.set([ + script.set([ `kubectl ${op} -f ${path.join(__dirname, 'whoami.yaml')}` ]); } }, { id: 'disconnect', builder: async (tln, script) => { - script.set([ + script.set([ `pkill -f sshuttle` ]); } diff --git a/aws/.env.template b/aws/.env.template index 980431b..b247e82 100644 --- a/aws/.env.template +++ b/aws/.env.template @@ -2,7 +2,7 @@ AWS_ACCESS_KEY_ID= AWS_SECRET_ACCESS_KEY= AWS_DEFAULT_REGION=eu-central-1 -TF_VAR_aws_k8s_version=1.29 +TF_VAR_aws_k8s_version=1.30 TF_VAR_aws_k8s_nodes_min=1 TF_VAR_aws_k8s_nodes_desired=2 TF_VAR_aws_k8s_nodes_max=3 diff --git a/aws/.tln.conf b/aws/.tln.conf index 8c7d6e6..4aef52d 100644 --- a/aws/.tln.conf +++ b/aws/.tln.conf @@ -8,7 +8,7 @@ module.exports = { }, dotenvs: async (tln) => { if (fs.existsSync('.env')) return ['.env']; else return [] }, inherits: async (tln) => [], - depends: async (tln) => ['kubectl-1.29.0', 'helm-3.14.0', 'terraform-1.7.5', 'aws-cli-2.15.15'], + depends: async (tln) => ['kubectl-1.30.2', 'helm-3.15.2', 'terraform-1.9.1', 'aws-cli-2.17.9'], steps: async (tln) => [ { id: 'ls-ec2', builder: async (tln, script) => { script.set(['aws ec2 describe-instances --output yaml --query "Reservations[*].Instances[*].{Instance:InstanceId}"']); diff --git a/aws/app/versions.tf b/aws/app/versions.tf index 612797c..dffcfb7 100644 --- a/aws/app/versions.tf +++ b/aws/app/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = "= 1.7.5" + required_version = "= 1.9.1" required_providers { aws = { diff --git a/aws/group/versions.tf b/aws/group/versions.tf index d59b3b9..d33e2d1 100644 --- a/aws/group/versions.tf +++ b/aws/group/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = "= 1.7.5" + required_version = "= 1.9.1" required_providers { aws = { diff --git a/aws/managed/versions.tf b/aws/managed/versions.tf index b76d54d..f10aa2c 100644 --- a/aws/managed/versions.tf +++ b/aws/managed/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = "= 1.7.5" + required_version = "= 1.9.1" required_providers { aws = { source = "hashicorp/aws" diff --git a/aws/network/versions.tf b/aws/network/versions.tf index d59b3b9..d33e2d1 100644 --- a/aws/network/versions.tf +++ b/aws/network/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = "= 1.7.5" + required_version = "= 1.9.1" required_providers { aws = { diff --git a/aws/provider/versions.tf b/aws/provider/versions.tf index d59b3b9..d33e2d1 100644 --- a/aws/provider/versions.tf +++ b/aws/provider/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = "= 1.7.5" + required_version = "= 1.9.1" required_providers { aws = { diff --git a/aws/tenant/versions.tf b/aws/tenant/versions.tf index 612797c..dffcfb7 100644 --- a/aws/tenant/versions.tf +++ b/aws/tenant/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = "= 1.7.5" + required_version = "= 1.9.1" required_providers { aws = { diff --git a/azure/.tln.conf b/azure/.tln.conf index fc0a35d..ab2111d 100644 --- a/azure/.tln.conf +++ b/azure/.tln.conf @@ -6,7 +6,7 @@ module.exports = { }, dotenvs: async (tln) => ['.env'], inherits: async (tln) => [], - depends: async (tln) => ['kubectl-1.23.10', 'helm-3.10.2', 'terraform-1.3.5', 'azure-cli'], + depends: async (tln) => ['kubectl-1.30.2', 'helm-3.15.2', 'terraform-1.9.1', 'azure-cli'], steps: async (tln) => [], components: async (tln) => [] } \ No newline at end of file diff --git a/do/.tln.conf b/do/.tln.conf index fbed645..e3176ba 100644 --- a/do/.tln.conf +++ b/do/.tln.conf @@ -8,7 +8,7 @@ module.exports = { }, dotenvs: async (tln) => { if (fs.existsSync('.env')) return ['.env']; else return [] }, inherits: async (tln) => [], - depends: async (tln) => ['kubectl-1.29.0', 'helm-3.14.0', 'terraform-1.7.1', 'doctl-1.104.0'], + depends: async (tln) => ['kubectl-1.30.2', 'helm-3.15.2', 'terraform-1.9.1', 'doctl-1.108.0'], steps: async (tln) => [ { id: 'login', builder: async (tln, script) => { script.set([` diff --git a/gcp/.tln.conf b/gcp/.tln.conf index 2f96943..6b61be7 100644 --- a/gcp/.tln.conf +++ b/gcp/.tln.conf @@ -6,7 +6,7 @@ module.exports = { }, dotenvs: async (tln) => ['.env'], inherits: async (tln) => [], - depends: async (tln) => ['kubectl-1.23.10', 'helm-3.10.2', 'terraform-1.3.5', 'gcloud-410.0.0'], + depends: async (tln) => ['kubectl-1.30.2', 'helm-3.15.2', 'terraform-1.9.1', 'gcloud-483.0.0'], steps: async (tln) => [], components: async (tln) => [] } \ No newline at end of file diff --git a/ii.drawio b/ii.drawio index 1c31f25..d3ea48f 100644 --- a/ii.drawio +++ b/ii.drawio @@ -1,17 +1,20 @@ - + - + - - + + - + + + + - + @@ -20,137 +23,86 @@ - - - - + - - - - + - + - - - - - - - + - + - + - + - - + + - + - + - + - + - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - + - + - - + + - + - - + - - - - + - + - + @@ -158,14 +110,80 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ii.png b/ii.png index 773f1cd..162ab3b 100644 Binary files a/ii.png and b/ii.png differ diff --git a/version b/version index 45f6bc2..5f34df4 100644 --- a/version +++ b/version @@ -1 +1 @@ -24.6.0-dev \ No newline at end of file +24.7.0-dev \ No newline at end of file