From 59c892395a20e9fb9e5bbd3ae6f2a38480e5347f Mon Sep 17 00:00:00 2001 From: Ryan VanGundy Date: Sun, 25 May 2025 18:16:19 -0400 Subject: [PATCH 1/5] feat(blueprint): update ingress path in blueprint templates --- pkg/blueprint/templates/aws.jsonnet | 4 ++-- pkg/blueprint/templates/azure.jsonnet | 4 ++-- pkg/blueprint/templates/local.jsonnet | 4 ++-- pkg/blueprint/templates/metal.jsonnet | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/blueprint/templates/aws.jsonnet b/pkg/blueprint/templates/aws.jsonnet index c77149599..b282b76c5 100644 --- a/pkg/blueprint/templates/aws.jsonnet +++ b/pkg/blueprint/templates/aws.jsonnet @@ -70,9 +70,9 @@ local kustomizeConfig = if blueprint == "full" then [ ], }, { - name: "ingress-base", + name: "ingress", source: "core", - path: "ingress/base", + path: "ingress", dependsOn: [ "pki-resources" ], diff --git a/pkg/blueprint/templates/azure.jsonnet b/pkg/blueprint/templates/azure.jsonnet index 212d9e3fe..98e8312b0 100644 --- a/pkg/blueprint/templates/azure.jsonnet +++ b/pkg/blueprint/templates/azure.jsonnet @@ -69,9 +69,9 @@ local kustomizeConfig = if blueprint == "full" then [ ], }, { - name: "ingress-base", + name: "ingress", source: "core", - path: "ingress/base", + path: "ingress", dependsOn: [ "pki-resources" ], diff --git a/pkg/blueprint/templates/local.jsonnet b/pkg/blueprint/templates/local.jsonnet index fe1b36029..46babab78 100644 --- a/pkg/blueprint/templates/local.jsonnet +++ b/pkg/blueprint/templates/local.jsonnet @@ -281,9 +281,9 @@ local kustomizeConfig = if blueprint == "full" then [ } ] else []) + [ { - name: "ingress-base", + name: "ingress", source: "core", - path: "ingress/base", + path: "ingress", dependsOn: [ "pki-resources" ], diff --git a/pkg/blueprint/templates/metal.jsonnet b/pkg/blueprint/templates/metal.jsonnet index 7d0053c45..9227708f4 100644 --- a/pkg/blueprint/templates/metal.jsonnet +++ b/pkg/blueprint/templates/metal.jsonnet @@ -261,9 +261,9 @@ local kustomizeConfig = if blueprint == "full" then [ ], }, { - name: "ingress-base", + name: "ingress", source: "core", - path: "ingress/base", + path: "ingress", dependsOn: [ "pki-resources" ], From 3c0a465da92a1bd435d031ffca24bf16eb3a6b07 Mon Sep 17 00:00:00 2001 From: Ryan VanGundy Date: Sun, 25 May 2025 18:23:44 -0400 Subject: [PATCH 2/5] go mod tidy --- go.mod | 3 --- go.sum | 38 -------------------------------------- 2 files changed, 41 deletions(-) diff --git a/go.mod b/go.mod index 1d3dd0119..f38fd58e5 100644 --- a/go.mod +++ b/go.mod @@ -153,7 +153,6 @@ require ( github.com/x448/float16 v0.8.4 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect github.com/zeebo/errs v1.4.0 // indirect - github.com/zeebo/errs/v2 v2.0.5 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/contrib/detectors/gcp v1.36.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect @@ -180,7 +179,6 @@ require ( google.golang.org/grpc v1.72.1 // indirect google.golang.org/protobuf v1.36.6 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect - gopkg.in/evanphx/json-patch.v5 v5.9.11 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect @@ -192,5 +190,4 @@ require ( sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect sigs.k8s.io/randfill v1.0.0 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect - sigs.k8s.io/structured-merge-diff/v6 v6.1.0 // indirect ) diff --git a/go.sum b/go.sum index dd5f5512e..88e751276 100644 --- a/go.sum +++ b/go.sum @@ -63,8 +63,6 @@ github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERo github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= -github.com/ProtonMail/go-crypto v1.2.0 h1:+PhXXn4SPGd+qk76TlEePBfOfivE0zkWFenhGhFLzWs= -github.com/ProtonMail/go-crypto v1.2.0/go.mod h1:9whxjD8Rbs29b4XWbB8irEcE8KHMqaR2e7GWU1R+/PE= github.com/ProtonMail/go-crypto v1.3.0 h1:ILq8+Sf5If5DCpHQp4PbZdS1J7HDFRXz/+xKBiRGFrw= github.com/ProtonMail/go-crypto v1.3.0/go.mod h1:9whxjD8Rbs29b4XWbB8irEcE8KHMqaR2e7GWU1R+/PE= github.com/abiosoft/colima v0.8.1 h1:0wDFRy3ei4YW2++V/kzIyeOGBaAmWiM0c6gujHkypXE= @@ -83,8 +81,6 @@ github.com/aws/aws-sdk-go-v2/credentials v1.17.67 h1:9KxtdcIA/5xPNQyZRgUSpYOE6j9 github.com/aws/aws-sdk-go-v2/credentials v1.17.67/go.mod h1:p3C44m+cfnbv763s52gCqrjaqyPikj9Sg47kUVaNZQQ= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 h1:x793wxmUWVDhshP8WW2mlnXuFrO4cOd3HLBroh1paFw= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30/go.mod h1:Jpne2tDnYiFascUEs2AWHJL9Yp7A5ZVy3TNyxaAjD6M= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.75 h1:S61/E3N01oral6B3y9hZ2E1iFDqCZPPOBoBQretCnBI= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.75/go.mod h1:bDMQbkI1vJbNjnvJYpPTSNYBkI/VIv18ngWb/K84tkk= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.76 h1:TZEAZHyLeRbSvETr20mAoJDUPhIMuFZ9ZwjkftWongU= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.76/go.mod h1:7h7z0FVKk7IYXuIZ8bWI58Afwc3kPMHqVIdczGgU3wc= github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 h1:ZK5jHhnrioRkUNOc+hOgQKlUL5JeC3S6JgLxtQ+Rm0Q= @@ -97,8 +93,6 @@ github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34 h1:ZNTqv4nIdE/DiBfUUfXcLZ/Spcu github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34/go.mod h1:zf7Vcd1ViW7cPqYWEHLHJkS50X0JS2IKz9Cgaj6ugrs= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 h1:eAh2A4b5IzM/lum78bZ590jy36+d/aFLgKF/4Vd1xPE= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3/go.mod h1:0yKJC/kb8sAnmlYa6Zs3QVYqaC8ug2AbnNChv5Ox3uA= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.1 h1:4nm2G6A4pV9rdlWzGMPv4BNtQp22v1hg3yrtkYpeLl8= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.1/go.mod h1:iu6FSzgt+M2/x3Dk8zhycdIcHjEFb36IS8HVUVFoMg0= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.2 h1:BCG7DCXEXpNCcpwCxg1oi9pkJWH2+eZzTn9MY56MbVw= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.2/go.mod h1:iu6FSzgt+M2/x3Dk8zhycdIcHjEFb36IS8HVUVFoMg0= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 h1:dM9/92u2F1JbDaGooxTq18wmmFzbJRfXfVfy96/1CXM= @@ -107,8 +101,6 @@ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 h1:moLQUoVq91Liq github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15/go.mod h1:ZH34PJUc8ApjBIfgQCFvkWcUDBtl/WTD+uiYHjd8igA= github.com/aws/aws-sdk-go-v2/service/kms v1.38.3 h1:RivOtUH3eEu6SWnUMFHKAW4MqDOzWn1vGQ3S38Y5QMg= github.com/aws/aws-sdk-go-v2/service/kms v1.38.3/go.mod h1:cQn6tAF77Di6m4huxovNM7NVAozWTZLsDRp9t8Z/WYk= -github.com/aws/aws-sdk-go-v2/service/s3 v1.79.3 h1:BRXS0U76Z8wfF+bnkilA2QwpIch6URlm++yPUt9QPmQ= -github.com/aws/aws-sdk-go-v2/service/s3 v1.79.3/go.mod h1:bNXKFFyaiVvWuR6O16h/I1724+aXe/tAkA9/QS01t5k= github.com/aws/aws-sdk-go-v2/service/s3 v1.79.4 h1:4yxno6bNHkekkfqG/a1nz/gC2gBwhJSojV1+oTE7K+4= github.com/aws/aws-sdk-go-v2/service/s3 v1.79.4/go.mod h1:qbn305Je/IofWBJ4bJz/Q7pDEtnnoInw/dGt71v6rHE= github.com/aws/aws-sdk-go-v2/service/sso v1.25.3 h1:1Gw+9ajCV1jogloEv1RRnvfRFia2cL6c9cuKV2Ps+G8= @@ -396,44 +388,26 @@ github.com/zclconf/go-cty v1.16.3 h1:osr++gw2T61A8KVYHoQiFbFd1Lh3JOCXc/jFLJXKTxk github.com/zclconf/go-cty v1.16.3/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo= github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM= -github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/errs v1.4.0 h1:XNdoD/RRMKP7HD0UhJnIzUy74ISdGGxURlYG8HSWSfM= github.com/zeebo/errs v1.4.0/go.mod h1:sgbWHsvVuTPHcqJJGQ1WhI5KbWlHYz+2+2C/LSEtCw4= -github.com/zeebo/errs/v2 v2.0.5/go.mod h1:OKmvVZt4UqpyJrYFykDKm168ZquJ55pbbIVUICNmLN0= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/detectors/gcp v1.35.0 h1:bGvFt68+KTiAKFlacHW6AhA56GF2rS0bdD3aJYEnmzA= -go.opentelemetry.io/contrib/detectors/gcp v1.35.0/go.mod h1:qGWP8/+ILwMRIUf9uIVLloR1uo5ZYAslM4O6OqUi1DA= go.opentelemetry.io/contrib/detectors/gcp v1.36.0 h1:F7q2tNlCaHY9nMKHR6XH9/qkp8FktLnIcy6jJNyOCQw= go.opentelemetry.io/contrib/detectors/gcp v1.36.0/go.mod h1:IbBN8uAIIx734PTonTPxAxnjc2pQTxWNkwfstZ+6H2k= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 h1:x7wzEgXfnzJcHDwStJT+mxOz4etr2EcexjqhBvmoakw= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0/go.mod h1:rg+RlpR5dKwaS95IyyZqj5Wd4E13lk/msnTS0Xl9lJM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 h1:q4XOmH/0opmeuJtPsbFNivyl7bCt7yRBbeEm2sC/XtQ= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0/go.mod h1:snMWehoOh2wsEwnvvwtDyFCxVeDAODenXHtn5vzrKjo= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 h1:sbiXRNDSWJOTobXh5HyQKjq6wUC5tNybqjIqDpAY4CU= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 h1:F7Jx+6hwnZ41NSFTO5q4LYDtJRXBf2PD0rNBkeB/lus= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0/go.mod h1:UHB22Z8QsdRDrnAtX4PntOl36ajSxcdUMt1sF7Y6E7Q= -go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ= -go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y= go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg= go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.35.0 h1:PB3Zrjs1sG1GBX51SXyTSoOTqcDglmsk7nT6tkKPb/k= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.35.0/go.mod h1:U2R3XyVPzn0WX7wOIypPuptulsMcPDPs/oiSVOMVnHY= -go.opentelemetry.io/otel/metric v1.35.0 h1:0znxYu2SNyuMSQT4Y9WDWej0VpcsxkuklLa4/siN90M= -go.opentelemetry.io/otel/metric v1.35.0/go.mod h1:nKVFgxBZ2fReX6IlyW28MgZojkoAkJGaE8CpgeAU3oE= go.opentelemetry.io/otel/metric v1.36.0 h1:MoWPKVhQvJ+eeXWHFBOPoBOi20jh6Iq2CcCREuTYufE= go.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs= -go.opentelemetry.io/otel/sdk v1.35.0 h1:iPctf8iprVySXSKJffSS79eOjl9pvxV9ZqOWT0QejKY= -go.opentelemetry.io/otel/sdk v1.35.0/go.mod h1:+ga1bZliga3DxJ3CQGg3updiaAJoNECOgJREo9KHGQg= go.opentelemetry.io/otel/sdk v1.36.0 h1:b6SYIuLRs88ztox4EyrvRti80uXIFy+Sqzoh9kFULbs= go.opentelemetry.io/otel/sdk v1.36.0/go.mod h1:+lC+mTgD+MUWfjJubi2vvXWcVxyr9rmlshZni72pXeY= -go.opentelemetry.io/otel/sdk/metric v1.35.0 h1:1RriWBmCKgkeHEhM7a2uMjMUfP7MsOF5JpUCaEqEI9o= -go.opentelemetry.io/otel/sdk/metric v1.35.0/go.mod h1:is6XYCUMpcKi+ZsOvfluY5YstFnhW0BidkR+gL+qN+w= go.opentelemetry.io/otel/sdk/metric v1.36.0 h1:r0ntwwGosWGaa0CrSt8cuNuTcccMXERFwHX4dThiPis= go.opentelemetry.io/otel/sdk/metric v1.36.0/go.mod h1:qTNOhFDfKRwX0yXOqJYegL5WRaW376QbB7P4Pb0qva4= -go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt/xgMs= -go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc= go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w= go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA= go.opentelemetry.io/proto/otlp v1.6.0 h1:jQjP+AQyTf+Fe7OKj/MfkDrmK4MNVtw2NpXsf9fefDI= @@ -489,20 +463,12 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.233.0 h1:iGZfjXAJiUFSSaekVB7LzXl6tRfEKhUN7FkZN++07tI= -google.golang.org/api v0.233.0/go.mod h1:TCIVLLlcwunlMpZIhIp7Ltk77W+vUSdUKAAIlbxY44c= google.golang.org/api v0.234.0 h1:d3sAmYq3E9gdr2mpmiWGbm9pHsA/KJmyiLkwKfHBqU4= google.golang.org/api v0.234.0/go.mod h1:QpeJkemzkFKe5VCE/PMv7GsUfn9ZF+u+q1Q7w6ckxTg= -google.golang.org/genproto v0.0.0-20250512202823-5a2f75b736a9 h1:0DnDgelxbooHLt0nyiPeCP0zrH/RL+UG558i1oNU1xE= -google.golang.org/genproto v0.0.0-20250512202823-5a2f75b736a9/go.mod h1:IuQRZAKkz+Mhos3ZZ0+hcGaTmLuuTuGw344uzwztGl8= google.golang.org/genproto v0.0.0-20250519155744-55703ea1f237 h1:2zGWyk04EwQ3mmV4dd4M4U7P/igHi5p7CBJEg1rI6A8= google.golang.org/genproto v0.0.0-20250519155744-55703ea1f237/go.mod h1:LhI4bRmX3rqllzQ+BGneexULkEjBf2gsAfkbeCA8IbU= -google.golang.org/genproto/googleapis/api v0.0.0-20250512202823-5a2f75b736a9 h1:WvBuA5rjZx9SNIzgcU53OohgZy6lKSus++uY4xLaWKc= -google.golang.org/genproto/googleapis/api v0.0.0-20250512202823-5a2f75b736a9/go.mod h1:W3S/3np0/dPWsWLi1h/UymYctGXaGBM2StwzD0y140U= google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 h1:Kog3KlB4xevJlAcbbbzPfRG0+X9fdoGM+UBRKVz6Wr0= google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237/go.mod h1:ezi0AVyMKDWy5xAncvjLWH7UcLBB5n7y2fQ8MzjJcto= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250512202823-5a2f75b736a9 h1:IkAfh6J/yllPtpYFU0zZN1hUPYdT0ogkBT/9hMxHjvg= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250512202823-5a2f75b736a9/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 h1:cJfm9zPbe1e873mHJzmQ1nwVEeRDU/T1wXDK2kUSU34= google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= google.golang.org/grpc v1.72.1 h1:HR03wO6eyZ7lknl75XlxABNVLLFc2PAb6mHlYh756mA= @@ -514,7 +480,6 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4= gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M= -gopkg.in/evanphx/json-patch.v5 v5.9.11/go.mod h1:/kvTRh1TVm5wuM6OkHxqXtE/1nUZZpihg29RtuIyfvk= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= @@ -548,8 +513,5 @@ sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU= sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY= sigs.k8s.io/structured-merge-diff/v4 v4.6.0 h1:IUA9nvMmnKWcj5jl84xn+T5MnlZKThmUW1TdblaLVAc= sigs.k8s.io/structured-merge-diff/v4 v4.6.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps= -sigs.k8s.io/structured-merge-diff/v4 v4.7.0 h1:qPeWmscJcXP0snki5IYF79Z8xrl8ETFxgMd7wez1XkI= -sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps= -sigs.k8s.io/structured-merge-diff/v6 v6.1.0/go.mod h1:eHHiJVSr7sxSHSQm+ZPJoLNyJtH9FSrHrAGAU2touOk= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= From 61d4f18a902bca8b20988162e08019b7dd39ceab Mon Sep 17 00:00:00 2001 From: Ryan VanGundy Date: Sun, 25 May 2025 18:50:16 -0400 Subject: [PATCH 3/5] ingress-base => ingress --- docs/reference/blueprint.md | 8 ++++---- docs/tutorial/hello-world.md | 2 +- pkg/blueprint/templates/aws.jsonnet | 2 +- pkg/blueprint/templates/azure.jsonnet | 4 ++-- pkg/blueprint/templates/local.jsonnet | 4 ++-- pkg/blueprint/templates/metal.jsonnet | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/reference/blueprint.md b/docs/reference/blueprint.md index 81e3fb728..ffd3cdea7 100644 --- a/docs/reference/blueprint.md +++ b/docs/reference/blueprint.md @@ -203,7 +203,7 @@ kustomize: components: - openebs - openebs/dynamic-localpv -- name: ingress-base +- name: ingress path: ingress/base dependsOn: - pki-resources @@ -233,7 +233,7 @@ kustomize: - name: dns path: dns dependsOn: - - ingress-base + - ingress - pki-base force: true components: @@ -246,14 +246,14 @@ kustomize: - name: gitops path: gitops/flux dependsOn: - - ingress-base + - ingress force: true components: - webhook - name: demo path: demo dependsOn: - - ingress-base + - ingress force: true components: - bookinfo diff --git a/docs/tutorial/hello-world.md b/docs/tutorial/hello-world.md index 77624f94c..a9cda3585 100644 --- a/docs/tutorial/hello-world.md +++ b/docs/tutorial/hello-world.md @@ -109,7 +109,7 @@ kustomize: - name: demo path: demo dependsOn: - - ingress-base + - ingress force: true components: - bookinfo diff --git a/pkg/blueprint/templates/aws.jsonnet b/pkg/blueprint/templates/aws.jsonnet index b282b76c5..b2fd23b19 100644 --- a/pkg/blueprint/templates/aws.jsonnet +++ b/pkg/blueprint/templates/aws.jsonnet @@ -114,7 +114,7 @@ local kustomizeConfig = if blueprint == "full" then [ source: "core", path: "observability", dependsOn: [ - "ingress-base" + "ingress" ], components: [ "grafana", diff --git a/pkg/blueprint/templates/azure.jsonnet b/pkg/blueprint/templates/azure.jsonnet index 98e8312b0..8f2e01759 100644 --- a/pkg/blueprint/templates/azure.jsonnet +++ b/pkg/blueprint/templates/azure.jsonnet @@ -126,7 +126,7 @@ local kustomizeConfig = if blueprint == "full" then [ source: "core", path: "gitops/flux", dependsOn: [ - "ingress-base" + "ingress" ], force: true, components: [ @@ -138,7 +138,7 @@ local kustomizeConfig = if blueprint == "full" then [ source: "core", path: "observability", dependsOn: [ - "ingress-base" + "ingress" ], components: [ "grafana", diff --git a/pkg/blueprint/templates/local.jsonnet b/pkg/blueprint/templates/local.jsonnet index 46babab78..a88f67a5f 100644 --- a/pkg/blueprint/templates/local.jsonnet +++ b/pkg/blueprint/templates/local.jsonnet @@ -356,7 +356,7 @@ local kustomizeConfig = if blueprint == "full" then [ source: "core", path: "gitops/flux", dependsOn: [ - "ingress-base" + "ingress" ], force: true, components: [ @@ -368,7 +368,7 @@ local kustomizeConfig = if blueprint == "full" then [ source: "core", path: "observability", dependsOn: [ - "ingress-base" + "ingress" ], components: [ "grafana", diff --git a/pkg/blueprint/templates/metal.jsonnet b/pkg/blueprint/templates/metal.jsonnet index 9227708f4..c4fda6643 100644 --- a/pkg/blueprint/templates/metal.jsonnet +++ b/pkg/blueprint/templates/metal.jsonnet @@ -323,7 +323,7 @@ local kustomizeConfig = if blueprint == "full" then [ source: "core", path: "gitops/flux", dependsOn: [ - "ingress-base" + "ingress" ], force: true, components: [ @@ -335,7 +335,7 @@ local kustomizeConfig = if blueprint == "full" then [ source: "core", path: "observability", dependsOn: [ - "ingress-base" + "ingress" ], components: [ "grafana", From c7802466f003136b67e21f1def52aef3b4dcb34e Mon Sep 17 00:00:00 2001 From: Ryan VanGundy Date: Sun, 25 May 2025 21:59:21 -0400 Subject: [PATCH 4/5] Include eks additions --- pkg/blueprint/templates/aws.jsonnet | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/blueprint/templates/aws.jsonnet b/pkg/blueprint/templates/aws.jsonnet index b2fd23b19..8b88374b1 100644 --- a/pkg/blueprint/templates/aws.jsonnet +++ b/pkg/blueprint/templates/aws.jsonnet @@ -19,6 +19,11 @@ local terraformConfig = [ path: "cluster/aws-eks", source: "core", }, + { + path: "cluster/aws-eks/additions", + source: "core", + destroy: false + }, { path: "gitops/flux", source: "core", From b84b5e39e6efe53b66bd5dcdf0f9ca1933d736c8 Mon Sep 17 00:00:00 2001 From: Ryan VanGundy Date: Sun, 25 May 2025 23:06:42 -0400 Subject: [PATCH 5/5] Add cleanup --- pkg/blueprint/templates/aws.jsonnet | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkg/blueprint/templates/aws.jsonnet b/pkg/blueprint/templates/aws.jsonnet index 8b88374b1..2f4deca3f 100644 --- a/pkg/blueprint/templates/aws.jsonnet +++ b/pkg/blueprint/templates/aws.jsonnet @@ -74,6 +74,14 @@ local kustomizeConfig = if blueprint == "full" then [ "policy-base" ], }, + { + name: "csi", + source: "core", + path: "csi", + cleanup: [ + "pvcs" + ], + }, { name: "ingress", source: "core", @@ -87,6 +95,10 @@ local kustomizeConfig = if blueprint == "full" then [ "nginx/flux-webhook", "nginx/web" ], + cleanup: [ + "loadbalancers", + "ingresses" + ], }, { name: "pki-base", @@ -114,6 +126,15 @@ local kustomizeConfig = if blueprint == "full" then [ "public-issuer/selfsigned" ], }, + { + name: "dns", + source: "core", + path: "dns", + components: [ + "external-dns", + "external-dns/route53" + ], + }, { name: "observability", source: "core",