From c62e763533e9f8da59db7978547396a0e6874c21 Mon Sep 17 00:00:00 2001 From: Justin Law Date: Tue, 2 Jul 2024 19:30:47 -0400 Subject: [PATCH] cleaning up bundle overrides, config pt.1 --- bundles/dev/local-path-core/uds-bundle.yaml | 5 ++--- bundles/dev/local-path-core/uds-config.yaml | 8 +++----- bundles/latest/local-path-core/uds-config.yaml | 5 +---- .../values/metallb-l2-values.yaml | 6 +++--- packages/uds-rke2/infrastructure/zarf.yaml | 5 ++--- tasks.yaml | 3 +++ tasks/deploy.yaml | 17 +++++++++++++++-- 7 files changed, 29 insertions(+), 20 deletions(-) diff --git a/bundles/dev/local-path-core/uds-bundle.yaml b/bundles/dev/local-path-core/uds-bundle.yaml index db01f7857..dd4110028 100644 --- a/bundles/dev/local-path-core/uds-bundle.yaml +++ b/bundles/dev/local-path-core/uds-bundle.yaml @@ -26,7 +26,6 @@ packages: - name: BUCKET_PERSISTENCE_SIZE description: "Size of the default PVC for MinIO (e.g., 30Gi)" path: persistence.size - default: "30Gi" - name: uds-rke2-infrastructure description: "Deploys the UDS RKE2 base infrastructure Zarf package" @@ -43,8 +42,8 @@ packages: loki: values: # Set DNS service name for Loki Gateway - - path: "global.dnsService" - value: "rke2-coredns-rke2-coredns" + - path: global.dnsService + value: rke2-coredns-rke2-coredns # Ensure we don't hit query limits - path: loki.limits_config.split_queries_by_interval value: "30m" diff --git a/bundles/dev/local-path-core/uds-config.yaml b/bundles/dev/local-path-core/uds-config.yaml index 7cfb0c741..e8b5d15c0 100644 --- a/bundles/dev/local-path-core/uds-config.yaml +++ b/bundles/dev/local-path-core/uds-config.yaml @@ -10,10 +10,7 @@ variables: join_token: $JOIN_TOKEN uds-rke2-infrastructure: - interface: $INTERFACE - address_pool_lower_bound: $ADDRESS_POOL_LOWER_BOUND - address_pool_upper_bound: $ADDRESS_POOL_UPPER_BOUND - base_ip: $BASE_IP + network_interface: $NETWORK_INTERFACE local-path-init: # Workaround for SELinux EBS issue - https://github.com/bottlerocket-os/bottlerocket/issues/2417 @@ -24,7 +21,8 @@ variables: registry_pvc_access_mode: ReadWriteOnce storage_configuration_values_file: values/storage-configuration-values.yaml - bucket_persistence_size: $BUCKET_PERSISTENCE_SIZE + # MinIO bucket persistence volume size + bucket_persistence_size: 50Gi uds-core: loki_s3_endpoint: http://minio.minio.svc.cluster.local:9000 diff --git a/bundles/latest/local-path-core/uds-config.yaml b/bundles/latest/local-path-core/uds-config.yaml index af6aa5340..6c67b3897 100644 --- a/bundles/latest/local-path-core/uds-config.yaml +++ b/bundles/latest/local-path-core/uds-config.yaml @@ -10,10 +10,7 @@ variables: join_token: $JOIN_TOKEN uds-rke2-infrastructure: - interface: $INTERFACE - address_pool_lower_bound: $ADDRESS_POOL_LOWER_BOUND - address_pool_upper_bound: $ADDRESS_POOL_UPPER_BOUND - base_ip: $BASE_IP + network_interface: $NETWORK_INTERFACE local-path-init: # Workaround for SELinux EBS issue - https://github.com/bottlerocket-os/bottlerocket/issues/2417 diff --git a/packages/uds-rke2/infrastructure/values/metallb-l2-values.yaml b/packages/uds-rke2/infrastructure/values/metallb-l2-values.yaml index 8d8f8926b..1525e7cd7 100644 --- a/packages/uds-rke2/infrastructure/values/metallb-l2-values.yaml +++ b/packages/uds-rke2/infrastructure/values/metallb-l2-values.yaml @@ -1,5 +1,5 @@ -ipAddressPool: +ipAddressPool: - ###ZARF_VAR_BASE_IP###.###ZARF_VAR_ADDRESS_POOL_LOWER_BOUND###-###ZARF_VAR_BASE_IP###.###ZARF_VAR_ADDRESS_POOL_UPPER_BOUND### -interface: - - ###ZARF_VAR_INTERFACE### +interface: + - ###ZARF_VAR_NETWORK_INTERFACE### diff --git a/packages/uds-rke2/infrastructure/zarf.yaml b/packages/uds-rke2/infrastructure/zarf.yaml index 1fa068a65..6666e8252 100644 --- a/packages/uds-rke2/infrastructure/zarf.yaml +++ b/packages/uds-rke2/infrastructure/zarf.yaml @@ -9,9 +9,8 @@ metadata: version: "###ZARF_PKG_TMPL_VERSION###" variables: - - name: INTERFACE + - name: NETWORK_INTERFACE description: "The network interface name on which to perform MetalLB L2 advertisement" - default: "wlp0s20f3" prompt: true - name: ADDRESS_POOL_LOWER_BOUND description: "Lower bound of the IP Address Pool range for L2 advertisement" @@ -19,7 +18,7 @@ variables: prompt: false - name: ADDRESS_POOL_UPPER_BOUND description: "Upper bound of the IP Address Pool range for L2 advertisement" - default: "215" + default: "202" prompt: false - name: BASE_IP description: "The host node's base IP" diff --git a/tasks.yaml b/tasks.yaml index 601906d44..c9ceab9f3 100644 --- a/tasks.yaml +++ b/tasks.yaml @@ -19,6 +19,9 @@ variables: - name: JOIN_TOKEN description: "Cluster join token for nodes, set by the master" default: "my-test-token" + - name: NETWORK_INTERFACE + description: "Interface on which to perform L2 advertisement" + default: "wlp0s20f3" tasks: #################### diff --git a/tasks/deploy.yaml b/tasks/deploy.yaml index 9b28933a0..f6af99e8f 100644 --- a/tasks/deploy.yaml +++ b/tasks/deploy.yaml @@ -11,6 +11,9 @@ variables: - name: JOIN_TOKEN description: "Cluster join token for nodes, set by the master" default: "my-test-token" + - name: NETWORK_INTERFACE + description: "Interface on which to perform L2 advertisement" + default: "wlp0s20f3" - name: DEPLOY_OPTIONS description: "Extra Zarf package deployment options" @@ -37,11 +40,15 @@ tasks: description: "Optional components to deploy" required: false default: "" + extraOptions: + description: "Extra deployment options specific to the Zarf Init package's configuration" + required: false actions: - description: "Deploy the Zarf package for amd64 architectures" cmd: | sudo uds zarf package deploy "${{ .inputs.path }}/zarf-package-${{ .inputs.name }}-amd64-${VERSION}.tar.zst" \ ${{ .inputs.optionalComponents }} \ + ${{ .inputs.extraOptions }} \ ${DEPLOY_OPTIONS} - name: bundle @@ -59,16 +66,18 @@ tasks: version: description: "UDS bundle version to be deployed" required: true - default: ${VERSION} joinToken: description: "Cluster join token for nodes, set by the master" required: true - default: ${JOIN_TOKEN} + networkInterface: + description: "Interface on which to perform L2 advertisement" + required: true actions: - description: "Deploy the UDS bundle for the amd64 architectures" cmd: | sudo UDS_CONFIG=${{ .inputs.udsConfig }} uds deploy "${{ .inputs.path }}/uds-bundle-${{ .inputs.name }}-amd64-${{ .inputs.version }}.tar.zst" \ --set JOIN_TOKEN=${{ .inputs.joinToken }} \ + --set NETWORK_INTERFACE=${{ .inputs.networkInterface }} \ ${DEPLOY_BUNDLE_OPTIONS} ######### @@ -85,6 +94,7 @@ tasks: udsConfig: "bundles/latest/local-path-core/uds-config.yaml" version: ${VERSION} joinToken: ${JOIN_TOKEN} + networkInterface: ${NETWORK_INTERFACE} - name: local-path-core-bundle-dev description: "Deploy the Local Path Provisioner UDS RKE2 bootstrapping bundle" @@ -96,6 +106,7 @@ tasks: udsConfig: "bundles/dev/local-path-core/uds-config.yaml" version: dev joinToken: ${JOIN_TOKEN} + networkInterface: ${NETWORK_INTERFACE} ################### # STANDARD PACKAGES @@ -154,6 +165,8 @@ tasks: with: path: build/packages name: infrastructure + # Interface on which to perform L2 advertisement + extraOptions: "--set NETWORK_INTERFACE=${NETWORK_INTERFACE}" - name: uds-rke2-exemptions-local-path description: "Deploy the UDS RKE2 service Pepr policy exemptions package"