From 26cb9777695f8d95636e13bd41bc904d514891c5 Mon Sep 17 00:00:00 2001 From: Sam Gartner Date: Tue, 26 May 2026 11:40:27 -0500 Subject: [PATCH] Use AWS secrets manager defaults Update tests to utilize AWS secrets manager updates to defaults updates update volume size default fixes Update defaults.yaml add more tags update the spec fix defaults fix logging fix default fixes Update defaults.yaml Update defaults.yaml fixes fix fix fixes Update cluster-provisioning.yml Update cluster-provisioning.yml Update cluster-provisioning.yml fix fix defaults Update cluster-provisioning.yml fix fix Update cluster-provisioning.yml fixes Update cluster-provisioning.yml Update smdefaults.go fix yamls fix fix fix fix Update smdefaults.go fixes Update smdefaults.go fix fix go.sum fixes fix Update cluster-provisioning.yml fix Update cluster-provisioning.yml Update cluster-provisioning.yml Update defaults.yaml --- .../workflows/airgap-cluster-provisioning.yml | 15 +- .github/workflows/cluster-provisioning.yml | 354 ++---------------- .../workflows/day2-ops-dualstack-rancher.yml | 6 +- .github/workflows/day2-ops-ipv6-rancher.yml | 6 +- .github/workflows/day2-ops-proxy-rancher.yml | 6 +- .github/workflows/day2-ops-rancher-prime.yml | 4 +- actions/config/defaults/defaults.go | 59 +++ actions/config/defaults/smdefaults.go | 228 +++++++++++ actions/go.mod | 9 +- actions/go.sum | 18 +- go.mod | 9 +- go.sum | 18 +- .../certificates/defaults/defaults.yaml | 30 +- .../certificates/k3s/cert_rotation_test.go | 3 + .../certificates/rke2/cert_rotation_test.go | 3 + .../rke2/cert_rotation_wins_test.go | 3 + validation/deleting/defaults/defaults.yaml | 20 +- .../deleting/k3s/delete_cluster_test.go | 3 + .../deleting/k3s/delete_init_machine_test.go | 3 + .../deleting/k3s/delete_machine_test.go | 3 + .../deleting/rke2/delete_cluster_test.go | 3 + .../deleting/rke2/delete_init_machine_test.go | 3 + .../deleting/rke2/delete_machine_test.go | 3 + .../connectivity/defaults/defaults.yaml | 4 +- validation/nodescaling/defaults/defaults.yaml | 49 +-- validation/nodescaling/k3s/scaling_test.go | 3 + validation/nodescaling/rke2/scaling_test.go | 3 + .../prime/autoscaling/defaults/defaults.yaml | 12 +- validation/prime/defaults/defaults.yaml | 4 +- .../provisioning/airgap/airgap_setup.go | 3 + .../airgap/defaults/defaults.yaml | 87 +++-- .../provisioning/defaults/defaults.yaml | 128 ++++--- .../dualstack/defaults/defaults.yaml | 4 +- .../provisioning/dualstack/k3s_custom_test.go | 3 + .../dualstack/k3s_node_driver_test.go | 3 + .../dualstack/rke2_custom_test.go | 3 + .../dualstack/rke2_node_driver_test.go | 3 + .../provisioning/ipv6/defaults/defaults.yaml | 4 +- .../provisioning/ipv6/k3s_custom_test.go | 3 + .../provisioning/ipv6/k3s_node_driver_test.go | 3 + .../provisioning/ipv6/rke2_custom_test.go | 3 + .../ipv6/rke2_node_driver_test.go | 3 + validation/provisioning/k3s/ace_test.go | 3 + validation/provisioning/k3s/custom_test.go | 3 + .../provisioning/k3s/data_directories_test.go | 3 + .../provisioning/k3s/defaults/defaults.yaml | 8 +- validation/provisioning/k3s/hardened_test.go | 3 + .../k3s/hostname_truncation_test.go | 3 + .../provisioning/k3s/node_driver_test.go | 3 + validation/provisioning/k3s/psact_test.go | 3 + validation/provisioning/k3s/template_test.go | 3 + .../provisioning/proxy/defaults/defaults.yaml | 80 ++-- .../provisioning/proxy/k3s_custom_test.go | 3 + .../proxy/k3s_proxy_node_driver_test.go | 3 + .../provisioning/proxy/rke2_custom_test.go | 3 + .../proxy/rke2_proxy_node_driver_test.go | 3 + .../registries/defaults/defaults.yaml | 89 ++--- .../registries/registries_setup.go | 3 + validation/provisioning/rke2/ace_test.go | 3 + .../rke2/agent_customization_test.go | 3 + .../provisioning/rke2/cloud_provider_test.go | 3 + validation/provisioning/rke2/cni_test.go | 3 + validation/provisioning/rke2/custom_test.go | 3 + .../rke2/data_directories_test.go | 3 + .../provisioning/rke2/defaults/defaults.yaml | 8 +- validation/provisioning/rke2/hardened_test.go | 3 + .../rke2/hostname_truncation_test.go | 4 + validation/provisioning/rke2/ingress_test.go | 3 + .../provisioning/rke2/node_driver_test.go | 3 + validation/provisioning/rke2/psact_test.go | 3 + validation/provisioning/rke2/template_test.go | 3 + .../airgap/defaults/defaults.yaml | 29 +- .../setuprancher/airgap/main.go | 5 + .../dualstack/defaults/defaults.yaml | 25 +- .../setuprancher/dualstack/main.go | 5 + .../setuprancher/ipv6/defaults/defaults.yaml | 25 +- .../infrastructure/setuprancher/ipv6/main.go | 5 + .../setuprancher/proxy/defaults/defaults.yaml | 31 +- .../infrastructure/setuprancher/proxy/main.go | 5 + .../registry/defaults/defaults.yaml | 31 +- .../setuprancher/registry/main.go | 5 + .../standard/defaults/defaults.yaml | 38 +- .../setuprancher/standard/main.go | 11 + .../airgap/defaults/defaults.yaml | 30 +- .../upgraderancher/airgap/main.go | 5 + .../dualstack/defaults/defaults.yaml | 26 +- .../upgraderancher/dualstack/main.go | 5 + .../ipv6/defaults/defaults.yaml | 26 +- .../upgraderancher/ipv6/main.go | 5 + .../proxy/defaults/defaults.yaml | 32 +- .../upgraderancher/proxy/main.go | 5 + .../standard/defaults/defaults.yaml | 34 +- .../upgraderancher/standard/main.go | 5 + .../remotedialerproxy/defaults/defaults.yaml | 29 +- validation/snapshot/defaults/defaults.yaml | 80 ++-- .../snapshot/k3s/snapshot_recurring_test.go | 3 + .../snapshot/k3s/snapshot_restore_test.go | 3 + .../snapshot/k3s/snapshot_retention_test.go | 3 + .../snapshot/k3s/snapshot_s3_restore_test.go | 3 + .../snapshot/rke2/snapshot_recurring_test.go | 3 + .../snapshot/rke2/snapshot_restore_test.go | 3 + .../rke2/snapshot_restore_wins_test.go | 3 + .../snapshot/rke2/snapshot_retention_test.go | 3 + .../snapshot/rke2/snapshot_s3_restore_test.go | 3 + validation/upgrade/defaults/defaults.yaml | 78 ++-- validation/upgrade/k3s/kubernetes_test.go | 3 + .../rke2/cloud_provider_aws_migration_test.go | 3 + validation/upgrade/rke2/kubernetes_test.go | 3 + .../upgrade/rke2/kubernetes_wins_test.go | 3 + validation/workloads/defaults/defaults.yaml | 2 +- 110 files changed, 1163 insertions(+), 848 deletions(-) create mode 100644 actions/config/defaults/smdefaults.go diff --git a/.github/workflows/airgap-cluster-provisioning.yml b/.github/workflows/airgap-cluster-provisioning.yml index fb2a92bd42..54c88668f3 100644 --- a/.github/workflows/airgap-cluster-provisioning.yml +++ b/.github/workflows/airgap-cluster-provisioning.yml @@ -180,8 +180,7 @@ jobs: cleanup: true terraform: cni: "${{ vars.CNI }}" - defaultClusterRoleForProjectMembers: "true" - enableNetworkPolicy: false + defaultClusterRoleForProjectMembers: "" localCluster: "${{ env.LOCAL_CLUSTER_TYPE }}" provider: "${{ vars.PROVIDER_AMAZON }}" privateKeyPath: "${{ secrets.TFP_SSH_PRIVATE_KEY_PATH }}" @@ -234,7 +233,7 @@ jobs: registryName: "${{ env.HOSTNAME_PREFIX }}" useAuthGlobalRegistry: false terratest: - pathToRepo: "${{ secrets.PATH_TO_REPO }}" + pathToRepo: "${{ secrets.HB_PATH_TO_TFP_REPO }}" standaloneLogging: ${{ vars.TERRAFORM_LOGGING }} clusterConfig: @@ -499,8 +498,7 @@ jobs: cleanup: true terraform: cni: "${{ vars.CNI }}" - defaultClusterRoleForProjectMembers: "true" - enableNetworkPolicy: false + defaultClusterRoleForProjectMembers: "" localCluster: "${{ env.LOCAL_CLUSTER_TYPE }}" provider: "${{ vars.PROVIDER_AMAZON }}" privateKeyPath: "${{ secrets.TFP_SSH_PRIVATE_KEY_PATH }}" @@ -554,7 +552,7 @@ jobs: registryName: "${{ env.HOSTNAME_PREFIX }}" useAuthGlobalRegistry: false terratest: - pathToRepo: "${{ secrets.PATH_TO_REPO }}" + pathToRepo: "${{ secrets.HB_PATH_TO_TFP_REPO }}" standaloneLogging: ${{ vars.TERRAFORM_LOGGING }} clusterConfig: @@ -819,8 +817,7 @@ jobs: cleanup: true terraform: cni: "${{ vars.CNI }}" - defaultClusterRoleForProjectMembers: "true" - enableNetworkPolicy: false + defaultClusterRoleForProjectMembers: "" localCluster: "${{ env.LOCAL_CLUSTER_TYPE }}" provider: "${{ vars.PROVIDER_AMAZON }}" privateKeyPath: "${{ secrets.TFP_SSH_PRIVATE_KEY_PATH }}" @@ -874,7 +871,7 @@ jobs: registryName: "${{ env.HOSTNAME_PREFIX }}" useAuthGlobalRegistry: false terratest: - pathToRepo: "${{ secrets.PATH_TO_REPO }}" + pathToRepo: "${{ secrets.HB_PATH_TO_TFP_REPO }}" standaloneLogging: ${{ vars.TERRAFORM_LOGGING }} clusterConfig: diff --git a/.github/workflows/cluster-provisioning.yml b/.github/workflows/cluster-provisioning.yml index 8272c8823a..9a2f9b3b1a 100644 --- a/.github/workflows/cluster-provisioning.yml +++ b/.github/workflows/cluster-provisioning.yml @@ -105,6 +105,8 @@ jobs: secret-ids: | AWS_ACCESS_KEY, ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_KEY, ${{ secrets.AWS_SECRET_ACCESS_KEY }} + HB_AWS_REGION, HB_AWS_REGION + HB_QA_PRIVATE_REGISTRY_NAME, HB_QA_PRIVATE_REGISTRY_NAME - name: "Fetch and Set DockerHub Credentials" uses: rancher-eio/read-vault-secrets@0da85151ad1f19ed7986c41587e45aac1ace74b6 #v3 @@ -197,146 +199,42 @@ jobs: run: | cat > config.yaml <" + + awsCredentials: + accessKey: "$AWS_ACCESS_KEY" + secretKey: "$AWS_SECRET_KEY" + defaultRegion: "${{ fromJSON(env.HB_AWS_REGION).value }}" + terraform: - cni: "${{ vars.CNI }}" - defaultClusterRoleForProjectMembers: "true" - enableNetworkPolicy: false localCluster: "${{ env.LOCAL_CLUSTER_TYPE }}" - provider: "${{ vars.PROVIDER_AMAZON }}" - downstreamClusterProvider: "${{ vars.PROVIDER_AMAZON }}" - privateKeyPath: "${{ secrets.TFP_SSH_PRIVATE_KEY_PATH }}" privateFullChainPath: "${{ steps.setup-certs.outputs.private-full-chain-tfp-path }}" privateCertKeyPath: "${{ steps.setup-certs.outputs.private-cert-key-tfp-path }}" resourcePrefix: "${{ env.HOSTNAME_PREFIX }}" - awsCredentials: - awsAccessKey: "$AWS_ACCESS_KEY" - awsSecretKey: "$AWS_SECRET_KEY" - awsConfig: - ami: "${{ secrets.AWS_AMI }}" - awsKeyName: "${{ secrets.SSH_PRIVATE_KEY_NAME }}" - awsInstanceType: "${{ vars.AWS_INSTANCE_TYPE }}" - awsVolumeType: "${{ vars.AWS_VOLUME_TYPE }}" - region: "${{ secrets.AWS_REGION }}" - awsSecurityGroups: [${{ secrets.AWS_SECURITY_GROUPS }}] - awsSecurityGroupNames: [${{ secrets.AWS_SECURITY_GROUP_NAMES }}] - awsSubnetID: "${{ secrets.AWS_SUBNET_ID }}" - awsVpcID: "${{ secrets.AWS_VPC_ID }}" - awsZoneLetter: "${{ vars.AWS_ZONE_LETTER }}" - awsRootSize: ${{ vars.AWS_ROOT_SIZE }} - awsRoute53Zone: "${{ secrets.AWS_ROUTE_53_ZONE }}" - awsUser: "${{ secrets.AWS_USER }}" - sshConnectionType: "${{ vars.SSH_CONNECTION_TYPE }}" - timeout: "${{ vars.TIMEOUT }}" - windowsAWSUser: "${{ secrets.AWS_WINDOWS_USER }}" - windows2019AMI: "${{ secrets.WINDOWS_2019_AMI }}" - windows2022AMI: "${{ secrets.WINDOWS_2022_AMI }}" - windows2019Password: "${{ secrets.AWS_WINDOWS_2019_PASSWORD }}" - windows2022Password: "${{ secrets.AWS_WINDOWS_2022_PASSWORD }}" - windowsInstanceType: "${{ vars.AWS_WINDOWS_INSTANCE_TYPE }}" - ipAddressType: "${{ vars.IP_ADDRESS_TYPE }}" - loadBalancerType: "${{ vars.LOAD_BALANCER_TYPE }}" - targetType: "${{ vars.TARGET_TYPE }}" standalone: - bootstrapPassword: "${{ secrets.RANCHER_ADMIN_PASSWORD }}" - certManagerVersion: "${{ vars.CERT_MANAGER_VERSION }}" chartVersion: "${{ env.RANCHER_CHART_VERSION }}" - k3sVersion: "${{ vars.K3S_VERSION_2_15 }}${{ vars.K3S_VERSION_SUFFIX }}" - osUser: "${{ secrets.OS_USER }}" - osGroup: "${{ secrets.OS_GROUP }}" rancherChartRepository: "${{ env.RANCHER_HELM_CHART_URL }}" - rancherHostname: "${{ env.HOSTNAME_PREFIX }}.${{ secrets.AWS_ROUTE_53_ZONE }}" - rancherImage: "${{ secrets.RANCHER_IMAGE }}" rancherTagVersion: "${{ env.RANCHER_VERSION }}" + rancherHostname: "${{ env.HOSTNAME_PREFIX }}." registryPassword: "${{ env.DOCKERHUB_PASSWORD }}" registryUsername: "${{ env.DOCKERHUB_USERNAME }}" repo: "${{ env.RANCHER_REPO }}" - rke2Version: "${{ vars.RKE2_VERSION_2_15 }}" - terratest: - pathToRepo: "${{ secrets.PATH_TO_REPO }}" - standaloneLogging: ${{ vars.TERRAFORM_LOGGING }} + rke2Version: "" clusterConfig: - resourcePrefix: "${{ env.HOSTNAME_PREFIX }}" - cni: "${{ vars.CNI }}" - provider: "${{ vars.PROVIDER_AMAZON }}" - nodeProvider: "ec2" - pathToRepo: "${{ secrets.PATH_TO_TESTS_REPO }}" registries: rke2Password: "${{ env.DOCKERHUB_PASSWORD }}" rke2Username: "${{ env.DOCKERHUB_USERNAME }}" rke2Registries: mirrors: "docker.io": - endpoint: ["https://${{ secrets.QA_PRIVATE_REGISTRY_NAME }}"] + endpoint: ["https://${{ fromJSON(env.HB_QA_PRIVATE_REGISTRY_NAME).value }}"] configs: - "${{ secrets.QA_PRIVATE_REGISTRY_NAME }}": + "${{ fromJSON(env.HB_QA_PRIVATE_REGISTRY_NAME).value }}": "auth": username: "${{ env.DOCKERHUB_USERNAME }}" password: "${{ env.DOCKERHUB_PASSWORD }}" insecureSkipVerify: true - - logging: - level: "${{ vars.LOGGING_LEVEL }}" - - awsCredentials: - secretKey: "$AWS_SECRET_KEY" - accessKey: "$AWS_ACCESS_KEY" - defaultRegion: "${{ secrets.AWS_REGION }}" - - awsMachineConfigs: - region: "${{ secrets.AWS_REGION }}" - awsMachineConfig: - - roles: ["etcd", "controlplane", "worker"] - ami: "${{ secrets.AWS_AMI }}" - sshUser: "${{ secrets.AWS_USER }}" - vpcId: "${{ secrets.AWS_VPC_ID }}" - subnetId: "${{ secrets.AWS_SUBNET_ID }}" - volumeType: "${{ vars.AWS_VOLUME_TYPE }}" - zone: "${{ vars.AWS_ZONE_LETTER }}" - retries: "5" - rootSize: "${{ vars.AWS_ROOT_SIZE }}" - iamInstanceProfile: "${{ secrets.AWS_IAM_PROFILE}}" - - awsEC2Configs: - region: "${{ secrets.AWS_REGION }}" - awsSecretAccessKey: "$AWS_SECRET_KEY" - awsAccessKeyID: "$AWS_ACCESS_KEY" - awsEC2Config: - - awsRegionAZ: "${{ secrets.AWS_REGION }}${{ vars.AWS_ZONE_LETTER }}" - awsAMI: "${{ secrets.AWS_AMI }}" - awsSecurityGroups: [${{ secrets.AWS_SECURITY_GROUPS }}] - awsSubnetID: "${{ secrets.AWS_SUBNET_ID }}" - awsSSHKeyName: "${{ secrets.SSH_PRIVATE_KEY_NAME }}.pem" - awsCICDInstanceTag: "rancher-validation" - awsIAMProfile: "${{ secrets.AWS_IAM_PROFILE}}" - awsUser: "${{ secrets.AWS_USER }}" - volumeSize: ${{ vars.AWS_ROOT_SIZE }} - roles: ["etcd", "controlplane", "worker"] - - instanceType: "${{ vars.AWS_WINDOWS_INSTANCE_TYPE }}" - awsRegionAZ: "${{ secrets.AWS_REGION }}${{ vars.AWS_ZONE_LETTER }}" - awsAMI: "${{ secrets.WINDOWS_2022_AMI }}" - awsSecurityGroups: [${{ secrets.AWS_SECURITY_GROUPS }}] - awsSubnetID: "${{ secrets.AWS_SUBNET_ID }}" - awsSSHKeyName: "${{ secrets.WINDOWS_SSH_PRIVATE_KEY_NAME }}.pem" - awsCICDInstanceTag: "rancher-validation" - awsUser: "${{ secrets.AWS_WINDOWS_USER }}" - volumeSize: ${{ vars.AWS_ROOT_SIZE }} - roles: ["windows"] - sshPath: - sshPath: "${{ secrets.SSH_PRIVATE_KEY_PATH }}" - - templateTest: - repo: - spec: - gitRepo: "${{ secrets.TEMPLATE_GIT_REPO }}" - gitBranch: main - insecureSkipTLSVerify: true - templateProvider: "aws" - templateName: "cluster-template1" EOF - name: Export CATTLE_TEST_CONFIG @@ -492,6 +390,8 @@ jobs: secret-ids: | AWS_ACCESS_KEY, ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_KEY, ${{ secrets.AWS_SECRET_ACCESS_KEY }} + HB_AWS_REGION, HB_AWS_REGION + HB_QA_PRIVATE_REGISTRY_NAME, HB_QA_PRIVATE_REGISTRY_NAME - name: "Fetch and Set DockerHub Credentials" uses: rancher-eio/read-vault-secrets@0da85151ad1f19ed7986c41587e45aac1ace74b6 #v3 @@ -583,11 +483,11 @@ jobs: - name: Create config.yaml run: | cat > config.yaml <" + secretKey: "" + defaultRegion: "${{ fromJSON(env.HB_AWS_REGION).value }}" + terraform: cni: "${{ vars.CNI }}" defaultClusterRoleForProjectMembers: "true" @@ -600,33 +500,8 @@ jobs: privateCertKeyPath: "${{ steps.setup-certs.outputs.private-cert-key-tfp-path }}" resourcePrefix: "${{ env.HOSTNAME_PREFIX }}" awsCredentials: - awsAccessKey: "$AWS_ACCESS_KEY" - awsSecretKey: "$AWS_SECRET_KEY" - awsConfig: - ami: "${{ secrets.AWS_AMI }}" - awsKeyName: "${{ secrets.SSH_PRIVATE_KEY_NAME }}" - awsInstanceType: "${{ vars.AWS_INSTANCE_TYPE }}" - awsVolumeType: "${{ vars.AWS_VOLUME_TYPE }}" - region: "${{ secrets.AWS_REGION }}" - awsSecurityGroups: [${{ secrets.AWS_SECURITY_GROUPS }}] - awsSecurityGroupNames: [${{ secrets.AWS_SECURITY_GROUP_NAMES }}] - awsSubnetID: "${{ secrets.AWS_SUBNET_ID }}" - awsVpcID: "${{ secrets.AWS_VPC_ID }}" - awsZoneLetter: "${{ vars.AWS_ZONE_LETTER }}" - awsRootSize: ${{ vars.AWS_ROOT_SIZE }} - awsRoute53Zone: "${{ secrets.AWS_ROUTE_53_ZONE }}" - awsUser: "${{ secrets.AWS_USER }}" - sshConnectionType: "${{ vars.SSH_CONNECTION_TYPE }}" - timeout: "${{ vars.TIMEOUT }}" - windowsAWSUser: "${{ secrets.AWS_WINDOWS_USER }}" - windows2019AMI: "${{ secrets.WINDOWS_2019_AMI }}" - windows2022AMI: "${{ secrets.WINDOWS_2022_AMI }}" - windows2019Password: "${{ secrets.AWS_WINDOWS_2019_PASSWORD }}" - windows2022Password: "${{ secrets.AWS_WINDOWS_2022_PASSWORD }}" - windowsInstanceType: "${{ vars.AWS_WINDOWS_INSTANCE_TYPE }}" - ipAddressType: "${{ vars.IP_ADDRESS_TYPE }}" - loadBalancerType: "${{ vars.LOAD_BALANCER_TYPE }}" - targetType: "${{ vars.TARGET_TYPE }}" + awsAccessKey: "" + awsSecretKey: "" standalone: bootstrapPassword: "${{ secrets.RANCHER_ADMIN_PASSWORD }}" certManagerVersion: "${{ vars.CERT_MANAGER_VERSION }}" @@ -635,95 +510,27 @@ jobs: osUser: "${{ secrets.OS_USER }}" osGroup: "${{ secrets.OS_GROUP }}" rancherChartRepository: "${{ env.RANCHER_HELM_CHART_URL }}" - rancherHostname: "${{ env.HOSTNAME_PREFIX }}.${{ secrets.AWS_ROUTE_53_ZONE }}" - rancherImage: "${{ secrets.RANCHER_IMAGE }}" rancherTagVersion: "${{ env.RANCHER_VERSION }}" registryPassword: "${{ env.DOCKERHUB_PASSWORD }}" registryUsername: "${{ env.DOCKERHUB_USERNAME }}" repo: "${{ env.RANCHER_REPO }}" rke2Version: "${{ vars.RKE2_VERSION_2_14 }}" - terratest: - pathToRepo: "${{ secrets.PATH_TO_REPO }}" - standaloneLogging: ${{ vars.TERRAFORM_LOGGING }} clusterConfig: resourcePrefix: "${{ env.HOSTNAME_PREFIX }}" - cni: "${{ vars.CNI }}" - provider: "${{ vars.PROVIDER_AMAZON }}" - nodeProvider: "ec2" - pathToRepo: "${{ secrets.PATH_TO_TESTS_REPO }}" registries: rke2Password: "${{ env.DOCKERHUB_PASSWORD }}" rke2Username: "${{ env.DOCKERHUB_USERNAME }}" rke2Registries: mirrors: "docker.io": - endpoint: ["https://${{ secrets.QA_PRIVATE_REGISTRY_NAME }}"] + endpoint: ["https://${{ fromJSON(env.HB_QA_PRIVATE_REGISTRY_NAME).value }}"] configs: - "${{ secrets.QA_PRIVATE_REGISTRY_NAME }}": + "${{ fromJSON(env.HB_QA_PRIVATE_REGISTRY_NAME).value }}": "auth": username: "${{ env.DOCKERHUB_USERNAME }}" password: "${{ env.DOCKERHUB_PASSWORD }}" insecureSkipVerify: true - - logging: - level: "${{ vars.LOGGING_LEVEL }}" - - awsCredentials: - secretKey: "$AWS_SECRET_KEY" - accessKey: "$AWS_ACCESS_KEY" - defaultRegion: "${{ secrets.AWS_REGION }}" - - awsMachineConfigs: - region: "${{ secrets.AWS_REGION }}" - awsMachineConfig: - - roles: ["etcd", "controlplane", "worker"] - ami: "${{ secrets.AWS_AMI }}" - sshUser: "${{ secrets.AWS_USER }}" - vpcId: "${{ secrets.AWS_VPC_ID }}" - subnetId: "${{ secrets.AWS_SUBNET_ID }}" - volumeType: "${{ vars.AWS_VOLUME_TYPE }}" - zone: "${{ vars.AWS_ZONE_LETTER }}" - retries: "5" - rootSize: "${{ vars.AWS_ROOT_SIZE }}" - iamInstanceProfile: "${{ secrets.AWS_IAM_PROFILE}}" - - awsEC2Configs: - region: "${{ secrets.AWS_REGION }}" - awsSecretAccessKey: "$AWS_SECRET_KEY" - awsAccessKeyID: "$AWS_ACCESS_KEY" - awsEC2Config: - - awsRegionAZ: "${{ secrets.AWS_REGION }}${{ vars.AWS_ZONE_LETTER }}" - awsAMI: "${{ secrets.AWS_AMI }}" - awsSecurityGroups: [${{ secrets.AWS_SECURITY_GROUPS }}] - awsSubnetID: "${{ secrets.AWS_SUBNET_ID }}" - awsSSHKeyName: "${{ secrets.SSH_PRIVATE_KEY_NAME }}.pem" - awsCICDInstanceTag: "rancher-validation" - awsIAMProfile: "${{ secrets.AWS_IAM_PROFILE}}" - awsUser: "${{ secrets.AWS_USER }}" - volumeSize: ${{ vars.AWS_ROOT_SIZE }} - roles: ["etcd", "controlplane", "worker"] - - instanceType: "${{ vars.AWS_WINDOWS_INSTANCE_TYPE }}" - awsRegionAZ: "${{ secrets.AWS_REGION }}${{ vars.AWS_ZONE_LETTER }}" - awsAMI: "${{ secrets.WINDOWS_2022_AMI }}" - awsSecurityGroups: [${{ secrets.AWS_SECURITY_GROUPS }}] - awsSubnetID: "${{ secrets.AWS_SUBNET_ID }}" - awsSSHKeyName: "${{ secrets.WINDOWS_SSH_PRIVATE_KEY_NAME }}.pem" - awsCICDInstanceTag: "rancher-validation" - awsUser: "${{ secrets.AWS_WINDOWS_USER }}" - volumeSize: ${{ vars.AWS_ROOT_SIZE }} - roles: ["windows"] - sshPath: - sshPath: "${{ secrets.SSH_PRIVATE_KEY_PATH }}" - - templateTest: - repo: - spec: - gitRepo: "${{ secrets.TEMPLATE_GIT_REPO }}" - gitBranch: main - insecureSkipTLSVerify: true - templateProvider: "aws" - templateName: "cluster-template1" EOF - name: Export CATTLE_TEST_CONFIG @@ -1271,6 +1078,8 @@ jobs: secret-ids: | AWS_ACCESS_KEY, ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_KEY, ${{ secrets.AWS_SECRET_ACCESS_KEY }} + HB_AWS_REGION, HB_AWS_REGION + HB_QA_PRIVATE_REGISTRY_NAME, HB_QA_PRIVATE_REGISTRY_NAME - name: "Fetch and Set DockerHub Credentials" uses: rancher-eio/read-vault-secrets@0da85151ad1f19ed7986c41587e45aac1ace74b6 #v3 @@ -1362,11 +1171,11 @@ jobs: - name: Create config.yaml run: | cat > config.yaml <" + secretKey: "" + defaultRegion: "${{ fromJSON(env.HB_AWS_REGION).value }}" + terraform: cni: "${{ vars.CNI }}" defaultClusterRoleForProjectMembers: "true" @@ -1379,33 +1188,8 @@ jobs: privateCertKeyPath: "${{ steps.setup-certs.outputs.private-cert-key-tfp-path }}" resourcePrefix: "${{ env.HOSTNAME_PREFIX }}" awsCredentials: - awsAccessKey: "$AWS_ACCESS_KEY" - awsSecretKey: "$AWS_SECRET_KEY" - awsConfig: - ami: "${{ secrets.AWS_AMI }}" - awsKeyName: "${{ secrets.SSH_PRIVATE_KEY_NAME }}" - awsInstanceType: "${{ vars.AWS_INSTANCE_TYPE }}" - awsVolumeType: "${{ vars.AWS_VOLUME_TYPE }}" - region: "${{ secrets.AWS_REGION }}" - awsSecurityGroups: [${{ secrets.AWS_SECURITY_GROUPS_PRIME }}] - awsSecurityGroupNames: [${{ secrets.AWS_SECURITY_GROUP_NAMES_PRIME }}] - awsSubnetID: "${{ secrets.AWS_SUBNET_ID }}" - awsVpcID: "${{ secrets.AWS_VPC_ID }}" - awsZoneLetter: "${{ vars.AWS_ZONE_LETTER }}" - awsRootSize: ${{ vars.AWS_ROOT_SIZE }} - awsRoute53Zone: "${{ secrets.AWS_ROUTE_53_ZONE }}" - awsUser: "${{ secrets.AWS_USER }}" - sshConnectionType: "${{ vars.SSH_CONNECTION_TYPE }}" - timeout: "${{ vars.TIMEOUT }}" - windowsAWSUser: "${{ secrets.AWS_WINDOWS_USER }}" - windows2019AMI: "${{ secrets.WINDOWS_2019_AMI }}" - windows2022AMI: "${{ secrets.WINDOWS_2022_AMI }}" - windows2019Password: "${{ secrets.AWS_WINDOWS_2019_PASSWORD }}" - windows2022Password: "${{ secrets.AWS_WINDOWS_2022_PASSWORD }}" - windowsInstanceType: "${{ vars.AWS_WINDOWS_INSTANCE_TYPE }}" - ipAddressType: "${{ vars.IP_ADDRESS_TYPE }}" - loadBalancerType: "${{ vars.LOAD_BALANCER_TYPE }}" - targetType: "${{ vars.TARGET_TYPE }}" + awsAccessKey: "" + awsSecretKey: "" standalone: bootstrapPassword: "${{ secrets.RANCHER_ADMIN_PASSWORD }}" certManagerVersion: "${{ vars.CERT_MANAGER_VERSION }}" @@ -1415,95 +1199,27 @@ jobs: osGroup: "${{ secrets.OS_GROUP }}" rancherAgentImage: "${{ secrets.RANCHER_AGENT_IMAGE }}" rancherChartRepository: "${{ env.RANCHER_HELM_CHART_URL }}" - rancherHostname: "${{ env.HOSTNAME_PREFIX }}.${{ secrets.AWS_ROUTE_53_ZONE }}" - rancherImage: "${{ secrets.RANCHER_IMAGE }}" rancherTagVersion: "${{ env.RANCHER_VERSION }}" registryPassword: "${{ env.DOCKERHUB_PASSWORD }}" registryUsername: "${{ env.DOCKERHUB_USERNAME }}" repo: "${{ env.RANCHER_REPO }}" rke2Version: "${{ vars.RKE2_VERSION_2_13 }}" - terratest: - pathToRepo: "${{ secrets.PATH_TO_REPO }}" - standaloneLogging: ${{ vars.TERRAFORM_LOGGING }} clusterConfig: resourcePrefix: "${{ env.HOSTNAME_PREFIX }}" - cni: "${{ vars.CNI }}" - provider: "${{ vars.PROVIDER_AMAZON }}" - nodeProvider: "ec2" - pathToRepo: "${{ secrets.PATH_TO_TESTS_REPO }}" registries: rke2Password: "${{ env.DOCKERHUB_PASSWORD }}" rke2Username: "${{ env.DOCKERHUB_USERNAME }}" rke2Registries: mirrors: "docker.io": - endpoint: ["https://${{ secrets.QA_PRIVATE_REGISTRY_NAME }}"] + endpoint: ["https://${{ fromJSON(env.HB_QA_PRIVATE_REGISTRY_NAME).value }}"] configs: - "${{ secrets.QA_PRIVATE_REGISTRY_NAME }}": + "${{ fromJSON(env.HB_QA_PRIVATE_REGISTRY_NAME).value }}": "auth": username: "${{ env.DOCKERHUB_USERNAME }}" password: "${{ env.DOCKERHUB_PASSWORD }}" insecureSkipVerify: true - - logging: - level: "${{ vars.LOGGING_LEVEL }}" - - awsCredentials: - secretKey: "$AWS_SECRET_KEY" - accessKey: "$AWS_ACCESS_KEY" - defaultRegion: "${{ secrets.AWS_REGION }}" - - awsMachineConfigs: - region: "${{ secrets.AWS_REGION }}" - awsMachineConfig: - - roles: ["etcd", "controlplane", "worker"] - ami: "${{ secrets.AWS_AMI }}" - sshUser: "${{ secrets.AWS_USER }}" - vpcId: "${{ secrets.AWS_VPC_ID }}" - subnetId: "${{ secrets.AWS_SUBNET_ID }}" - volumeType: "${{ vars.AWS_VOLUME_TYPE }}" - zone: "${{ vars.AWS_ZONE_LETTER }}" - retries: "5" - rootSize: "${{ vars.AWS_ROOT_SIZE }}" - iamInstanceProfile: "${{ secrets.AWS_IAM_PROFILE}}" - - awsEC2Configs: - region: "${{ secrets.AWS_REGION }}" - awsSecretAccessKey: "$AWS_SECRET_KEY" - awsAccessKeyID: "$AWS_ACCESS_KEY" - awsEC2Config: - - awsRegionAZ: "${{ secrets.AWS_REGION }}${{ vars.AWS_ZONE_LETTER }}" - awsAMI: "${{ secrets.AWS_AMI }}" - awsSecurityGroups: [${{ secrets.AWS_SECURITY_GROUPS_PRIME }}] - awsSubnetID: "${{ secrets.AWS_SUBNET_ID }}" - awsSSHKeyName: "${{ secrets.SSH_PRIVATE_KEY_NAME }}.pem" - awsCICDInstanceTag: "rancher-validation" - awsIAMProfile: "${{ secrets.AWS_IAM_PROFILE}}" - awsUser: "${{ secrets.AWS_USER }}" - volumeSize: ${{ vars.AWS_ROOT_SIZE }} - roles: ["etcd", "controlplane", "worker"] - - instanceType: "${{ vars.AWS_WINDOWS_INSTANCE_TYPE }}" - awsRegionAZ: "${{ secrets.AWS_REGION }}${{ vars.AWS_ZONE_LETTER }}" - awsAMI: "${{ secrets.WINDOWS_2022_AMI }}" - awsSecurityGroups: [${{ secrets.AWS_SECURITY_GROUPS_PRIME }}] - awsSubnetID: "${{ secrets.AWS_SUBNET_ID }}" - awsSSHKeyName: "${{ secrets.WINDOWS_SSH_PRIVATE_KEY_NAME }}.pem" - awsCICDInstanceTag: "rancher-validation" - awsUser: "${{ secrets.AWS_WINDOWS_USER }}" - volumeSize: ${{ vars.AWS_ROOT_SIZE }} - roles: ["windows"] - sshPath: - sshPath: "${{ secrets.SSH_PRIVATE_KEY_PATH }}" - - templateTest: - repo: - spec: - gitRepo: "${{ secrets.TEMPLATE_GIT_REPO }}" - gitBranch: main - insecureSkipTLSVerify: true - templateProvider: "aws" - templateName: "cluster-template1" EOF - name: Export CATTLE_TEST_CONFIG diff --git a/.github/workflows/day2-ops-dualstack-rancher.yml b/.github/workflows/day2-ops-dualstack-rancher.yml index cc2de0a843..b255d2ac1a 100644 --- a/.github/workflows/day2-ops-dualstack-rancher.yml +++ b/.github/workflows/day2-ops-dualstack-rancher.yml @@ -246,7 +246,7 @@ jobs: repo: "${{ env.RANCHER_REPO }}" rke2Version: "${{ vars.RKE2_VERSION_2_15 }}" terratest: - pathToRepo: "${{ secrets.PATH_TO_REPO }}" + pathToRepo: "${{ secrets.HB_PATH_TO_TFP_REPO }}" standaloneLogging: ${{ vars.TERRAFORM_LOGGING }} scalingInput: @@ -622,7 +622,7 @@ jobs: repo: "${{ env.RANCHER_REPO }}" rke2Version: "${{ vars.RKE2_VERSION_2_14 }}" terratest: - pathToRepo: "${{ secrets.PATH_TO_REPO }}" + pathToRepo: "${{ secrets.HB_PATH_TO_TFP_REPO }}" standaloneLogging: ${{ vars.TERRAFORM_LOGGING }} scalingInput: @@ -998,7 +998,7 @@ jobs: repo: "${{ env.RANCHER_REPO }}" rke2Version: "${{ vars.RKE2_VERSION_2_13 }}" terratest: - pathToRepo: "${{ secrets.PATH_TO_REPO }}" + pathToRepo: "${{ secrets.HB_PATH_TO_TFP_REPO }}" standaloneLogging: ${{ vars.TERRAFORM_LOGGING }} scalingInput: diff --git a/.github/workflows/day2-ops-ipv6-rancher.yml b/.github/workflows/day2-ops-ipv6-rancher.yml index 5202fcb1d3..817ba1062a 100644 --- a/.github/workflows/day2-ops-ipv6-rancher.yml +++ b/.github/workflows/day2-ops-ipv6-rancher.yml @@ -248,7 +248,7 @@ jobs: repo: "${{ env.RANCHER_REPO }}" rke2Version: "${{ vars.RKE2_VERSION_2_15 }}" terratest: - pathToRepo: "${{ secrets.PATH_TO_REPO }}" + pathToRepo: "${{ secrets.HB_PATH_TO_TFP_REPO }}" standaloneLogging: ${{ vars.TERRAFORM_LOGGING }} scalingInput: @@ -625,7 +625,7 @@ jobs: repo: "${{ env.RANCHER_REPO }}" rke2Version: "${{ vars.RKE2_VERSION_2_14 }}" terratest: - pathToRepo: "${{ secrets.PATH_TO_REPO }}" + pathToRepo: "${{ secrets.HB_PATH_TO_TFP_REPO }}" standaloneLogging: ${{ vars.TERRAFORM_LOGGING }} scalingInput: @@ -1002,7 +1002,7 @@ jobs: repo: "${{ env.RANCHER_REPO }}" rke2Version: "${{ vars.RKE2_VERSION_2_13 }}" terratest: - pathToRepo: "${{ secrets.PATH_TO_REPO }}" + pathToRepo: "${{ secrets.HB_PATH_TO_TFP_REPO }}" standaloneLogging: ${{ vars.TERRAFORM_LOGGING }} scalingInput: diff --git a/.github/workflows/day2-ops-proxy-rancher.yml b/.github/workflows/day2-ops-proxy-rancher.yml index f3c6eae79f..6900f9a124 100644 --- a/.github/workflows/day2-ops-proxy-rancher.yml +++ b/.github/workflows/day2-ops-proxy-rancher.yml @@ -246,7 +246,7 @@ jobs: repo: "${{ env.RANCHER_REPO }}" rke2Version: "${{ vars.RKE2_VERSION_2_15 }}" terratest: - pathToRepo: "${{ secrets.PATH_TO_REPO }}" + pathToRepo: "${{ secrets.HB_PATH_TO_TFP_REPO }}" standaloneLogging: ${{ vars.TERRAFORM_LOGGING }} scalingInput: @@ -634,7 +634,7 @@ jobs: repo: "${{ env.RANCHER_REPO }}" rke2Version: "${{ vars.RKE2_VERSION_2_14 }}" terratest: - pathToRepo: "${{ secrets.PATH_TO_REPO }}" + pathToRepo: "${{ secrets.HB_PATH_TO_TFP_REPO }}" standaloneLogging: ${{ vars.TERRAFORM_LOGGING }} scalingInput: @@ -1023,7 +1023,7 @@ jobs: repo: "${{ env.RANCHER_REPO }}" rke2Version: "${{ vars.RKE2_VERSION_2_13 }}" terratest: - pathToRepo: "${{ secrets.PATH_TO_REPO }}" + pathToRepo: "${{ secrets.HB_PATH_TO_TFP_REPO }}" standaloneLogging: ${{ vars.TERRAFORM_LOGGING }} scalingInput: diff --git a/.github/workflows/day2-ops-rancher-prime.yml b/.github/workflows/day2-ops-rancher-prime.yml index eaf00972e5..d6eed3add6 100644 --- a/.github/workflows/day2-ops-rancher-prime.yml +++ b/.github/workflows/day2-ops-rancher-prime.yml @@ -234,7 +234,7 @@ jobs: repo: "${{ env.RANCHER_REPO }}" rke2Version: "${{ vars.RKE2_VERSION_2_14 }}" terratest: - pathToRepo: "${{ secrets.PATH_TO_REPO }}" + pathToRepo: "${{ secrets.HB_PATH_TO_TFP_REPO }}" standaloneLogging: ${{ vars.TERRAFORM_LOGGING }} clusterConfig: @@ -549,7 +549,7 @@ jobs: repo: "${{ env.RANCHER_REPO }}" rke2Version: "${{ vars.RKE2_VERSION_2_13 }}" terratest: - pathToRepo: "${{ secrets.PATH_TO_REPO }}" + pathToRepo: "${{ secrets.HB_PATH_TO_TFP_REPO }}" standaloneLogging: ${{ vars.TERRAFORM_LOGGING }} clusterConfig: diff --git a/actions/config/defaults/defaults.go b/actions/config/defaults/defaults.go index ee376ca184..217f814b3a 100644 --- a/actions/config/defaults/defaults.go +++ b/actions/config/defaults/defaults.go @@ -1,7 +1,9 @@ package defaults import ( + "fmt" "os" + "regexp" "strings" "github.com/rancher/shepherd/pkg/config" @@ -15,6 +17,8 @@ const ( K3S = "k3s" ) +var placeholderRegex = regexp.MustCompile(`<[^<>]+>`) + // LoadPackageDefaults loads the specified filename in the same package as the test func LoadPackageDefaults(cattleConfig map[string]any, filePath string) (map[string]any, error) { var defaultsConfig map[string]any @@ -112,3 +116,58 @@ func DeepMerge(mergingMap map[string]any, baseMap map[string]any, OneToOneListMa return output, nil } + +// VerifyCattleConfig checks for unresolved required and placeholder values. +// It logs an error for each required path and a warning for each placeholder path. +func VerifyCattleConfig(cattleConfig map[string]any) error { + requiredPaths, placeholderPaths := verifyConfigValue("", cattleConfig) + + for _, requiredPath := range requiredPaths { + logrus.Errorf("Required config value is not set at path: %s", requiredPath) + } + + for _, placeholderPath := range placeholderPaths { + logrus.Warningf("Config value contains unresolved placeholder at path: %s", placeholderPath) + } + + if len(requiredPaths) > 0 { + return fmt.Errorf("required config values are not set at: %s", strings.Join(requiredPaths, ", ")) + } + + return nil +} + +func verifyConfigValue(path string, value any) ([]string, []string) { + var requiredPaths []string + var placeholderPaths []string + + switch typedValue := value.(type) { + case map[string]any: + for key, nestedValue := range typedValue { + nextPath := key + if path != "" { + nextPath = path + "." + key + } + nestedRequired, nestedPlaceholder := verifyConfigValue(nextPath, nestedValue) + requiredPaths = append(requiredPaths, nestedRequired...) + placeholderPaths = append(placeholderPaths, nestedPlaceholder...) + } + case []any: + for i, nestedValue := range typedValue { + nextPath := fmt.Sprintf("%s[%d]", path, i) + nestedRequired, nestedPlaceholder := verifyConfigValue(nextPath, nestedValue) + requiredPaths = append(requiredPaths, nestedRequired...) + placeholderPaths = append(placeholderPaths, nestedPlaceholder...) + } + case string: + if strings.Contains(typedValue, "") { + requiredPaths = append(requiredPaths, path) + } + + if placeholderRegex.MatchString(typedValue) { + placeholderPaths = append(placeholderPaths, path) + } + } + + return requiredPaths, placeholderPaths +} diff --git a/actions/config/defaults/smdefaults.go b/actions/config/defaults/smdefaults.go new file mode 100644 index 0000000000..ab5446f7d6 --- /dev/null +++ b/actions/config/defaults/smdefaults.go @@ -0,0 +1,228 @@ +package defaults + +import ( + "context" + "encoding/json" + "errors" + "fmt" + "regexp" + "strings" + + "github.com/aws/aws-sdk-go-v2/aws" + awsconfig "github.com/aws/aws-sdk-go-v2/config" + "github.com/aws/aws-sdk-go-v2/credentials" + "github.com/aws/aws-sdk-go-v2/service/secretsmanager" + secrettypes "github.com/aws/aws-sdk-go-v2/service/secretsmanager/types" + "github.com/rancher/shepherd/extensions/cloudcredentials" + "github.com/rancher/shepherd/extensions/defaults/providers" + "github.com/rancher/shepherd/pkg/config/operations" + "github.com/sirupsen/logrus" +) + +var awsSecretPlaceholderRegex = regexp.MustCompile(`<([^<>]+)>`) + +func LoadSecretsManagerDefaults(cattleConfig map[string]any) (map[string]any, error) { + credentialSpec := cloudcredentials.LoadCloudCredential(providers.AWS) + if credentialSpec.AmazonEC2CredentialConfig == nil || + credentialSpec.AmazonEC2CredentialConfig.DefaultRegion == "" { + logrus.Warning("Unable to load Secrets Manager defaults: AWS region is not configured in cattle config") + return cattleConfig, nil + } + + awsCredentials := *credentialSpec.AmazonEC2CredentialConfig + + output, err := operations.DeepCopyMap(cattleConfig) + if err != nil { + return nil, err + } + + ctx := context.Background() + + // Use default credential chain - this will: + // - In CI: pick up env vars set by configure-aws-credentials (assumed IAM role) + // - Locally: use ~/.aws/credentials or other configured credential sources + loadOptions := []func(*awsconfig.LoadOptions) error{ + awsconfig.WithRegion(awsCredentials.DefaultRegion), + } + + awsCfg, err := awsconfig.LoadDefaultConfig(ctx, loadOptions...) + if err != nil { + return nil, err + } + + // Try default credential chain first (CI environment, ~/.aws/credentials, IAM role, etc.) + if _, err := awsCfg.Credentials.Retrieve(ctx); err == nil { + // Successfully loaded credentials from default chain, use them + logrus.Debugf("Using AWS credentials from default chain") + } else if awsCredentials.AccessKey != "" && awsCredentials.SecretKey != "" { + // Default chain failed, fall back to static credentials from config + logrus.Debugf("Default credential chain failed, using static credentials from config") + awsCfg.Credentials = credentials.NewStaticCredentialsProvider( + awsCredentials.AccessKey, + awsCredentials.SecretKey, + "", + ) + + // Verify static credentials work + if _, err := awsCfg.Credentials.Retrieve(ctx); err != nil { + return nil, fmt.Errorf("failed to use static credentials from config: %w", err) + } + } else { + // No credentials available from any source + logrus.Warningf("Unable to load Secrets Manager defaults: AWS credentials are not available") + return cattleConfig, nil + } + + secretsClient := secretsmanager.NewFromConfig(awsCfg) + secretCache := map[string]any{} + + resolvedValue, err := resolveAWSSecretsInValue(ctx, secretsClient, output, secretCache) + if err != nil { + return nil, err + } + + resolvedConfig, ok := resolvedValue.(map[string]any) + if !ok { + return nil, fmt.Errorf("resolved cattle config is not a map") + } + + return resolvedConfig, nil +} + +func resolveAWSSecretsInValue(ctx context.Context, client *secretsmanager.Client, value any, cache map[string]any) (any, error) { + switch typedValue := value.(type) { + case map[string]any: + for key, nestedValue := range typedValue { + resolvedNestedValue, err := resolveAWSSecretsInValue(ctx, client, nestedValue, cache) + if err != nil { + return nil, err + } + + typedValue[key] = resolvedNestedValue + } + + return typedValue, nil + case []any: + resolvedList := make([]any, 0, len(typedValue)) + + for _, listValue := range typedValue { + resolvedListValue, err := resolveAWSSecretsInValue(ctx, client, listValue, cache) + if err != nil { + return nil, err + } + + // If the list element is exactly one placeholder and resolves to a list, + // expand it to avoid nesting lists (for example [""]). + if isSinglePlaceholderString(listValue) { + switch listTypedValue := resolvedListValue.(type) { + case []any: + resolvedList = append(resolvedList, listTypedValue...) + continue + case []string: + for _, value := range listTypedValue { + resolvedList = append(resolvedList, value) + } + continue + } + } + + resolvedList = append(resolvedList, resolvedListValue) + } + + return resolvedList, nil + case string: + return resolveSecretPlaceholdersInString(ctx, client, typedValue, cache) + default: + return value, nil + } +} + +func isSinglePlaceholderString(value any) bool { + typedValue, ok := value.(string) + if !ok { + return false + } + + matches := awsSecretPlaceholderRegex.FindAllStringSubmatch(typedValue, -1) + return len(matches) == 1 && typedValue == matches[0][0] +} + +func resolveSecretPlaceholdersInString(ctx context.Context, client *secretsmanager.Client, value string, cache map[string]any) (any, error) { + matches := awsSecretPlaceholderRegex.FindAllStringSubmatch(value, -1) + if len(matches) == 0 { + return value, nil + } + + // If the entire string is exactly one placeholder, return the typed value directly to preserve its type. + if len(matches) == 1 && value == matches[0][0] { + secretName := matches[0][1] + secretValue, exists, err := getSecretValueByName(ctx, client, secretName, cache) + if err != nil { + return nil, err + } + if !exists { + return value, nil + } + return secretValue, nil + } + + // Multiple or embedded placeholders: perform string substitution. + resolvedValue := value + for _, match := range matches { + if len(match) < 2 { + continue + } + + secretName := match[1] + placeholder := match[0] + + secretValue, exists, err := getSecretValueByName(ctx, client, secretName, cache) + if err != nil { + return "", err + } + + if !exists { + continue + } + + resolvedValue = strings.ReplaceAll(resolvedValue, placeholder, fmt.Sprintf("%v", secretValue)) + } + + return resolvedValue, nil +} + +func getSecretValueByName(ctx context.Context, client *secretsmanager.Client, secretName string, cache map[string]any) (any, bool, error) { + if cachedValue, ok := cache[secretName]; ok { + return cachedValue, true, nil + } + + output, err := client.GetSecretValue(ctx, &secretsmanager.GetSecretValueInput{SecretId: aws.String(secretName)}) + if err != nil { + var notFoundErr *secrettypes.ResourceNotFoundException + if errors.As(err, ¬FoundErr) { + return nil, false, nil + } + + return nil, false, err + } + + rawSecret := "" + if output.SecretString != nil { + rawSecret = *output.SecretString + } else if output.SecretBinary != nil { + rawSecret = string(output.SecretBinary) + } + + // Attempt to parse as JSON and extract the "value" key to preserve the secret's type. + var jsonValue map[string]any + if err := json.Unmarshal([]byte(rawSecret), &jsonValue); err == nil { + if v, ok := jsonValue["value"]; ok { + cache[secretName] = v + return v, true, nil + } + } + + // Not JSON or no "value" key — use plaintext as-is. + cache[secretName] = rawSecret + return rawSecret, true, nil +} diff --git a/actions/go.mod b/actions/go.mod index 929ac8de9a..f882ef5db1 100644 --- a/actions/go.mod +++ b/actions/go.mod @@ -65,10 +65,11 @@ require ( require ( github.com/aws/aws-sdk-go v1.55.8 - github.com/aws/aws-sdk-go-v2 v1.41.7 + github.com/aws/aws-sdk-go-v2 v1.42.0 github.com/aws/aws-sdk-go-v2/config v1.32.17 github.com/aws/aws-sdk-go-v2/credentials v1.19.16 github.com/aws/aws-sdk-go-v2/service/s3 v1.97.3 + github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.42.3 github.com/pkg/errors v0.9.1 github.com/rancher/norman v0.9.6 github.com/rancher/rancher v0.0.0-20260527150105-ae26ccbc3fed @@ -98,8 +99,8 @@ require ( github.com/Masterminds/semver/v3 v3.4.0 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.23 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.23 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.23 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.29 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.29 // indirect github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.24 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.9 // indirect github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.13 // indirect @@ -109,7 +110,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sso v1.30.17 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.21 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.42.1 // indirect - github.com/aws/smithy-go v1.25.1 // indirect + github.com/aws/smithy-go v1.27.1 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver/v4 v4.0.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect diff --git a/actions/go.sum b/actions/go.sum index 84ff0ed179..cef6ae354d 100644 --- a/actions/go.sum +++ b/actions/go.sum @@ -8,8 +8,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPd github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/aws/aws-sdk-go v1.55.8 h1:JRmEUbU52aJQZ2AjX4q4Wu7t4uZjOu71uyNmaWlUkJQ= github.com/aws/aws-sdk-go v1.55.8/go.mod h1:ZkViS9AqA6otK+JBBNH2++sx1sgxrPKcSzPPvQkUtXk= -github.com/aws/aws-sdk-go-v2 v1.41.7 h1:DWpAJt66FmnnaRIOT/8ASTucrvuDPZASqhhLey6tLY8= -github.com/aws/aws-sdk-go-v2 v1.41.7/go.mod h1:4LAfZOPHNVNQEckOACQx60Y8pSRjIkNZQz1w92xpMJc= +github.com/aws/aws-sdk-go-v2 v1.42.0 h1:XvXMJTkFQtpBKIWZnmr9ZEOc2InWM2yldjXEJ/bymhA= +github.com/aws/aws-sdk-go-v2 v1.42.0/go.mod h1:27+ACypSLljLAEKsCYOmrjKh83vuTRkuAe9Uv/3A4bg= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8 h1:eBMB84YGghSocM7PsjmmPffTa+1FBUeNvGvFou6V/4o= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8/go.mod h1:lyw7GFp3qENLh7kwzf7iMzAxDn+NzjXEAGjKS2UOKqI= github.com/aws/aws-sdk-go-v2/config v1.32.17 h1:FpL4/758/diKwqbytU0prpuiu60fgXKUWCpDJtApclU= @@ -18,10 +18,10 @@ github.com/aws/aws-sdk-go-v2/credentials v1.19.16 h1:r3RJBuU7X9ibt8RHbMjWE6y60Qb github.com/aws/aws-sdk-go-v2/credentials v1.19.16/go.mod h1:6cx7zqDENJDbBIIWX6P8s0h6hqHC8Avbjh9Dseo27ug= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.23 h1:UuSfcORqNSz/ey3VPRS8TcVH2Ikf0/sC+Hdj400QI6U= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.23/go.mod h1:+G/OSGiOFnSOkYloKj/9M35s74LgVAdJBSD5lsFfqKg= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.23 h1:GpT/TrnBYuE5gan2cZbTtvP+JlHsutdmlV2YfEyNde0= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.23/go.mod h1:xYWD6BS9ywC5bS3sz9Xh04whO/hzK2plt2Zkyrp4JuA= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.23 h1:bpd8vxhlQi2r1hiueOw02f/duEPTMK59Q4QMAoTTtTo= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.23/go.mod h1:15DfR2nw+CRHIk0tqNyifu3G1YdAOy68RftkhMDDwYk= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.29 h1:f3vKqSo13fhTYb+JEcXwXefZQE26I1FB5eTSniU67ko= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.29/go.mod h1:MzoLFUArKGpGD+ukmPiTPG1X5x4o6M2kq4v2dr1FiEc= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.29 h1:RdwIf/CuUsvJX3RgJagbOyotl/cxoLY4xviKuE7p2GY= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.29/go.mod h1:71wt8W2EgswdZy9Mf9KNnzxZ3TiZlv4caKghPktDOkA= github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.24 h1:OQqn11BtaYv1WLUowvcA30MpzIu8Ti4pcLPIIyoKZrA= github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.24/go.mod h1:X5ZJyfwVrWA96GzPmUCWFQaEARPR7gCrpq2E92PJwAE= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.9 h1:FLudkZLt5ci0ozzgkVo8BJGwvqNaZbTWb3UcucAateA= @@ -34,6 +34,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.21 h1:ZlvrNcHSFFWUR github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.21/go.mod h1:cv3TNhVrssKR0O/xxLJVRfd2oazSnZnkUeTf6ctUwfQ= github.com/aws/aws-sdk-go-v2/service/s3 v1.97.3 h1:HwxWTbTrIHm5qY+CAEur0s/figc3qwvLWsNkF4RPToo= github.com/aws/aws-sdk-go-v2/service/s3 v1.97.3/go.mod h1:uoA43SdFwacedBfSgfFSjjCvYe8aYBS7EnU5GZ/YKMM= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.42.3 h1:L9gPLf3sFH1/ao3oB2QZcaX1xGYi8hj+WJlsf3/dN+M= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.42.3/go.mod h1:9DKRlwDCw2OUDlyCIFcQCroL5M0mQTUU9qW8JEDcXmI= github.com/aws/aws-sdk-go-v2/service/signin v1.0.11 h1:TdJ+HdzOBhU8+iVAOGUTU63VXopcumCOF1paFulHWZc= github.com/aws/aws-sdk-go-v2/service/signin v1.0.11/go.mod h1:R82ZRExE/nheo0N+T8zHPcLRTcH8MGsnR3BiVGX0TwI= github.com/aws/aws-sdk-go-v2/service/sso v1.30.17 h1:7byT8HUWrgoRp6sXjxtZwgOKfhss5fW6SkLBtqzgRoE= @@ -42,8 +44,8 @@ github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.21 h1:+1Kl1zx6bWi4X7cKi3VYh29 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.21/go.mod h1:4vIRDq+CJB2xFAXZ+YgGUTiEft7oAQlhIs71xcSeuVg= github.com/aws/aws-sdk-go-v2/service/sts v1.42.1 h1:F/M5Y9I3nwr2IEpshZgh1GeHpOItExNM9L1euNuh/fk= github.com/aws/aws-sdk-go-v2/service/sts v1.42.1/go.mod h1:mTNxImtovCOEEuD65mKW7DCsL+2gjEH+RPEAexAzAio= -github.com/aws/smithy-go v1.25.1 h1:J8ERsGSU7d+aCmdQur5Txg6bVoYelvQJgtZehD12GkI= -github.com/aws/smithy-go v1.25.1/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc= +github.com/aws/smithy-go v1.27.1 h1:4T340VFndXtADGF52gYa1POyL7s9E4Z1OeZ1hCscIw8= +github.com/aws/smithy-go v1.27.1/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= diff --git a/go.mod b/go.mod index 25d8e59f8b..b4dec2eccc 100644 --- a/go.mod +++ b/go.mod @@ -79,7 +79,7 @@ require ( require ( github.com/Masterminds/semver/v3 v3.4.0 github.com/aws/aws-sdk-go v1.55.8 - github.com/aws/aws-sdk-go-v2 v1.41.7 // indirect + github.com/aws/aws-sdk-go-v2 v1.42.0 // indirect github.com/aws/aws-sdk-go-v2/config v1.32.17 github.com/aws/aws-sdk-go-v2/service/s3 v1.97.3 github.com/creasty/defaults v1.5.2 // indirect @@ -132,18 +132,19 @@ require ( github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8 // indirect github.com/aws/aws-sdk-go-v2/credentials v1.19.16 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.23 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.23 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.23 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.29 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.29 // indirect github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.24 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.9 // indirect github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.13 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.23 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.21 // indirect + github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.42.3 // indirect github.com/aws/aws-sdk-go-v2/service/signin v1.0.11 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.30.17 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.21 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.42.1 // indirect - github.com/aws/smithy-go v1.25.1 // indirect + github.com/aws/smithy-go v1.27.1 // indirect github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect github.com/fxamacker/cbor/v2 v2.9.0 // indirect github.com/go-openapi/swag/cmdutils v0.25.4 // indirect diff --git a/go.sum b/go.sum index 05ad63f0e5..dcd78e8848 100644 --- a/go.sum +++ b/go.sum @@ -2718,8 +2718,8 @@ github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZw github.com/aws/aws-sdk-go-v2 v1.17.5/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.25.2/go.mod h1:Evoc5AsmtveRt1komDwIsjHFyrP5tDuF1D1U+6z6pNo= github.com/aws/aws-sdk-go-v2 v1.36.3/go.mod h1:LLXuLpgzEbD766Z5ECcRmi8AzSwfZItDtmABVkRLGzg= -github.com/aws/aws-sdk-go-v2 v1.41.7 h1:DWpAJt66FmnnaRIOT/8ASTucrvuDPZASqhhLey6tLY8= -github.com/aws/aws-sdk-go-v2 v1.41.7/go.mod h1:4LAfZOPHNVNQEckOACQx60Y8pSRjIkNZQz1w92xpMJc= +github.com/aws/aws-sdk-go-v2 v1.42.0 h1:XvXMJTkFQtpBKIWZnmr9ZEOc2InWM2yldjXEJ/bymhA= +github.com/aws/aws-sdk-go-v2 v1.42.0/go.mod h1:27+ACypSLljLAEKsCYOmrjKh83vuTRkuAe9Uv/3A4bg= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8 h1:eBMB84YGghSocM7PsjmmPffTa+1FBUeNvGvFou6V/4o= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8/go.mod h1:lyw7GFp3qENLh7kwzf7iMzAxDn+NzjXEAGjKS2UOKqI= github.com/aws/aws-sdk-go-v2/config v1.18.14/go.mod h1:0pI6JQBHKwd0JnwAZS3VCapLKMO++UL2BOkWwyyzTnA= @@ -2740,13 +2740,13 @@ github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.23/go.mod h1:+G/OSGiOFnSOkYl github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.29/go.mod h1:Dip3sIGv485+xerzVv24emnjX5Sg88utCL8fwGmCeWg= github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2/go.mod h1:wRQv0nN6v9wDXuWThpovGQjqF1HFdcgWjporw14lS8k= github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34/go.mod h1:p4VfIceZokChbA9FzMbRGz5OV+lekcVtHlPKEO0gSZY= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.23 h1:GpT/TrnBYuE5gan2cZbTtvP+JlHsutdmlV2YfEyNde0= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.23/go.mod h1:xYWD6BS9ywC5bS3sz9Xh04whO/hzK2plt2Zkyrp4JuA= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.29 h1:f3vKqSo13fhTYb+JEcXwXefZQE26I1FB5eTSniU67ko= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.29/go.mod h1:MzoLFUArKGpGD+ukmPiTPG1X5x4o6M2kq4v2dr1FiEc= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.23/go.mod h1:mr6c4cHC+S/MMkrjtSlG4QA36kOznDep+0fga5L/fGQ= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2/go.mod h1:tyF5sKccmDz0Bv4NrstEr+/9YkSPJHrcO7UsUKf7pWM= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34/go.mod h1:dFZsC0BLo346mvKQLWmoJxT+Sjp+qcVR1tRVHQGOH9Q= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.23 h1:bpd8vxhlQi2r1hiueOw02f/duEPTMK59Q4QMAoTTtTo= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.23/go.mod h1:15DfR2nw+CRHIk0tqNyifu3G1YdAOy68RftkhMDDwYk= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.29 h1:RdwIf/CuUsvJX3RgJagbOyotl/cxoLY4xviKuE7p2GY= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.29/go.mod h1:71wt8W2EgswdZy9Mf9KNnzxZ3TiZlv4caKghPktDOkA= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.30/go.mod h1:vsbq62AOBwQ1LJ/GWKFxX8beUEYeRp/Agitrxee2/qM= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0/go.mod h1:8tu/lYfQfFe6IGnaOdrpVgEL2IrrDOf6/m9RQum4NkY= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo= @@ -2767,6 +2767,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.21 h1:ZlvrNcHSFFWUR github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.21/go.mod h1:cv3TNhVrssKR0O/xxLJVRfd2oazSnZnkUeTf6ctUwfQ= github.com/aws/aws-sdk-go-v2/service/s3 v1.97.3 h1:HwxWTbTrIHm5qY+CAEur0s/figc3qwvLWsNkF4RPToo= github.com/aws/aws-sdk-go-v2/service/s3 v1.97.3/go.mod h1:uoA43SdFwacedBfSgfFSjjCvYe8aYBS7EnU5GZ/YKMM= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.42.3 h1:L9gPLf3sFH1/ao3oB2QZcaX1xGYi8hj+WJlsf3/dN+M= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.42.3/go.mod h1:9DKRlwDCw2OUDlyCIFcQCroL5M0mQTUU9qW8JEDcXmI= github.com/aws/aws-sdk-go-v2/service/signin v1.0.11 h1:TdJ+HdzOBhU8+iVAOGUTU63VXopcumCOF1paFulHWZc= github.com/aws/aws-sdk-go-v2/service/signin v1.0.11/go.mod h1:R82ZRExE/nheo0N+T8zHPcLRTcH8MGsnR3BiVGX0TwI= github.com/aws/aws-sdk-go-v2/service/sso v1.12.3/go.mod h1:jtLIhd+V+lft6ktxpItycqHqiVXrPIRjWIsFIlzMriw= @@ -2788,8 +2790,8 @@ github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg= github.com/aws/smithy-go v1.22.3/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI= -github.com/aws/smithy-go v1.25.1 h1:J8ERsGSU7d+aCmdQur5Txg6bVoYelvQJgtZehD12GkI= -github.com/aws/smithy-go v1.25.1/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc= +github.com/aws/smithy-go v1.27.1 h1:4T340VFndXtADGF52gYa1POyL7s9E4Z1OeZ1hCscIw8= +github.com/aws/smithy-go v1.27.1/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc= github.com/bazelbuild/rules_go v0.49.0/go.mod h1:Dhcz716Kqg1RHNWos+N6MlXNkjNP2EwZQ0LukRKJfMs= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= diff --git a/validation/certificates/defaults/defaults.yaml b/validation/certificates/defaults/defaults.yaml index 749aeb7eae..3294e1b877 100644 --- a/validation/certificates/defaults/defaults.yaml +++ b/validation/certificates/defaults/defaults.yaml @@ -24,32 +24,34 @@ clusterConfig: worker: true quantity: 1 kubernetesVersion: "" - cni: "calico" - provider: "aws" - nodeProvider: "ec2" + cni: "" + provider: "" + nodeProvider: "" #Required for all tests awsCredentials: secretKey: "" accessKey: "" - defaultRegion: "us-east-2" + defaultRegion: "" #Required for tests that utilize node driver clusters awsMachineConfigs: - region: "us-east-2" + region: "" awsMachineConfig: - roles: ["etcd","controlplane","worker"] - ami: "" + ami: "" instanceType: "t3a.medium" - sshUser: "" - vpcId: "" + sshUser: "" + vpcId: "" retries: "5" - roles: ["windows"] - ami: "" + ami: "" instanceType: "t2.2xlarge" - sshUser: "" - vpcId: "" - volumeType: "" - zone: "a" + sshUser: "" + vpcId: "" + volumeType: "" + zone: "" retries: "5" - rootSize: "100" \ No newline at end of file + rootSize: "" +logging: + level: "" diff --git a/validation/certificates/k3s/cert_rotation_test.go b/validation/certificates/k3s/cert_rotation_test.go index 353c63935b..e338037112 100644 --- a/validation/certificates/k3s/cert_rotation_test.go +++ b/validation/certificates/k3s/cert_rotation_test.go @@ -55,6 +55,9 @@ func (c *CertRotationTestSuite) SetupSuite() { c.cattleConfig, err = defaults.LoadPackageDefaults(c.cattleConfig, "") require.NoError(c.T(), err) + + c.cattleConfig, err = defaults.LoadSecretsManagerDefaults(c.cattleConfig) + require.NoError(c.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, c.cattleConfig, loggingConfig) diff --git a/validation/certificates/rke2/cert_rotation_test.go b/validation/certificates/rke2/cert_rotation_test.go index 24c907cf16..85e7b005d3 100644 --- a/validation/certificates/rke2/cert_rotation_test.go +++ b/validation/certificates/rke2/cert_rotation_test.go @@ -55,6 +55,9 @@ func (c *CertRotationTestSuite) SetupSuite() { c.cattleConfig, err = defaults.LoadPackageDefaults(c.cattleConfig, "") require.NoError(c.T(), err) + + c.cattleConfig, err = defaults.LoadSecretsManagerDefaults(c.cattleConfig) + require.NoError(c.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, c.cattleConfig, loggingConfig) diff --git a/validation/certificates/rke2/cert_rotation_wins_test.go b/validation/certificates/rke2/cert_rotation_wins_test.go index 66d4e8af7a..268477d75e 100644 --- a/validation/certificates/rke2/cert_rotation_wins_test.go +++ b/validation/certificates/rke2/cert_rotation_wins_test.go @@ -58,6 +58,9 @@ func (c *CertRotationWindowsTestSuite) SetupSuite() { c.cattleConfig, err = defaults.LoadPackageDefaults(c.cattleConfig, "") require.NoError(c.T(), err) + + c.cattleConfig, err = defaults.LoadSecretsManagerDefaults(c.cattleConfig) + require.NoError(c.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, c.cattleConfig, loggingConfig) diff --git a/validation/deleting/defaults/defaults.yaml b/validation/deleting/defaults/defaults.yaml index 27e40920b8..dbbcc1751d 100644 --- a/validation/deleting/defaults/defaults.yaml +++ b/validation/deleting/defaults/defaults.yaml @@ -24,23 +24,25 @@ clusterConfig: worker: true quantity: 1 kubernetesVersion: "" - cni: "calico" - provider: "aws" - nodeProvider: "ec2" + cni: "" + provider: "" + nodeProvider: "" #Required for all tests awsCredentials: secretKey: "" accessKey: "" - defaultRegion: "us-east-2" + defaultRegion: "" #Required for tests that utilize node driver clusters awsMachineConfigs: - region: "us-east-2" + region: "" awsMachineConfig: - roles: ["etcd","controlplane","worker"] - ami: "" + ami: "" instanceType: "t3a.medium" - sshUser: "" - vpcId: "" - retries: "5" \ No newline at end of file + sshUser: "" + vpcId: "" + retries: "5" +logging: + level: "" diff --git a/validation/deleting/k3s/delete_cluster_test.go b/validation/deleting/k3s/delete_cluster_test.go index ac45acedaa..30aadc5beb 100644 --- a/validation/deleting/k3s/delete_cluster_test.go +++ b/validation/deleting/k3s/delete_cluster_test.go @@ -53,6 +53,9 @@ func (d *DeleteClusterTestSuite) SetupSuite() { d.cattleConfig, err = defaults.LoadPackageDefaults(d.cattleConfig, "") require.NoError(d.T(), err) + + d.cattleConfig, err = defaults.LoadSecretsManagerDefaults(d.cattleConfig) + require.NoError(d.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, d.cattleConfig, loggingConfig) diff --git a/validation/deleting/k3s/delete_init_machine_test.go b/validation/deleting/k3s/delete_init_machine_test.go index 64f3221411..483a2b4f01 100644 --- a/validation/deleting/k3s/delete_init_machine_test.go +++ b/validation/deleting/k3s/delete_init_machine_test.go @@ -55,6 +55,9 @@ func (d *DeleteInitMachineTestSuite) SetupSuite() { d.cattleConfig, err = defaults.LoadPackageDefaults(d.cattleConfig, "") require.NoError(d.T(), err) + + d.cattleConfig, err = defaults.LoadSecretsManagerDefaults(d.cattleConfig) + require.NoError(d.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, d.cattleConfig, loggingConfig) diff --git a/validation/deleting/k3s/delete_machine_test.go b/validation/deleting/k3s/delete_machine_test.go index e7fe9eb322..e815e977f7 100644 --- a/validation/deleting/k3s/delete_machine_test.go +++ b/validation/deleting/k3s/delete_machine_test.go @@ -57,6 +57,9 @@ func (d *DeleteMachineTestSuite) SetupSuite() { d.cattleConfig, err = defaults.LoadPackageDefaults(d.cattleConfig, "") require.NoError(d.T(), err) + + d.cattleConfig, err = defaults.LoadSecretsManagerDefaults(d.cattleConfig) + require.NoError(d.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, d.cattleConfig, loggingConfig) diff --git a/validation/deleting/rke2/delete_cluster_test.go b/validation/deleting/rke2/delete_cluster_test.go index 94e82f04df..1ec749b343 100644 --- a/validation/deleting/rke2/delete_cluster_test.go +++ b/validation/deleting/rke2/delete_cluster_test.go @@ -53,6 +53,9 @@ func (d *DeleteClusterTestSuite) SetupSuite() { d.cattleConfig, err = defaults.LoadPackageDefaults(d.cattleConfig, "") require.NoError(d.T(), err) + + d.cattleConfig, err = defaults.LoadSecretsManagerDefaults(d.cattleConfig) + require.NoError(d.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, d.cattleConfig, loggingConfig) diff --git a/validation/deleting/rke2/delete_init_machine_test.go b/validation/deleting/rke2/delete_init_machine_test.go index ec33651880..22cff0f976 100644 --- a/validation/deleting/rke2/delete_init_machine_test.go +++ b/validation/deleting/rke2/delete_init_machine_test.go @@ -55,6 +55,9 @@ func (d *DeleteInitMachineTestSuite) SetupSuite() { d.cattleConfig, err = defaults.LoadPackageDefaults(d.cattleConfig, "") require.NoError(d.T(), err) + + d.cattleConfig, err = defaults.LoadSecretsManagerDefaults(d.cattleConfig) + require.NoError(d.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, d.cattleConfig, loggingConfig) diff --git a/validation/deleting/rke2/delete_machine_test.go b/validation/deleting/rke2/delete_machine_test.go index e741f16826..5303a1fd73 100644 --- a/validation/deleting/rke2/delete_machine_test.go +++ b/validation/deleting/rke2/delete_machine_test.go @@ -57,6 +57,9 @@ func (d *DeleteMachineTestSuite) SetupSuite() { d.cattleConfig, err = defaults.LoadPackageDefaults(d.cattleConfig, "") require.NoError(d.T(), err) + + d.cattleConfig, err = defaults.LoadSecretsManagerDefaults(d.cattleConfig) + require.NoError(d.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, d.cattleConfig, loggingConfig) diff --git a/validation/networking/connectivity/defaults/defaults.yaml b/validation/networking/connectivity/defaults/defaults.yaml index 6bccf4af29..f29395f6aa 100644 --- a/validation/networking/connectivity/defaults/defaults.yaml +++ b/validation/networking/connectivity/defaults/defaults.yaml @@ -31,4 +31,6 @@ workloadConfigs: containers: - name: "test1" image: "ranchertest/mytestcontainer" - imagePullPolicy: "Always" \ No newline at end of file + imagePullPolicy: "Always" +logging: + level: "" diff --git a/validation/nodescaling/defaults/defaults.yaml b/validation/nodescaling/defaults/defaults.yaml index d05451682c..a18012302c 100644 --- a/validation/nodescaling/defaults/defaults.yaml +++ b/validation/nodescaling/defaults/defaults.yaml @@ -24,43 +24,44 @@ clusterConfig: worker: true quantity: 3 kubernetesVersion: "" - cni: "calico" - provider: "aws" - nodeProvider: "ec2" + cni: "" + provider: "" + nodeProvider: "" #Required for all tests awsCredentials: secretKey: "" accessKey: "" - defaultRegion: "us-east-2" + defaultRegion: "" #Required for tests that utilize node driver clusters awsMachineConfigs: - region: "us-east-2" + region: "" awsMachineConfig: - roles: ["etcd","controlplane","worker"] - ami: "" + ami: "" instanceType: "t3a.xlarge" - volumeType: "" - rootSize: "" - sshUser: "" - vpcId: "" + volumeType: "" + rootSize: "" + sshUser: "" + vpcId: "" retries: "5" - zone: "a" + zone: "" awsEC2Configs: - region: "us-east-2" - awsSecretAccessKey: "" - awsAccessKeyID: "" + region: "" + awsSecretAccessKey: "" + awsAccessKeyID: "" awsEC2Config: - instanceType: "t3a.xlarge" - awsRegionAZ: "" - awsSSHKeyName: "" - awsAMI: "" - awsSecurityGroups: [""] - awsSSHKeyName: "" - awsCICDInstanceTag: "" - awsIAMProfile: "" - awsUser: "" - volumeSize: 100 - roles: ["etcd", "controlplane", "worker"] \ No newline at end of file + awsSSHKeyName: "" + awsAMI: "" + awsSecurityGroups: [""] + awsSSHKeyName: "" + awsCICDInstanceTag: "rancher-validation" + awsIAMProfile: "" + awsUser: "" + volumeSize: "" + roles: ["etcd", "controlplane", "worker"] +logging: + level: "" diff --git a/validation/nodescaling/k3s/scaling_test.go b/validation/nodescaling/k3s/scaling_test.go index 15c5d700f6..20d38db4c7 100644 --- a/validation/nodescaling/k3s/scaling_test.go +++ b/validation/nodescaling/k3s/scaling_test.go @@ -58,6 +58,9 @@ func (s *NodeScalingTestSuite) SetupSuite() { s.cattleConfig, err = defaults.LoadPackageDefaults(s.cattleConfig, "") require.NoError(s.T(), err) + + s.cattleConfig, err = defaults.LoadSecretsManagerDefaults(s.cattleConfig) + require.NoError(s.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, s.cattleConfig, loggingConfig) diff --git a/validation/nodescaling/rke2/scaling_test.go b/validation/nodescaling/rke2/scaling_test.go index 58c1ca98e2..ff7754fb2f 100644 --- a/validation/nodescaling/rke2/scaling_test.go +++ b/validation/nodescaling/rke2/scaling_test.go @@ -59,6 +59,9 @@ func (s *NodeScalingTestSuite) SetupSuite() { s.cattleConfig, err = defaults.LoadPackageDefaults(s.cattleConfig, "") require.NoError(s.T(), err) + + s.cattleConfig, err = defaults.LoadSecretsManagerDefaults(s.cattleConfig) + require.NoError(s.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, s.cattleConfig, loggingConfig) diff --git a/validation/prime/autoscaling/defaults/defaults.yaml b/validation/prime/autoscaling/defaults/defaults.yaml index f0d3d5477b..4ef7edc42b 100644 --- a/validation/prime/autoscaling/defaults/defaults.yaml +++ b/validation/prime/autoscaling/defaults/defaults.yaml @@ -1,15 +1,15 @@ #Required for all tests that provision clusters clusterConfig: kubernetesVersion: "" - cni: "calico" - provider: "aws" - nodeProvider: "ec2" + cni: "" + provider: "" + nodeProvider: "" #Required for all tests awsCredentials: secretKey: "" accessKey: "" - defaultRegion: "us-east-2" + defaultRegion: "" #Required for tests that utilize node driver clusters awsMachineConfigs: @@ -23,4 +23,6 @@ awsMachineConfigs: sshUser: "" vpcId: "" retries: "5" - zone: "a" \ No newline at end of file + zone: "" +logging: + level: "" diff --git a/validation/prime/defaults/defaults.yaml b/validation/prime/defaults/defaults.yaml index 808fabd741..29406b2619 100644 --- a/validation/prime/defaults/defaults.yaml +++ b/validation/prime/defaults/defaults.yaml @@ -9,4 +9,6 @@ prime: brand: "" isPrime: true rancherVersion: "" - registry: "" \ No newline at end of file + registry: "" +logging: + level: "" diff --git a/validation/provisioning/airgap/airgap_setup.go b/validation/provisioning/airgap/airgap_setup.go index a8e5b1a3b1..960876f312 100644 --- a/validation/provisioning/airgap/airgap_setup.go +++ b/validation/provisioning/airgap/airgap_setup.go @@ -67,6 +67,9 @@ func airgapSetup(t *testing.T, clusterType string) airgapTest { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/airgap/defaults/defaults.yaml b/validation/provisioning/airgap/defaults/defaults.yaml index d961969d71..05dc481144 100644 --- a/validation/provisioning/airgap/defaults/defaults.yaml +++ b/validation/provisioning/airgap/defaults/defaults.yaml @@ -8,58 +8,65 @@ rancher: #Required for all tests clusterConfig: machinePools: - - machinePoolConfig: - etcd: true - controlplane: false - worker: false - quantity: 3 - - machinePoolConfig: - etcd: false - controlplane: true - worker: false - quantity: 2 - - machinePoolConfig: - etcd: false - controlplane: false - worker: true - quantity: 3 + - machinePoolConfig: + etcd: true + controlplane: false + worker: false + quantity: 3 + - machinePoolConfig: + etcd: false + controlplane: true + worker: false + quantity: 2 + - machinePoolConfig: + etcd: false + controlplane: false + worker: true + quantity: 3 kubernetesVersion: "" - cni: "calico" - provider: "aws" - nodeProvider: "ec2" + cni: "" + provider: "" + nodeProvider: "" registries: rke2Registries: configs: : +#Required for all tests +awsCredentials: + secretKey: "" + accessKey: "" + defaultRegion: "" + #Required for tests that utilize custom clusters awsEC2Configs: - region: "us-east-2" - awsSecretAccessKey: "" - awsAccessKeyID: "" + region: "" + awsSecretAccessKey: "" + awsAccessKeyID: "" awsEC2Config: - instanceType: "t3a.medium" - awsRegionAZ: "" - awsSSHKeyName: "" - awsAMI: "" - awsSecurityGroups: [""] - awsSSHKeyName: "" - awsCICDInstanceTag: "" - awsIAMProfile: "" - awsUser: "" - volumeSize: 100 + awsSSHKeyName: "" + awsAMI: "" + awsSecurityGroups: [""] + awsSSHKeyName: "" + awsCICDInstanceTag: "rancher-validation" + awsIAMProfile: "" + awsUser: "" + volumeSize: "" roles: ["etcd", "controlplane", "worker"] - instanceType: "t2.2xlarge" - awsRegionAZ: "" - awsSSHKeyName: "" - awsAMI: "" - awsSecurityGroups: [""] - awsSSHKeyName: "" - awsCICDInstanceTag: "" - awsIAMProfile: "" - awsUser: "" - volumeSize: 100 + awsSSHKeyName: "" + awsAMI: "" + awsSecurityGroups: [""] + awsSSHKeyName: "" + awsCICDInstanceTag: "rancher-validation" + awsIAMProfile: "" + awsUser: "" + volumeSize: "" roles: ["windows"] terraform: - airgapBastion: "" \ No newline at end of file + airgapBastion: "" + +logging: + level: "" diff --git a/validation/provisioning/defaults/defaults.yaml b/validation/provisioning/defaults/defaults.yaml index 6198a75a0b..5dfb48ecb5 100644 --- a/validation/provisioning/defaults/defaults.yaml +++ b/validation/provisioning/defaults/defaults.yaml @@ -24,114 +24,112 @@ clusterConfig: worker: true quantity: 1 kubernetesVersion: "" - cni: "calico" - provider: "aws" - nodeProvider: "ec2" - hardened: false - compliance: false - psact: "" + cni: "" + provider: "" + nodeProvider: "" #Required for all tests except template awsCredentials: secretKey: "" accessKey: "" - defaultRegion: "us-east-2" + defaultRegion: "" #Required for tests that utilize node driver clusters awsMachineConfigs: - region: "us-east-2" + region: "" awsMachineConfig: - roles: ["etcd","controlplane","worker"] - ami: "" + iamInstanceProfile: "" + ami: "" instanceType: "t3a.medium" - volumeType: "" - rootSize: "" - sshUser: "" - vpcId: "" - zone: "a" + volumeType: "" + rootSize: "" + sshUser: "" + subnetId: "" + vpcId: "" + zone: "" retries: "5" - roles: ["windows"] - ami: "" + iamInstanceProfile: "" + ami: "" instanceType: "t2.2xlarge" - sshUser: "" - vpcId: "" - volumeType: "" - zone: "a" + sshUser: "" + subnetId: "" + vpcId: "" + volumeType: "" + zone: "" retries: "5" - rootSize: "100" + rootSize: "" #terraform and terratest variables required for custom cluster provisioning terraform: - provider: "aws" - cni: "calico" + provider: "" + cni: "" downstreamClusterProvider: "aws" - defaultClusterRoleForProjectMembers: "true" - enableNetworkPolicy: false - resourcePrefix: "auto-prov" + defaultClusterRoleForProjectMembers: "" + resourcePrefix: "" module: "" - privateKeyPath: "" + privateKeyPath: "" awsCredentials: - awsAccessKey: "" - awsSecretKey: "" + awsAccessKey: "" + awsSecretKey: "" awsConfig: - ami: "" - awsKeyName: "" + ami: "" + awsKeyName: "" awsVolumeType: "gp3" - region: "us-east-2" - awsSecurityGroups: ["", ""] - awsSecurityGroupNames: ["", ""] - awsSubnetID: "" - awsVpcID: "" + region: "" + awsSecurityGroups: [""] + awsSecurityGroupNames: [""] + awsSubnetID: "" + awsVpcID: "" awsInstanceType: "t3a.medium" awsZoneLetter: "a" awsRootSize: 100 - awsRoute53Zone: "" - awsUser: "ubuntu" - ipAddressType: "ipv4" - loadBalancerType: "ipv4" - targetType: "instance" - sshConnectionType: "ssh" - timeout: "5m" + awsRoute53Zone: "" + awsUser: "" + ipAddressType: "" + loadBalancerType: "" + targetType: "" + sshConnectionType: "" + timeout: "" terratest: kubernetesVersion: "" -#Required for hardened +#Required for custom cluster provisioning awsEC2Configs: - region: "us-east-2" - awsSecretAccessKey: "" - awsAccessKeyID: "" + region: "" + awsSecretAccessKey: "" + awsAccessKeyID: "" awsEC2Config: - instanceType: "t3a.medium" - awsRegionAZ: "" - awsAMI: "" - awsSecurityGroups: [""] - awsSSHKeyName: "" - awsCICDInstanceTag: "" - awsIAMProfile: "" - awsUser: "" - volumeSize: 100 + awsAMI: "" + awsSecurityGroups: [""] + awsSSHKeyName: "" + awsCICDInstanceTag: "" + awsIAMProfile: "" + awsUser: "" + volumeSize: "" roles: ["etcd", "controlplane", "worker"] - instanceType: "t2.2xlarge" - awsRegionAZ: "" - awsAMI: "" - awsSecurityGroups: [""] - awsSSHKeyName: "" - awsCICDInstanceTag: "" - awsIAMProfile: "" - awsUser: "" - volumeSize: 100 + awsAMI: "" + awsSecurityGroups: [""] + awsSSHKeyName: "" + awsCICDInstanceTag: "" + awsIAMProfile: "" + awsUser: "" + volumeSize: "" roles: ["windows"] #Required for tests that utilize custom clusters sshPath: - sshPath: "" + sshPath: "" logging: - level: "info" + level: "" workloadConfigs: deployment: @@ -221,4 +219,4 @@ workloadConfigs: spec: containers: - name: "teststatefulset" - image: "nginx:latest" \ No newline at end of file + image: "nginx:latest" diff --git a/validation/provisioning/dualstack/defaults/defaults.yaml b/validation/provisioning/dualstack/defaults/defaults.yaml index 6f35764e74..f8fd1b4902 100644 --- a/validation/provisioning/dualstack/defaults/defaults.yaml +++ b/validation/provisioning/dualstack/defaults/defaults.yaml @@ -22,4 +22,6 @@ terraform: httpProtocolIpv6: "enabled" ipv6AddressCount: "1" networking: - stackPreference: "" \ No newline at end of file + stackPreference: "" +logging: + level: "" diff --git a/validation/provisioning/dualstack/k3s_custom_test.go b/validation/provisioning/dualstack/k3s_custom_test.go index 9cedf6a39c..4fabf2c765 100644 --- a/validation/provisioning/dualstack/k3s_custom_test.go +++ b/validation/provisioning/dualstack/k3s_custom_test.go @@ -46,6 +46,9 @@ func customK3SDualstackSetup(t *testing.T) customK3SDualstackTest { k.cattleConfig, err = defaults.LoadPackageDefaults(k.cattleConfig, "") require.NoError(t, err) + + k.cattleConfig, err = defaults.LoadSecretsManagerDefaults(k.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, k.cattleConfig, loggingConfig) diff --git a/validation/provisioning/dualstack/k3s_node_driver_test.go b/validation/provisioning/dualstack/k3s_node_driver_test.go index b8437f6d88..de36fe2545 100644 --- a/validation/provisioning/dualstack/k3s_node_driver_test.go +++ b/validation/provisioning/dualstack/k3s_node_driver_test.go @@ -45,6 +45,9 @@ func nodeDriverK3SSetup(t *testing.T) nodeDriverK3STest { k.cattleConfig, err = defaults.LoadPackageDefaults(k.cattleConfig, "") require.NoError(t, err) + + k.cattleConfig, err = defaults.LoadSecretsManagerDefaults(k.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, k.cattleConfig, loggingConfig) diff --git a/validation/provisioning/dualstack/rke2_custom_test.go b/validation/provisioning/dualstack/rke2_custom_test.go index c29c0a679f..157ade9fc5 100644 --- a/validation/provisioning/dualstack/rke2_custom_test.go +++ b/validation/provisioning/dualstack/rke2_custom_test.go @@ -46,6 +46,9 @@ func customRKE2DualstackSetup(t *testing.T) customRKE2DualstackTest { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/dualstack/rke2_node_driver_test.go b/validation/provisioning/dualstack/rke2_node_driver_test.go index 57d58dac63..4e0646c6ed 100644 --- a/validation/provisioning/dualstack/rke2_node_driver_test.go +++ b/validation/provisioning/dualstack/rke2_node_driver_test.go @@ -45,6 +45,9 @@ func nodeDriverRKE2Setup(t *testing.T) nodeDriverRKE2Test { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/ipv6/defaults/defaults.yaml b/validation/provisioning/ipv6/defaults/defaults.yaml index cb29afc213..082acc85d4 100644 --- a/validation/provisioning/ipv6/defaults/defaults.yaml +++ b/validation/provisioning/ipv6/defaults/defaults.yaml @@ -24,4 +24,6 @@ terraform: ipv6AddressOnly: true ipv6AddressCount: "1" networking: - stackPreference: "" \ No newline at end of file + stackPreference: "" +logging: + level: "" diff --git a/validation/provisioning/ipv6/k3s_custom_test.go b/validation/provisioning/ipv6/k3s_custom_test.go index 36bf5a9278..ad182af210 100644 --- a/validation/provisioning/ipv6/k3s_custom_test.go +++ b/validation/provisioning/ipv6/k3s_custom_test.go @@ -46,6 +46,9 @@ func customK3SIPv6Setup(t *testing.T) customK3SIPv6Test { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/ipv6/k3s_node_driver_test.go b/validation/provisioning/ipv6/k3s_node_driver_test.go index 77b77c513f..e4e4252aaa 100644 --- a/validation/provisioning/ipv6/k3s_node_driver_test.go +++ b/validation/provisioning/ipv6/k3s_node_driver_test.go @@ -45,6 +45,9 @@ func nodeDriverK3SIPv6Setup(t *testing.T) nodeDriverK3SIPv6Test { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/ipv6/rke2_custom_test.go b/validation/provisioning/ipv6/rke2_custom_test.go index eace0192f1..91c1891b43 100644 --- a/validation/provisioning/ipv6/rke2_custom_test.go +++ b/validation/provisioning/ipv6/rke2_custom_test.go @@ -46,6 +46,9 @@ func customRKE2IPv6Setup(t *testing.T) customRKE2IPv6Test { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/ipv6/rke2_node_driver_test.go b/validation/provisioning/ipv6/rke2_node_driver_test.go index 9640afa9a4..de7e5f7f24 100644 --- a/validation/provisioning/ipv6/rke2_node_driver_test.go +++ b/validation/provisioning/ipv6/rke2_node_driver_test.go @@ -45,6 +45,9 @@ func nodeDriverRKE2IPv6Setup(t *testing.T) nodeDriverRKE2IPv6Test { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/k3s/ace_test.go b/validation/provisioning/k3s/ace_test.go index d0ede6528a..73f91d0921 100644 --- a/validation/provisioning/k3s/ace_test.go +++ b/validation/provisioning/k3s/ace_test.go @@ -48,6 +48,9 @@ func aceSetup(t *testing.T) aceTest { k.cattleConfig = config.LoadConfigFromFile(os.Getenv(config.ConfigEnvironmentKey)) k.cattleConfig, err = defaults.LoadPackageDefaults(k.cattleConfig, "") require.NoError(t, err) + + k.cattleConfig, err = defaults.LoadSecretsManagerDefaults(k.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, k.cattleConfig, loggingConfig) diff --git a/validation/provisioning/k3s/custom_test.go b/validation/provisioning/k3s/custom_test.go index f41b07c75c..62a220f266 100644 --- a/validation/provisioning/k3s/custom_test.go +++ b/validation/provisioning/k3s/custom_test.go @@ -46,6 +46,9 @@ func customSetup(t *testing.T) customTest { k.cattleConfig, err = defaults.LoadPackageDefaults(k.cattleConfig, "") require.NoError(t, err) + + k.cattleConfig, err = defaults.LoadSecretsManagerDefaults(k.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, k.cattleConfig, loggingConfig) diff --git a/validation/provisioning/k3s/data_directories_test.go b/validation/provisioning/k3s/data_directories_test.go index 1886e409fa..a8b365f3d7 100644 --- a/validation/provisioning/k3s/data_directories_test.go +++ b/validation/provisioning/k3s/data_directories_test.go @@ -45,6 +45,9 @@ func dataDirectoriesSetup(t *testing.T) dataDirectoriesTest { k.cattleConfig, err = defaults.LoadPackageDefaults(k.cattleConfig, "") require.NoError(t, err) + + k.cattleConfig, err = defaults.LoadSecretsManagerDefaults(k.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, k.cattleConfig, loggingConfig) diff --git a/validation/provisioning/k3s/defaults/defaults.yaml b/validation/provisioning/k3s/defaults/defaults.yaml index 9221b888ea..7b365178ce 100644 --- a/validation/provisioning/k3s/defaults/defaults.yaml +++ b/validation/provisioning/k3s/defaults/defaults.yaml @@ -4,8 +4,8 @@ templateTest: metadata: name: "test" spec: - gitRepo: "" - gitBranch: "" + gitRepo: "" + gitBranch: "main" insecureSkipTLSVerify: true - templateProvider: "aws" - templateName: "" \ No newline at end of file + templateProvider: "" + templateName: "k3s-clusterTemplate1" diff --git a/validation/provisioning/k3s/hardened_test.go b/validation/provisioning/k3s/hardened_test.go index 5165a098a0..6904a65d8c 100644 --- a/validation/provisioning/k3s/hardened_test.go +++ b/validation/provisioning/k3s/hardened_test.go @@ -50,6 +50,9 @@ func hardenedSetup(t *testing.T) hardenedTest { k.cattleConfig, err = defaults.LoadPackageDefaults(k.cattleConfig, "") require.NoError(t, err) + + k.cattleConfig, err = defaults.LoadSecretsManagerDefaults(k.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, k.cattleConfig, loggingConfig) diff --git a/validation/provisioning/k3s/hostname_truncation_test.go b/validation/provisioning/k3s/hostname_truncation_test.go index 9b084b5ee9..18aafe06f9 100644 --- a/validation/provisioning/k3s/hostname_truncation_test.go +++ b/validation/provisioning/k3s/hostname_truncation_test.go @@ -45,6 +45,9 @@ func hostnameTruncationSetup(t *testing.T) hostnameTruncationTest { k.cattleConfig, err = defaults.LoadPackageDefaults(k.cattleConfig, "") require.NoError(t, err) + + k.cattleConfig, err = defaults.LoadSecretsManagerDefaults(k.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, k.cattleConfig, loggingConfig) diff --git a/validation/provisioning/k3s/node_driver_test.go b/validation/provisioning/k3s/node_driver_test.go index 0032f56884..9f4aa167cf 100644 --- a/validation/provisioning/k3s/node_driver_test.go +++ b/validation/provisioning/k3s/node_driver_test.go @@ -45,6 +45,9 @@ func nodeDriverSetup(t *testing.T) nodeDriverTest { k.cattleConfig, err = defaults.LoadPackageDefaults(k.cattleConfig, "") require.NoError(t, err) + k.cattleConfig, err = defaults.LoadSecretsManagerDefaults(k.cattleConfig) + require.NoError(t, err) + loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, k.cattleConfig, loggingConfig) diff --git a/validation/provisioning/k3s/psact_test.go b/validation/provisioning/k3s/psact_test.go index 3db3524163..bb4dac25de 100644 --- a/validation/provisioning/k3s/psact_test.go +++ b/validation/provisioning/k3s/psact_test.go @@ -45,6 +45,9 @@ func psactSetup(t *testing.T) psactTest { k.cattleConfig, err = defaults.LoadPackageDefaults(k.cattleConfig, "") require.NoError(t, err) + + k.cattleConfig, err = defaults.LoadSecretsManagerDefaults(k.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, k.cattleConfig, loggingConfig) diff --git a/validation/provisioning/k3s/template_test.go b/validation/provisioning/k3s/template_test.go index 8e6cd2e91a..c7885e7b3f 100644 --- a/validation/provisioning/k3s/template_test.go +++ b/validation/provisioning/k3s/template_test.go @@ -60,6 +60,9 @@ func templateSetup(t *testing.T) templateTest { k.cattleConfig, err = configDefaults.LoadPackageDefaults(k.cattleConfig, "") require.NoError(t, err) + + k.cattleConfig, err = configDefaults.LoadSecretsManagerDefaults(k.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, k.cattleConfig, loggingConfig) diff --git a/validation/provisioning/proxy/defaults/defaults.yaml b/validation/provisioning/proxy/defaults/defaults.yaml index 21897ae99e..8014758a4a 100644 --- a/validation/provisioning/proxy/defaults/defaults.yaml +++ b/validation/provisioning/proxy/defaults/defaults.yaml @@ -24,68 +24,68 @@ clusterConfig: worker: true quantity: 3 kubernetesVersion: "" - cni: "calico" - provider: "aws" - nodeProvider: "ec2" + cni: "" + provider: "" + nodeProvider: "" #Required for all tests awsCredentials: secretKey: "" accessKey: "" - defaultRegion: "us-east-2" + defaultRegion: "" #Required for tests that utilize node driver clusters awsMachineConfigs: - region: "us-east-2" + region: "" awsMachineConfig: - roles: ["etcd","controlplane","worker"] - ami: "" - instanceType: "t3a.xlarge" - volumeType: "" - rootSize: "" - sshUser: "" - vpcId: "" + ami: "" + instanceType: "t3a.medium" + volumeType: "" + rootSize: "" + sshUser: "" + vpcId: "" retries: "5" - zone: "a" + zone: "" - roles: ["windows"] - ami: "" + ami: "" instanceType: "t2.2xlarge" - sshUser: "" - vpcId: "" - volumeType: "" - zone: "a" + sshUser: "" + vpcId: "" + volumeType: "" + zone: "" retries: "5" - rootSize: "100" + rootSize: "" #Required for tests that utilize custom clusters awsEC2Configs: - region: "us-east-2" - awsSecretAccessKey: "" - awsAccessKeyID: "" + region: "" + awsSecretAccessKey: "" + awsAccessKeyID: "" awsEC2Config: - instanceType: "t3a.medium" - awsRegionAZ: "" - awsSSHKeyName: "" - awsAMI: "" - awsSecurityGroups: [""] - awsSSHKeyName: "" - awsCICDInstanceTag: "" - awsIAMProfile: "" - awsUser: "" - volumeSize: 100 + awsSSHKeyName: "" + awsAMI: "" + awsSecurityGroups: [""] + awsSSHKeyName: "" + awsCICDInstanceTag: "" + awsIAMProfile: "" + awsUser: "" + volumeSize: "" roles: ["etcd", "controlplane", "worker"] - instanceType: "t2.2xlarge" - awsRegionAZ: "" - awsSSHKeyName: "" - awsAMI: "" - awsSecurityGroups: [""] - awsSSHKeyName: "" - awsCICDInstanceTag: "" - awsIAMProfile: "" - awsUser: "" - volumeSize: 100 + awsSSHKeyName: "" + awsAMI: "" + awsSecurityGroups: [""] + awsSSHKeyName: "" + awsCICDInstanceTag: "" + awsIAMProfile: "" + awsUser: "" + volumeSize: "" roles: ["windows"] terraform: proxy: - proxyBastion: "" \ No newline at end of file + proxyBastion: "" +logging: + level: "" diff --git a/validation/provisioning/proxy/k3s_custom_test.go b/validation/provisioning/proxy/k3s_custom_test.go index ab29d445ec..67241d2c9b 100644 --- a/validation/provisioning/proxy/k3s_custom_test.go +++ b/validation/provisioning/proxy/k3s_custom_test.go @@ -49,6 +49,9 @@ func customK3SProxySetup(t *testing.T) customK3SProxyTest { k.cattleConfig, err = defaults.LoadPackageDefaults(k.cattleConfig, "") require.NoError(t, err) + + k.cattleConfig, err = defaults.LoadSecretsManagerDefaults(k.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, k.cattleConfig, loggingConfig) diff --git a/validation/provisioning/proxy/k3s_proxy_node_driver_test.go b/validation/provisioning/proxy/k3s_proxy_node_driver_test.go index 002db058e0..324769a319 100644 --- a/validation/provisioning/proxy/k3s_proxy_node_driver_test.go +++ b/validation/provisioning/proxy/k3s_proxy_node_driver_test.go @@ -48,6 +48,9 @@ func nodeDriverK3SProxySetup(t *testing.T) nodeDriverK3SProxyTest { k.cattleConfig, err = defaults.LoadPackageDefaults(k.cattleConfig, "") require.NoError(t, err) + + k.cattleConfig, err = defaults.LoadSecretsManagerDefaults(k.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, k.cattleConfig, loggingConfig) diff --git a/validation/provisioning/proxy/rke2_custom_test.go b/validation/provisioning/proxy/rke2_custom_test.go index 42b96c4851..635d43fa95 100644 --- a/validation/provisioning/proxy/rke2_custom_test.go +++ b/validation/provisioning/proxy/rke2_custom_test.go @@ -49,6 +49,9 @@ func customRKE2ProxySetup(t *testing.T) customRKE2ProxyTest { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/proxy/rke2_proxy_node_driver_test.go b/validation/provisioning/proxy/rke2_proxy_node_driver_test.go index 1bd4e24f90..444b333b7b 100644 --- a/validation/provisioning/proxy/rke2_proxy_node_driver_test.go +++ b/validation/provisioning/proxy/rke2_proxy_node_driver_test.go @@ -48,6 +48,9 @@ func nodeDriverRKE2ProxySetup(t *testing.T) nodeDriverRKE2ProxyTest { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/registries/defaults/defaults.yaml b/validation/provisioning/registries/defaults/defaults.yaml index c7ec8c6082..ea1dad232c 100644 --- a/validation/provisioning/registries/defaults/defaults.yaml +++ b/validation/provisioning/registries/defaults/defaults.yaml @@ -24,76 +24,81 @@ clusterConfig: worker: true quantity: 3 kubernetesVersion: "" - cni: "calico" - provider: "aws" - nodeProvider: "ec2" + cni: "" + provider: "" + nodeProvider: "" registries: - rke2Username: "" - rke2Password: "" + rke2Username: "" + rke2Password: "" rke2Registries: configs: : + advanced: + machineSelectors: + - config: + data: + system-default-registry: "" #Required for all tests awsCredentials: secretKey: "" accessKey: "" - defaultRegion: "us-east-2" + defaultRegion: "" #Required for tests that utilize node driver clusters awsMachineConfigs: - region: "us-east-2" + region: "" awsMachineConfig: - roles: ["etcd","controlplane","worker"] - ami: "" - instanceType: "t3a.xlarge" - volumeType: "" - rootSize: "" - sshUser: "" - vpcId: "" + ami: "" + instanceType: "t3a.medium" + volumeType: "" + rootSize: "" + sshUser: "" + vpcId: "" retries: "5" - zone: "a" + zone: "" - roles: ["windows"] - ami: "" + ami: "" instanceType: "t2.2xlarge" - sshUser: "" - vpcId: "" - volumeType: "" - zone: "a" + sshUser: "" + vpcId: "" + volumeType: "" + zone: "" retries: "5" - rootSize: "100" + rootSize: "" #Required for tests that utilize custom clusters awsEC2Configs: - region: "us-east-2" - awsSecretAccessKey: "" - awsAccessKeyID: "" + region: "" + awsSecretAccessKey: "" + awsAccessKeyID: "" awsEC2Config: - instanceType: "t3a.medium" - awsRegionAZ: "" - awsSSHKeyName: "" - awsAMI: "" - awsSecurityGroups: [""] - awsSSHKeyName: "" - awsCICDInstanceTag: "" - awsIAMProfile: "" - awsUser: "" - volumeSize: 100 + awsSSHKeyName: "" + awsAMI: "" + awsSecurityGroups: [""] + awsSSHKeyName: "" + awsCICDInstanceTag: "" + awsIAMProfile: "" + awsUser: "" + volumeSize: "" roles: ["etcd", "controlplane", "worker"] - instanceType: "t2.2xlarge" - awsRegionAZ: "" - awsSSHKeyName: "" - awsAMI: "" - awsSecurityGroups: [""] - awsSSHKeyName: "" - awsCICDInstanceTag: "" - awsIAMProfile: "" - awsUser: "" - volumeSize: 100 + awsSSHKeyName: "" + awsAMI: "" + awsSecurityGroups: [""] + awsSSHKeyName: "" + awsCICDInstanceTag: "" + awsIAMProfile: "" + awsUser: "" + volumeSize: "" roles: ["windows"] terraform: standaloneRegistry: authRegistryFQDN: "" globalRegistryFQDN: "" - nonAuthRegistryFQDN: "" \ No newline at end of file + nonAuthRegistryFQDN: "" +logging: + level: "" diff --git a/validation/provisioning/registries/registries_setup.go b/validation/provisioning/registries/registries_setup.go index 9c4bce1a3b..9b6c14bddc 100644 --- a/validation/provisioning/registries/registries_setup.go +++ b/validation/provisioning/registries/registries_setup.go @@ -59,6 +59,9 @@ func registriesSetup(t *testing.T) registriesTest { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/rke2/ace_test.go b/validation/provisioning/rke2/ace_test.go index cbab3ee983..ae834760ce 100644 --- a/validation/provisioning/rke2/ace_test.go +++ b/validation/provisioning/rke2/ace_test.go @@ -48,6 +48,9 @@ func aceSetup(t *testing.T) aceTest { r.cattleConfig = config.LoadConfigFromFile(os.Getenv(config.ConfigEnvironmentKey)) r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/rke2/agent_customization_test.go b/validation/provisioning/rke2/agent_customization_test.go index 72e65f19b7..28d3f9de14 100644 --- a/validation/provisioning/rke2/agent_customization_test.go +++ b/validation/provisioning/rke2/agent_customization_test.go @@ -45,6 +45,9 @@ func agentCustomizationSetup(t *testing.T) agentCustomizationTest { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/rke2/cloud_provider_test.go b/validation/provisioning/rke2/cloud_provider_test.go index 489772edd6..4c97708dd4 100644 --- a/validation/provisioning/rke2/cloud_provider_test.go +++ b/validation/provisioning/rke2/cloud_provider_test.go @@ -47,6 +47,9 @@ func cloudProviderSetup(t *testing.T) cloudProviderTest { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/rke2/cni_test.go b/validation/provisioning/rke2/cni_test.go index b86440bda1..632b134f8a 100644 --- a/validation/provisioning/rke2/cni_test.go +++ b/validation/provisioning/rke2/cni_test.go @@ -44,6 +44,9 @@ func cniSetup(t *testing.T) cniTest { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/rke2/custom_test.go b/validation/provisioning/rke2/custom_test.go index b0b55d0ea2..8a9060b3e4 100644 --- a/validation/provisioning/rke2/custom_test.go +++ b/validation/provisioning/rke2/custom_test.go @@ -46,6 +46,9 @@ func customSetup(t *testing.T) customTest { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/rke2/data_directories_test.go b/validation/provisioning/rke2/data_directories_test.go index 1087ee8aa9..16c2842a1c 100644 --- a/validation/provisioning/rke2/data_directories_test.go +++ b/validation/provisioning/rke2/data_directories_test.go @@ -45,6 +45,9 @@ func dataDirectoriesSetup(t *testing.T) dataDirectoriesTest { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/rke2/defaults/defaults.yaml b/validation/provisioning/rke2/defaults/defaults.yaml index 9221b888ea..dc2fe531b9 100644 --- a/validation/provisioning/rke2/defaults/defaults.yaml +++ b/validation/provisioning/rke2/defaults/defaults.yaml @@ -4,8 +4,8 @@ templateTest: metadata: name: "test" spec: - gitRepo: "" - gitBranch: "" + gitRepo: "" + gitBranch: "main" insecureSkipTLSVerify: true - templateProvider: "aws" - templateName: "" \ No newline at end of file + templateProvider: "" + templateName: "rke2-clusterTemplate1" diff --git a/validation/provisioning/rke2/hardened_test.go b/validation/provisioning/rke2/hardened_test.go index f5a4e2806a..ec4ca38663 100644 --- a/validation/provisioning/rke2/hardened_test.go +++ b/validation/provisioning/rke2/hardened_test.go @@ -50,6 +50,9 @@ func hardenedSetup(t *testing.T) hardenedTest { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/rke2/hostname_truncation_test.go b/validation/provisioning/rke2/hostname_truncation_test.go index 5871187bbd..68e7db77ed 100644 --- a/validation/provisioning/rke2/hostname_truncation_test.go +++ b/validation/provisioning/rke2/hostname_truncation_test.go @@ -45,6 +45,10 @@ func hostnameTruncationSetup(t *testing.T) hostnameTruncationTest { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) + loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/rke2/ingress_test.go b/validation/provisioning/rke2/ingress_test.go index dad4a01d7a..8617b24dc9 100644 --- a/validation/provisioning/rke2/ingress_test.go +++ b/validation/provisioning/rke2/ingress_test.go @@ -46,6 +46,9 @@ func ingressSetup(t *testing.T) ingressTest { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/rke2/node_driver_test.go b/validation/provisioning/rke2/node_driver_test.go index 0c783fe882..79030d19a5 100644 --- a/validation/provisioning/rke2/node_driver_test.go +++ b/validation/provisioning/rke2/node_driver_test.go @@ -45,6 +45,9 @@ func nodeDriverSetup(t *testing.T) nodeDriverTest { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) + loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/rke2/psact_test.go b/validation/provisioning/rke2/psact_test.go index fc1c1d6359..647a48b37e 100644 --- a/validation/provisioning/rke2/psact_test.go +++ b/validation/provisioning/rke2/psact_test.go @@ -48,6 +48,9 @@ func psactSetup(t *testing.T) psactTest { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/rke2/template_test.go b/validation/provisioning/rke2/template_test.go index 3c7d8c9955..b78fac81ff 100644 --- a/validation/provisioning/rke2/template_test.go +++ b/validation/provisioning/rke2/template_test.go @@ -60,6 +60,9 @@ func templateSetup(t *testing.T) templateTest { r.cattleConfig, err = configDefaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = configDefaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/recurring/infrastructure/setuprancher/airgap/defaults/defaults.yaml b/validation/recurring/infrastructure/setuprancher/airgap/defaults/defaults.yaml index 41cc731f19..ecacc83cbe 100644 --- a/validation/recurring/infrastructure/setuprancher/airgap/defaults/defaults.yaml +++ b/validation/recurring/infrastructure/setuprancher/airgap/defaults/defaults.yaml @@ -5,17 +5,18 @@ rancher: cleanup: true awsCredentials: - awsAccessKey: "" - awsSecretKey: "" + accessKey: "" + secretKey: "" + defaultRegion: "" terraform: awsCredentials: - awsAccessKey: "" - awsSecretKey: "" + awsAccessKey: "" + awsSecretKey: "" cni: "" - defaultClusterRoleForProjectMembers: "true" - enableNetworkPolicy: false - provider: "" + localCluster: "rke2" + defaultClusterRoleForProjectMembers: "" + provider: "" privateKeyPath: "" resourcePrefix: "" privateRegistries: @@ -35,9 +36,9 @@ terraform: awsRootSize: "" registryRootSize: "" awsRoute53Zone: "" - awsUser: "" + awsUser: "" sshConnectionType: "" - timeout: "" + timeout: "" ipAddressType: "" loadBalancerType: "" targetType: "" @@ -46,8 +47,8 @@ terraform: certManagerVersion: "" certType: "" chartVersion: "" - osUser: "" - osGroup: "" + osUser: "" + osGroup: "" rancherChartRepository: "" rancherHostname: "" rancherImage: "" @@ -59,3 +60,9 @@ terraform: standaloneRegistry: assetsPath: "" registryName: "" +terratest: + pathToRepo: "" + standaloneLogging: false + tfLogging: false +logging: + level: "" diff --git a/validation/recurring/infrastructure/setuprancher/airgap/main.go b/validation/recurring/infrastructure/setuprancher/airgap/main.go index 9b232e757c..2351fe6d33 100644 --- a/validation/recurring/infrastructure/setuprancher/airgap/main.go +++ b/validation/recurring/infrastructure/setuprancher/airgap/main.go @@ -33,6 +33,11 @@ func main() { if err != nil { logrus.Fatalf("Failed to load package defaults: %v", err) } + + cattleConfig, err = defaults.LoadSecretsManagerDefaults(cattleConfig) + if err != nil { + logrus.Fatalf("Failed to load Secrets Manager defaults: %v", err) + } testSession := session.NewSession() client, registry, bastion, _, _, _, _ := setupairgap.SetupAirgapRancher(t, testSession, keypath.AirgapKeyPath, cattleConfig) diff --git a/validation/recurring/infrastructure/setuprancher/dualstack/defaults/defaults.yaml b/validation/recurring/infrastructure/setuprancher/dualstack/defaults/defaults.yaml index 21250c07c8..140e907a5e 100644 --- a/validation/recurring/infrastructure/setuprancher/dualstack/defaults/defaults.yaml +++ b/validation/recurring/infrastructure/setuprancher/dualstack/defaults/defaults.yaml @@ -5,18 +5,19 @@ rancher: cleanup: true awsCredentials: - awsAccessKey: "" - awsSecretKey: "" + accessKey: "" + secretKey: "" + defaultRegion: "" terraform: awsCredentials: - awsAccessKey: "" - awsSecretKey: "" + awsAccessKey: "" + awsSecretKey: "" cni: "" - defaultClusterRoleForProjectMembers: "true" - enableNetworkPolicy: false - provider: "" - downstreamClusterProvider: "" + localCluster: "rke2" + defaultClusterRoleForProjectMembers: "" + provider: "" + downstreamClusterProvider: "" privateKeyPath: "" resourcePrefix: "" awsConfig: @@ -36,7 +37,7 @@ terraform: clusterCIDR: "" serviceCIDR: "" sshConnectionType: "" - timeout: "" + timeout: "" ipAddressType: "" loadBalancerType: "" targetType: "" @@ -55,3 +56,9 @@ terraform: registryUsername: "" repo: "" rke2Version: "" +terratest: + pathToRepo: "" + standaloneLogging: false + tfLogging: false +logging: + level: "" diff --git a/validation/recurring/infrastructure/setuprancher/dualstack/main.go b/validation/recurring/infrastructure/setuprancher/dualstack/main.go index d8bbd8004d..7a470460fe 100644 --- a/validation/recurring/infrastructure/setuprancher/dualstack/main.go +++ b/validation/recurring/infrastructure/setuprancher/dualstack/main.go @@ -33,6 +33,11 @@ func main() { if err != nil { logrus.Fatalf("Failed to load package defaults: %v", err) } + + cattleConfig, err = defaults.LoadSecretsManagerDefaults(cattleConfig) + if err != nil { + logrus.Fatalf("Failed to load Secrets Manager defaults: %v", err) + } testSession := session.NewSession() client, _, _, _, _ := setupdualstack.SetupDualStackRancher(t, testSession, keypath.DualStackKeyPath, cattleConfig) diff --git a/validation/recurring/infrastructure/setuprancher/ipv6/defaults/defaults.yaml b/validation/recurring/infrastructure/setuprancher/ipv6/defaults/defaults.yaml index 915f61f2b8..486e4c3fc8 100644 --- a/validation/recurring/infrastructure/setuprancher/ipv6/defaults/defaults.yaml +++ b/validation/recurring/infrastructure/setuprancher/ipv6/defaults/defaults.yaml @@ -5,18 +5,19 @@ rancher: cleanup: true awsCredentials: - awsAccessKey: "" - awsSecretKey: "" + accessKey: "" + secretKey: "" + defaultRegion: "" terraform: awsCredentials: - awsAccessKey: "" - awsSecretKey: "" + awsAccessKey: "" + awsSecretKey: "" cni: "" - defaultClusterRoleForProjectMembers: "true" - enableNetworkPolicy: false - provider: "" - downstreamClusterProvider: "" + localCluster: "rke2" + defaultClusterRoleForProjectMembers: "" + provider: "" + downstreamClusterProvider: "" privateKeyPath: "" resourcePrefix: "" awsConfig: @@ -38,7 +39,7 @@ terraform: enablePrimaryIPv6: true httpProtocolIPv6: "enabled" sshConnectionType: "" - timeout: "" + timeout: "" ipAddressType: "" loadBalancerType: "" targetType: "" @@ -57,3 +58,9 @@ terraform: registryUsername: "" repo: "" rke2Version: "" +terratest: + pathToRepo: "" + standaloneLogging: false + tfLogging: false +logging: + level: "" diff --git a/validation/recurring/infrastructure/setuprancher/ipv6/main.go b/validation/recurring/infrastructure/setuprancher/ipv6/main.go index 6cf745dfe8..5b4a271642 100644 --- a/validation/recurring/infrastructure/setuprancher/ipv6/main.go +++ b/validation/recurring/infrastructure/setuprancher/ipv6/main.go @@ -33,6 +33,11 @@ func main() { if err != nil { logrus.Fatalf("Failed to load package defaults: %v", err) } + + cattleConfig, err = defaults.LoadSecretsManagerDefaults(cattleConfig) + if err != nil { + logrus.Fatalf("Failed to load Secrets Manager defaults: %v", err) + } testSession := session.NewSession() client, _, _, _, _ := setupipv6.SetupIPv6Rancher(t, testSession, keypath.IPv6KeyPath, cattleConfig) diff --git a/validation/recurring/infrastructure/setuprancher/proxy/defaults/defaults.yaml b/validation/recurring/infrastructure/setuprancher/proxy/defaults/defaults.yaml index 26a78d7b7b..f79bd52110 100644 --- a/validation/recurring/infrastructure/setuprancher/proxy/defaults/defaults.yaml +++ b/validation/recurring/infrastructure/setuprancher/proxy/defaults/defaults.yaml @@ -5,23 +5,24 @@ rancher: cleanup: true awsCredentials: - awsAccessKey: "" - awsSecretKey: "" + accessKey: "" + secretKey: "" + defaultRegion: "" terraform: awsCredentials: - awsAccessKey: "" - awsSecretKey: "" + awsAccessKey: "" + awsSecretKey: "" cni: "" - defaultClusterRoleForProjectMembers: "true" - enableNetworkPolicy: false - provider: "" + localCluster: "rke2" + defaultClusterRoleForProjectMembers: "" + provider: "" privateKeyPath: "" resourcePrefix: "" proxy: proxyBastion: "" awsConfig: - ami: "" + ami: "" awsKeyName: "" awsInstanceType: "" awsVolumeType: "" @@ -33,9 +34,9 @@ terraform: awsZoneLetter: "" awsRootSize: "" awsRoute53Zone: "" - awsUser: "" + awsUser: "" sshConnectionType: "" - timeout: "" + timeout: "" windowsAWSUser: "" windows2019AMI: "" windows2022AMI: "" @@ -50,8 +51,8 @@ terraform: certManagerVersion: "" certType: "" chartVersion: "" - osUser: "" - osGroup: "" + osUser: "" + osGroup: "" rancherChartRepository: "" rancherHostname: "" rancherImage: "" @@ -60,3 +61,9 @@ terraform: registryUsername: "" repo: "" rke2Version: "" +terratest: + pathToRepo: "" + standaloneLogging: false + tfLogging: false +logging: + level: "" diff --git a/validation/recurring/infrastructure/setuprancher/proxy/main.go b/validation/recurring/infrastructure/setuprancher/proxy/main.go index 272046bd30..4c7be6235a 100644 --- a/validation/recurring/infrastructure/setuprancher/proxy/main.go +++ b/validation/recurring/infrastructure/setuprancher/proxy/main.go @@ -33,6 +33,11 @@ func main() { if err != nil { logrus.Fatalf("Failed to load package defaults: %v", err) } + + cattleConfig, err = defaults.LoadSecretsManagerDefaults(cattleConfig) + if err != nil { + logrus.Fatalf("Failed to load Secrets Manager defaults: %v", err) + } testSession := session.NewSession() client, proxyBastion, _, _, _, _ := setupproxy.SetupProxyRancher(t, testSession, keypath.ProxyKeyPath, cattleConfig) diff --git a/validation/recurring/infrastructure/setuprancher/registry/defaults/defaults.yaml b/validation/recurring/infrastructure/setuprancher/registry/defaults/defaults.yaml index bebe13d8eb..c60af21cc1 100644 --- a/validation/recurring/infrastructure/setuprancher/registry/defaults/defaults.yaml +++ b/validation/recurring/infrastructure/setuprancher/registry/defaults/defaults.yaml @@ -5,21 +5,22 @@ rancher: cleanup: true awsCredentials: - awsAccessKey: "" - awsSecretKey: "" + accessKey: "" + secretKey: "" + defaultRegion: "" terraform: awsCredentials: - awsAccessKey: "" - awsSecretKey: "" + awsAccessKey: "" + awsSecretKey: "" cni: "" - defaultClusterRoleForProjectMembers: "true" - enableNetworkPolicy: false - provider: "" + localCluster: "rke2" + defaultClusterRoleForProjectMembers: "" + provider: "" privateKeyPath: "" resourcePrefix: "" awsConfig: - ami: "" + ami: "" awsKeyName: "" awsInstanceType: "" awsVolumeType: "" @@ -32,9 +33,9 @@ terraform: awsRootSize: "" registryRootSize: "" awsRoute53Zone: "" - awsUser: "" + awsUser: "" sshConnectionType: "" - timeout: "" + timeout: "" ipAddressType: "" loadBalancerType: "" targetType: "" @@ -43,8 +44,8 @@ terraform: certManagerVersion: "" chartVersion: "" certType: "" - osUser: "" - osGroup: "" + osUser: "" + osGroup: "" rancherChartRepository: "" rancherHostname: "" rancherImage: "" @@ -61,3 +62,9 @@ terraform: ecrUsername: "" ecrPassword: "" ecrURI: "" +terratest: + pathToRepo: "" + standaloneLogging: false + tfLogging: false +logging: + level: "" diff --git a/validation/recurring/infrastructure/setuprancher/registry/main.go b/validation/recurring/infrastructure/setuprancher/registry/main.go index b4baaf6fab..246b688147 100644 --- a/validation/recurring/infrastructure/setuprancher/registry/main.go +++ b/validation/recurring/infrastructure/setuprancher/registry/main.go @@ -33,6 +33,11 @@ func main() { if err != nil { logrus.Fatalf("Failed to load package defaults: %v", err) } + + cattleConfig, err = defaults.LoadSecretsManagerDefaults(cattleConfig) + if err != nil { + logrus.Fatalf("Failed to load Secrets Manager defaults: %v", err) + } testSession := session.NewSession() client, authRegistry, unauthRegistry, globalRegistry, _, _, _ := setupregistry.SetupRegistryRancher(t, testSession, keypath.RegistryKeyPath, cattleConfig) diff --git a/validation/recurring/infrastructure/setuprancher/standard/defaults/defaults.yaml b/validation/recurring/infrastructure/setuprancher/standard/defaults/defaults.yaml index d3f86df582..7e5bac0669 100644 --- a/validation/recurring/infrastructure/setuprancher/standard/defaults/defaults.yaml +++ b/validation/recurring/infrastructure/setuprancher/standard/defaults/defaults.yaml @@ -1,26 +1,28 @@ rancher: - host: "" - adminPassword: "" + host: "." + adminPassword: "" insecure: true cleanup: true awsCredentials: - awsAccessKey: "" - awsSecretKey: "" + accessKey: "" + secretKey: "" + defaultRegion: "" terraform: awsCredentials: - awsAccessKey: "" - awsSecretKey: "" + awsAccessKey: "" + awsSecretKey: "" cni: "" - defaultClusterRoleForProjectMembers: "true" - enableNetworkPolicy: false - provider: "" - downstreamClusterProvider: "" + localCluster: "rke2" + defaultClusterRoleForProjectMembers: "" + provider: "" + generateV3Token: true + downstreamClusterProvider: "" privateKeyPath: "" resourcePrefix: "" awsConfig: - ami: "" + ami: "" awsKeyName: "" awsInstanceType: "" awsVolumeType: "" @@ -32,9 +34,9 @@ terraform: awsZoneLetter: "" awsRootSize: "" awsRoute53Zone: "" - awsUser: "" + awsUser: "" sshConnectionType: "" - timeout: "" + timeout: "" windowsAWSUser: "" windows2019AMI: "" windows2022AMI: "" @@ -49,8 +51,8 @@ terraform: certManagerVersion: "" certType: "" chartVersion: "" - osUser: "" - osGroup: "" + osUser: "" + osGroup: "" rancherChartRepository: "" rancherHostname: "" rancherImage: "" @@ -59,3 +61,9 @@ terraform: registryUsername: "" repo: "" rke2Version: "" +terratest: + pathToRepo: "" + standaloneLogging: false + tfLogging: false +logging: + level: "" diff --git a/validation/recurring/infrastructure/setuprancher/standard/main.go b/validation/recurring/infrastructure/setuprancher/standard/main.go index adf2e8b4c4..a42acd961d 100644 --- a/validation/recurring/infrastructure/setuprancher/standard/main.go +++ b/validation/recurring/infrastructure/setuprancher/standard/main.go @@ -33,6 +33,17 @@ func main() { if err != nil { logrus.Fatalf("Failed to load package defaults: %v", err) } + + cattleConfig, err = defaults.LoadSecretsManagerDefaults(cattleConfig) + if err != nil { + logrus.Fatalf("Failed to load Secrets Manager defaults: %v", err) + } + + err = defaults.VerifyCattleConfig(cattleConfig) + if err != nil { + logrus.Fatalf("Cattle config verification failed: %v", err) + } + testSession := session.NewSession() client, _, _, _, _ := setupstandard.SetupRancher(t, testSession, keypath.SanityKeyPath, cattleConfig) diff --git a/validation/recurring/infrastructure/upgraderancher/airgap/defaults/defaults.yaml b/validation/recurring/infrastructure/upgraderancher/airgap/defaults/defaults.yaml index e052285b48..90c795f12a 100644 --- a/validation/recurring/infrastructure/upgraderancher/airgap/defaults/defaults.yaml +++ b/validation/recurring/infrastructure/upgraderancher/airgap/defaults/defaults.yaml @@ -5,17 +5,17 @@ rancher: cleanup: true awsCredentials: - awsAccessKey: "" - awsSecretKey: "" + accessKey: "" + secretKey: "" + defaultRegion: "" terraform: awsCredentials: - awsAccessKey: "" - awsSecretKey: "" + awsAccessKey: "" + awsSecretKey: "" cni: "" - defaultClusterRoleForProjectMembers: "true" - enableNetworkPolicy: false - provider: "" + defaultClusterRoleForProjectMembers: "" + provider: "" privateKeyPath: "" resourcePrefix: "" privateRegistries: @@ -26,18 +26,18 @@ terraform: awsInstanceType: "" awsVolumeType: "" region: "" - awsSecurityGroups: [""] - awsSecurityGroupNames: [""] + awsSecurityGroups: + awsSecurityGroupNames: awsSubnetID: "" awsVpcID: "" awsVpcIP: "" awsZoneLetter: "" - awsRootSize: "" + awsRootSize: registryRootSize: "" awsRoute53Zone: "" - awsUser: "" + awsUser: "" sshConnectionType: "" - timeout: "" + timeout: "" ipAddressType: "" loadBalancerType: "" targetType: "" @@ -46,8 +46,8 @@ terraform: certManagerVersion: "" chartVersion: "" certType: "" - osUser: "" - osGroup: "" + osUser: "" + osGroup: "" rancherChartRepository: "" rancherHostname: "" rancherImage: "" @@ -65,3 +65,5 @@ terraform: assetsPath: "" registryName: "" upgradedAssetsPath: "" +logging: + level: "" diff --git a/validation/recurring/infrastructure/upgraderancher/airgap/main.go b/validation/recurring/infrastructure/upgraderancher/airgap/main.go index 0f8855d6df..138a16e475 100644 --- a/validation/recurring/infrastructure/upgraderancher/airgap/main.go +++ b/validation/recurring/infrastructure/upgraderancher/airgap/main.go @@ -34,6 +34,11 @@ func main() { if err != nil { logrus.Fatalf("Failed to load package defaults: %v", err) } + + cattleConfig, err = defaults.LoadSecretsManagerDefaults(cattleConfig) + if err != nil { + logrus.Fatalf("Failed to load Secrets Manager defaults: %v", err) + } testSession := session.NewSession() client, registry, bastion, _, _, cattleConfig, tunnel := setupairgap.SetupAirgapRancher(t, testSession, keypath.AirgapKeyPath, cattleConfig) diff --git a/validation/recurring/infrastructure/upgraderancher/dualstack/defaults/defaults.yaml b/validation/recurring/infrastructure/upgraderancher/dualstack/defaults/defaults.yaml index 121ba60ffc..f71a85f1ff 100644 --- a/validation/recurring/infrastructure/upgraderancher/dualstack/defaults/defaults.yaml +++ b/validation/recurring/infrastructure/upgraderancher/dualstack/defaults/defaults.yaml @@ -5,18 +5,18 @@ rancher: cleanup: true awsCredentials: - awsAccessKey: "" - awsSecretKey: "" + accessKey: "" + secretKey: "" + defaultRegion: "" terraform: awsCredentials: - awsAccessKey: "" - awsSecretKey: "" + awsAccessKey: "" + awsSecretKey: "" cni: "" - defaultClusterRoleForProjectMembers: "true" - enableNetworkPolicy: false - provider: "" - downstreamClusterProvider: "" + defaultClusterRoleForProjectMembers: "" + provider: "" + downstreamClusterProvider: "" privateKeyPath: "" resourcePrefix: "" awsConfig: @@ -25,18 +25,18 @@ terraform: awsInstanceType: "" awsVolumeType: "" region: "" - awsSecurityGroups: [""] - awsSecurityGroupNames: [""] + awsSecurityGroups: + awsSecurityGroupNames: awsSubnetID: "" awsVpcID: "" awsZoneLetter: "" - awsRootSize: "" + awsRootSize: awsRoute53Zone: "" awsUser: "" clusterCIDR: "" serviceCIDR: "" sshConnectionType: "" - timeout: "" + timeout: "" ipAddressType: "" loadBalancerType: "" targetType: "" @@ -60,3 +60,5 @@ terraform: upgradedRancherImage: "" upgradedRancherRepo: "" upgradedRancherTagVersion: "" +logging: + level: "" diff --git a/validation/recurring/infrastructure/upgraderancher/dualstack/main.go b/validation/recurring/infrastructure/upgraderancher/dualstack/main.go index 316ae66f46..d3d76a51c8 100644 --- a/validation/recurring/infrastructure/upgraderancher/dualstack/main.go +++ b/validation/recurring/infrastructure/upgraderancher/dualstack/main.go @@ -34,6 +34,11 @@ func main() { if err != nil { logrus.Fatalf("Failed to load package defaults: %v", err) } + + cattleConfig, err = defaults.LoadSecretsManagerDefaults(cattleConfig) + if err != nil { + logrus.Fatalf("Failed to load Secrets Manager defaults: %v", err) + } testSession := session.NewSession() client, serverNodeOne, _, _, cattleConfig := setupdualstack.SetupDualStackRancher(t, testSession, keypath.DualStackKeyPath, cattleConfig) diff --git a/validation/recurring/infrastructure/upgraderancher/ipv6/defaults/defaults.yaml b/validation/recurring/infrastructure/upgraderancher/ipv6/defaults/defaults.yaml index 5e4bb400d2..fd0b8871a2 100644 --- a/validation/recurring/infrastructure/upgraderancher/ipv6/defaults/defaults.yaml +++ b/validation/recurring/infrastructure/upgraderancher/ipv6/defaults/defaults.yaml @@ -5,18 +5,18 @@ rancher: cleanup: true awsCredentials: - awsAccessKey: "" - awsSecretKey: "" + accessKey: "" + secretKey: "" + defaultRegion: "" terraform: awsCredentials: - awsAccessKey: "" - awsSecretKey: "" + awsAccessKey: "" + awsSecretKey: "" cni: "" - defaultClusterRoleForProjectMembers: "true" - enableNetworkPolicy: false - provider: "" - downstreamClusterProvider: "" + defaultClusterRoleForProjectMembers: "" + provider: "" + downstreamClusterProvider: "" privateKeyPath: "" resourcePrefix: "" awsConfig: @@ -25,12 +25,12 @@ terraform: awsInstanceType: "" awsVolumeType: "" region: "" - awsSecurityGroups: [""] - awsSecurityGroupNames: [""] + awsSecurityGroups: + awsSecurityGroupNames: awsSubnetID: "" awsVpcID: "" awsZoneLetter: "" - awsRootSize: "" + awsRootSize: awsRoute53Zone: "" awsUser: "" clusterCIDR: "" @@ -38,7 +38,7 @@ terraform: enablePrimaryIPv6: true httpProtocolIPv6: "enabled" sshConnectionType: "" - timeout: "" + timeout: "" ipAddressType: "" loadBalancerType: "" targetType: "" @@ -62,3 +62,5 @@ terraform: upgradedRancherImage: "" upgradedRancherRepo: "" upgradedRancherTagVersion: "" +logging: + level: "" diff --git a/validation/recurring/infrastructure/upgraderancher/ipv6/main.go b/validation/recurring/infrastructure/upgraderancher/ipv6/main.go index 3abd6b7e84..ea0b7921aa 100644 --- a/validation/recurring/infrastructure/upgraderancher/ipv6/main.go +++ b/validation/recurring/infrastructure/upgraderancher/ipv6/main.go @@ -34,6 +34,11 @@ func main() { if err != nil { logrus.Fatalf("Failed to load package defaults: %v", err) } + + cattleConfig, err = defaults.LoadSecretsManagerDefaults(cattleConfig) + if err != nil { + logrus.Fatalf("Failed to load Secrets Manager defaults: %v", err) + } testSession := session.NewSession() client, serverNodeOne, _, _, cattleConfig := setupipv6.SetupIPv6Rancher(t, testSession, keypath.IPv6KeyPath, cattleConfig) diff --git a/validation/recurring/infrastructure/upgraderancher/proxy/defaults/defaults.yaml b/validation/recurring/infrastructure/upgraderancher/proxy/defaults/defaults.yaml index b89ad202c6..6e8c3fb66c 100644 --- a/validation/recurring/infrastructure/upgraderancher/proxy/defaults/defaults.yaml +++ b/validation/recurring/infrastructure/upgraderancher/proxy/defaults/defaults.yaml @@ -5,37 +5,37 @@ rancher: cleanup: true awsCredentials: - awsAccessKey: "" - awsSecretKey: "" + accessKey: "" + secretKey: "" + defaultRegion: "" terraform: awsCredentials: - awsAccessKey: "" - awsSecretKey: "" + awsAccessKey: "" + awsSecretKey: "" cni: "" - defaultClusterRoleForProjectMembers: "true" - enableNetworkPolicy: false - provider: "" + defaultClusterRoleForProjectMembers: "" + provider: "" privateKeyPath: "" resourcePrefix: "" proxy: proxyBastion: "" awsConfig: - ami: "" + ami: "" awsKeyName: "" awsInstanceType: "" awsVolumeType: "" region: "" - awsSecurityGroups: [""] - awsSecurityGroupNames: [""] + awsSecurityGroups: + awsSecurityGroupNames: awsSubnetID: "" awsVpcID: "" awsZoneLetter: "" - awsRootSize: "" + awsRootSize: awsRoute53Zone: "" - awsUser: "" + awsUser: "" sshConnectionType: "" - timeout: "" + timeout: "" windowsAWSUser: "" windows2019AMI: "" windows2022AMI: "" @@ -50,8 +50,8 @@ terraform: certManagerVersion: "" certType: "" chartVersion: "" - osUser: "" - osGroup: "" + osUser: "" + osGroup: "" rancherChartRepository: "" rancherHostname: "" rancherImage: "" @@ -65,3 +65,5 @@ terraform: upgradedRancherImage: "" upgradedRancherRepo: "" upgradedRancherTagVersion: "" +logging: + level: "" diff --git a/validation/recurring/infrastructure/upgraderancher/proxy/main.go b/validation/recurring/infrastructure/upgraderancher/proxy/main.go index 6b2c7a73b4..57bfcbf727 100644 --- a/validation/recurring/infrastructure/upgraderancher/proxy/main.go +++ b/validation/recurring/infrastructure/upgraderancher/proxy/main.go @@ -34,6 +34,11 @@ func main() { if err != nil { logrus.Fatalf("Failed to load package defaults: %v", err) } + + cattleConfig, err = defaults.LoadSecretsManagerDefaults(cattleConfig) + if err != nil { + logrus.Fatalf("Failed to load Secrets Manager defaults: %v", err) + } testSession := session.NewSession() client, proxyBastion, proxyPrivateIP, _, _, cattleConfig := setupproxy.SetupProxyRancher(t, testSession, keypath.ProxyKeyPath, cattleConfig) diff --git a/validation/recurring/infrastructure/upgraderancher/standard/defaults/defaults.yaml b/validation/recurring/infrastructure/upgraderancher/standard/defaults/defaults.yaml index 7195219c53..bbbc6708f8 100644 --- a/validation/recurring/infrastructure/upgraderancher/standard/defaults/defaults.yaml +++ b/validation/recurring/infrastructure/upgraderancher/standard/defaults/defaults.yaml @@ -5,36 +5,36 @@ rancher: cleanup: true awsCredentials: - awsAccessKey: "" - awsSecretKey: "" + accessKey: "" + secretKey: "" + defaultRegion: "" terraform: awsCredentials: - awsAccessKey: "" - awsSecretKey: "" + awsAccessKey: "" + awsSecretKey: "" cni: "" - defaultClusterRoleForProjectMembers: "true" - enableNetworkPolicy: false - provider: "" - downstreamClusterProvider: "" + defaultClusterRoleForProjectMembers: "" + provider: "" + downstreamClusterProvider: "" privateKeyPath: "" resourcePrefix: "" awsConfig: - ami: "" + ami: "" awsKeyName: "" awsInstanceType: "" awsVolumeType: "" region: "" - awsSecurityGroups: [""] - awsSecurityGroupNames: [""] + awsSecurityGroups: + awsSecurityGroupNames: awsSubnetID: "" awsVpcID: "" awsZoneLetter: "" - awsRootSize: "" + awsRootSize: awsRoute53Zone: "" - awsUser: "" + awsUser: "" sshConnectionType: "" - timeout: "" + timeout: "" windowsAWSUser: "" windows2019AMI: "" windows2022AMI: "" @@ -49,8 +49,8 @@ terraform: certManagerVersion: "" certType: "" chartVersion: "" - osUser: "" - osGroup: "" + osUser: "" + osGroup: "" rancherChartRepository: "" rancherHostname: "" rancherImage: "" @@ -64,3 +64,5 @@ terraform: upgradedRancherImage: "" upgradedRancherRepo: "" upgradedRancherTagVersion: "" +logging: + level: "" diff --git a/validation/recurring/infrastructure/upgraderancher/standard/main.go b/validation/recurring/infrastructure/upgraderancher/standard/main.go index 8bb41cb4d6..b7f73ea7fa 100644 --- a/validation/recurring/infrastructure/upgraderancher/standard/main.go +++ b/validation/recurring/infrastructure/upgraderancher/standard/main.go @@ -34,6 +34,11 @@ func main() { if err != nil { logrus.Fatalf("Failed to load package defaults: %v", err) } + + cattleConfig, err = defaults.LoadSecretsManagerDefaults(cattleConfig) + if err != nil { + logrus.Fatalf("Failed to load Secrets Manager defaults: %v", err) + } testSession := session.NewSession() client, serverNodeOne, _, _, cattleConfig := setupstandard.SetupRancher(t, testSession, keypath.SanityKeyPath, cattleConfig) diff --git a/validation/remotedialerproxy/defaults/defaults.yaml b/validation/remotedialerproxy/defaults/defaults.yaml index 0943d67fee..3d95e2d4d3 100644 --- a/validation/remotedialerproxy/defaults/defaults.yaml +++ b/validation/remotedialerproxy/defaults/defaults.yaml @@ -24,18 +24,15 @@ clusterConfig: worker: true quantity: 1 kubernetesVersion: "" - cni: "calico" - provider: "aws" - nodeProvider: "ec2" - hardened: false - compliance: false - psact: "" + cni: "" + provider: "" + nodeProvider: "" #Required for all tests except template awsCredentials: secretKey: "" accessKey: "" - defaultRegion: "us-east-2" + defaultRegion: "" #Required for tests that utilize node driver clusters awsMachineConfigs: @@ -48,7 +45,7 @@ awsMachineConfigs: rootSize: "" sshUser: "" vpcId: "" - zone: "a" + zone: "" retries: "5" - roles: ["windows"] ami: "" @@ -56,9 +53,9 @@ awsMachineConfigs: sshUser: "" vpcId: "" volumeType: "" - zone: "a" + zone: "" retries: "5" - rootSize: "100" + rootSize: "" #Required for tests that utilize custom clusters awsEC2Configs: @@ -67,32 +64,30 @@ awsEC2Configs: awsAccessKeyID: "" awsEC2Config: - instanceType: "t3a.medium" - awsRegionAZ: "" awsAMI: "" awsSecurityGroups: [""] awsSSHKeyName: "" awsCICDInstanceTag: "" awsIAMProfile: "" awsUser: "" - volumeSize: 100 + volumeSize: "" roles: ["etcd", "controlplane", "worker"] - instanceType: "t2.2xlarge" - awsRegionAZ: "" awsAMI: "" awsSecurityGroups: [""] awsSSHKeyName: "" awsCICDInstanceTag: "" awsIAMProfile: "" awsUser: "" - volumeSize: 100 + volumeSize: "" roles: ["windows"] #Required for tests that utilize custom clusters sshPath: - sshPath: "" + sshPath: "" logging: - level: "info" + level: "" workloadConfigs: deployment: @@ -182,4 +177,4 @@ workloadConfigs: spec: containers: - name: "teststatefulset" - image: "nginx:latest" \ No newline at end of file + image: "nginx:latest" diff --git a/validation/snapshot/defaults/defaults.yaml b/validation/snapshot/defaults/defaults.yaml index 89008bf7d3..4024a777ab 100644 --- a/validation/snapshot/defaults/defaults.yaml +++ b/validation/snapshot/defaults/defaults.yaml @@ -24,64 +24,64 @@ clusterConfig: worker: true quantity: 3 kubernetesVersion: "" - cni: "calico" - provider: "aws" - nodeProvider: "ec2" + cni: "" + provider: "" + nodeProvider: "" #Required for all tests awsCredentials: secretKey: "" accessKey: "" - defaultRegion: "us-east-2" + defaultRegion: "" #Required for tests that utilize node driver clusters awsMachineConfigs: - region: "us-east-2" + region: "" awsMachineConfig: - roles: ["etcd","controlplane","worker"] - ami: "" + ami: "" instanceType: "t3a.xlarge" - volumeType: "" - rootSize: "" - sshUser: "" - vpcId: "" + volumeType: "" + rootSize: "" + sshUser: "" + vpcId: "" retries: "5" - zone: "a" + zone: "" - roles: ["windows"] - ami: "" + ami: "" instanceType: "t2.2xlarge" - sshUser: "" - vpcId: "" - volumeType: "" - zone: "a" + sshUser: "" + vpcId: "" + volumeType: "" + zone: "" retries: "5" - rootSize: "100" + rootSize: "" #Required for tests that utilize custom clusters awsEC2Configs: - region: "us-east-2" - awsSecretAccessKey: "" - awsAccessKeyID: "" + region: "" + awsSecretAccessKey: "" + awsAccessKeyID: "" awsEC2Config: - - instanceType: "t3a.medium" - awsRegionAZ: "" - awsSSHKeyName: "" - awsAMI: "" - awsSecurityGroups: [""] - awsSSHKeyName: "" - awsCICDInstanceTag: "" - awsIAMProfile: "" - awsUser: "" - volumeSize: 100 + - instanceType: "t3a.xlarge" + awsSSHKeyName: "" + awsAMI: "" + awsSecurityGroups: [""] + awsSSHKeyName: "" + awsCICDInstanceTag: "" + awsIAMProfile: "" + awsUser: "" + volumeSize: "" roles: ["etcd", "controlplane", "worker"] - instanceType: "t2.2xlarge" - awsRegionAZ: "" - awsSSHKeyName: "" - awsAMI: "" - awsSecurityGroups: [""] - awsSSHKeyName: "" - awsCICDInstanceTag: "" - awsIAMProfile: "" - awsUser: "" - volumeSize: 100 - roles: ["windows"] \ No newline at end of file + awsSSHKeyName: "" + awsAMI: "" + awsSecurityGroups: [""] + awsSSHKeyName: "" + awsCICDInstanceTag: "" + awsIAMProfile: "" + awsUser: "" + volumeSize: "" + roles: ["windows"] +logging: + level: "" diff --git a/validation/snapshot/k3s/snapshot_recurring_test.go b/validation/snapshot/k3s/snapshot_recurring_test.go index 98ccf9ba44..58562df54c 100644 --- a/validation/snapshot/k3s/snapshot_recurring_test.go +++ b/validation/snapshot/k3s/snapshot_recurring_test.go @@ -54,6 +54,9 @@ func (s *SnapshotRecurringTestSuite) SetupSuite() { s.cattleConfig, err = defaults.LoadPackageDefaults(s.cattleConfig, "") require.NoError(s.T(), err) + + s.cattleConfig, err = defaults.LoadSecretsManagerDefaults(s.cattleConfig) + require.NoError(s.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, s.cattleConfig, loggingConfig) diff --git a/validation/snapshot/k3s/snapshot_restore_test.go b/validation/snapshot/k3s/snapshot_restore_test.go index ca6e33fbb4..21ba0e1765 100644 --- a/validation/snapshot/k3s/snapshot_restore_test.go +++ b/validation/snapshot/k3s/snapshot_restore_test.go @@ -58,6 +58,9 @@ func (s *SnapshotRestoreTestSuite) SetupSuite() { s.cattleConfig, err = defaults.LoadPackageDefaults(s.cattleConfig, "") require.NoError(s.T(), err) + + s.cattleConfig, err = defaults.LoadSecretsManagerDefaults(s.cattleConfig) + require.NoError(s.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, s.cattleConfig, loggingConfig) diff --git a/validation/snapshot/k3s/snapshot_retention_test.go b/validation/snapshot/k3s/snapshot_retention_test.go index e1a1edc3dc..424833c215 100644 --- a/validation/snapshot/k3s/snapshot_retention_test.go +++ b/validation/snapshot/k3s/snapshot_retention_test.go @@ -61,6 +61,9 @@ func (s *SnapshotRetentionTestSuite) SetupSuite() { s.cattleConfig, err = defaults.LoadPackageDefaults(s.cattleConfig, "") require.NoError(s.T(), err) + + s.cattleConfig, err = defaults.LoadSecretsManagerDefaults(s.cattleConfig) + require.NoError(s.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, s.cattleConfig, loggingConfig) diff --git a/validation/snapshot/k3s/snapshot_s3_restore_test.go b/validation/snapshot/k3s/snapshot_s3_restore_test.go index eb560aefe4..ffac53fd6e 100644 --- a/validation/snapshot/k3s/snapshot_s3_restore_test.go +++ b/validation/snapshot/k3s/snapshot_s3_restore_test.go @@ -75,6 +75,9 @@ func (s *S3SnapshotRestoreTestSuite) SetupSuite() { s.cattleConfig, err = defaults.LoadPackageDefaults(s.cattleConfig, "") require.NoError(s.T(), err) + + s.cattleConfig, err = defaults.LoadSecretsManagerDefaults(s.cattleConfig) + require.NoError(s.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, s.cattleConfig, loggingConfig) diff --git a/validation/snapshot/rke2/snapshot_recurring_test.go b/validation/snapshot/rke2/snapshot_recurring_test.go index e68f11a3bb..777ac86a3b 100644 --- a/validation/snapshot/rke2/snapshot_recurring_test.go +++ b/validation/snapshot/rke2/snapshot_recurring_test.go @@ -54,6 +54,9 @@ func (s *SnapshotRecurringTestSuite) SetupSuite() { s.cattleConfig, err = defaults.LoadPackageDefaults(s.cattleConfig, "") require.NoError(s.T(), err) + + s.cattleConfig, err = defaults.LoadSecretsManagerDefaults(s.cattleConfig) + require.NoError(s.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, s.cattleConfig, loggingConfig) diff --git a/validation/snapshot/rke2/snapshot_restore_test.go b/validation/snapshot/rke2/snapshot_restore_test.go index f76189f330..e4e9581ec3 100644 --- a/validation/snapshot/rke2/snapshot_restore_test.go +++ b/validation/snapshot/rke2/snapshot_restore_test.go @@ -58,6 +58,9 @@ func (s *SnapshotRestoreTestSuite) SetupSuite() { s.cattleConfig, err = defaults.LoadPackageDefaults(s.cattleConfig, "") require.NoError(s.T(), err) + + s.cattleConfig, err = defaults.LoadSecretsManagerDefaults(s.cattleConfig) + require.NoError(s.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, s.cattleConfig, loggingConfig) diff --git a/validation/snapshot/rke2/snapshot_restore_wins_test.go b/validation/snapshot/rke2/snapshot_restore_wins_test.go index ad864b1247..1e85879de7 100644 --- a/validation/snapshot/rke2/snapshot_restore_wins_test.go +++ b/validation/snapshot/rke2/snapshot_restore_wins_test.go @@ -60,6 +60,9 @@ func (s *SnapshotRestoreWindowsTestSuite) SetupSuite() { s.cattleConfig, err = defaults.LoadPackageDefaults(s.cattleConfig, "") require.NoError(s.T(), err) + + s.cattleConfig, err = defaults.LoadSecretsManagerDefaults(s.cattleConfig) + require.NoError(s.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, s.cattleConfig, loggingConfig) diff --git a/validation/snapshot/rke2/snapshot_retention_test.go b/validation/snapshot/rke2/snapshot_retention_test.go index 457bf007cb..64cea46c13 100644 --- a/validation/snapshot/rke2/snapshot_retention_test.go +++ b/validation/snapshot/rke2/snapshot_retention_test.go @@ -62,6 +62,9 @@ func (s *SnapshotRetentionTestSuite) SetupSuite() { s.cattleConfig, err = defaults.LoadPackageDefaults(s.cattleConfig, "") require.NoError(s.T(), err) + + s.cattleConfig, err = defaults.LoadSecretsManagerDefaults(s.cattleConfig) + require.NoError(s.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, s.cattleConfig, loggingConfig) diff --git a/validation/snapshot/rke2/snapshot_s3_restore_test.go b/validation/snapshot/rke2/snapshot_s3_restore_test.go index 0f5d01b582..bca83ff25c 100644 --- a/validation/snapshot/rke2/snapshot_s3_restore_test.go +++ b/validation/snapshot/rke2/snapshot_s3_restore_test.go @@ -74,6 +74,9 @@ func (s *S3SnapshotRestoreTestSuite) SetupSuite() { s.cattleConfig, err = defaults.LoadPackageDefaults(s.cattleConfig, "") require.NoError(s.T(), err) + + s.cattleConfig, err = defaults.LoadSecretsManagerDefaults(s.cattleConfig) + require.NoError(s.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, s.cattleConfig, loggingConfig) diff --git a/validation/upgrade/defaults/defaults.yaml b/validation/upgrade/defaults/defaults.yaml index 32ec0e25cd..bb2ee08f80 100644 --- a/validation/upgrade/defaults/defaults.yaml +++ b/validation/upgrade/defaults/defaults.yaml @@ -24,64 +24,64 @@ clusterConfig: worker: true quantity: 3 kubernetesVersion: "" - cni: "calico" - provider: "aws" - nodeProvider: "ec2" + cni: "" + provider: "" + nodeProvider: "" #Required for all tests awsCredentials: secretKey: "" accessKey: "" - defaultRegion: "us-east-2" + defaultRegion: "" #Required for tests that utilize node driver clusters awsMachineConfigs: - region: "us-east-2" + region: "" awsMachineConfig: - roles: ["etcd","controlplane","worker"] - ami: "" + ami: "" instanceType: "t3a.medium" - volumeType: "" - rootSize: "" - sshUser: "" - vpcId: "" + volumeType: "" + rootSize: "" + sshUser: "" + vpcId: "" retries: "5" - zone: "a" + zone: "" - roles: ["windows"] - ami: "" + ami: "" instanceType: "t2.2xlarge" - sshUser: "" - vpcId: "" - volumeType: "" - zone: "a" + sshUser: "" + vpcId: "" + volumeType: "" + zone: "" retries: "5" - rootSize: "100" + rootSize: "" #Required for tests that utilize custom clusters awsEC2Configs: - region: "us-east-2" - awsSecretAccessKey: "" - awsAccessKeyID: "" + region: "" + awsSecretAccessKey: "" + awsAccessKeyID: "" awsEC2Config: - instanceType: "t3a.medium" - awsRegionAZ: "" - awsSSHKeyName: "" - awsAMI: "" - awsSecurityGroups: [""] - awsSSHKeyName: "" - awsCICDInstanceTag: "" - awsIAMProfile: "" - awsUser: "" - volumeSize: 100 + awsSSHKeyName: "" + awsAMI: "" + awsSecurityGroups: [""] + awsSSHKeyName: "" + awsCICDInstanceTag: "" + awsIAMProfile: "" + awsUser: "" + volumeSize: "" roles: ["etcd", "controlplane", "worker"] - instanceType: "t2.2xlarge" - awsRegionAZ: "" - awsSSHKeyName: "" - awsAMI: "" - awsSecurityGroups: [""] - awsSSHKeyName: "" - awsCICDInstanceTag: "" - awsIAMProfile: "" - awsUser: "" - volumeSize: 100 - roles: ["windows"] \ No newline at end of file + awsSSHKeyName: "" + awsAMI: "" + awsSecurityGroups: [""] + awsSSHKeyName: "" + awsCICDInstanceTag: "" + awsIAMProfile: "" + awsUser: "" + volumeSize: "" + roles: ["windows"] +logging: + level: "" diff --git a/validation/upgrade/k3s/kubernetes_test.go b/validation/upgrade/k3s/kubernetes_test.go index 1437db3a1d..93a33dbf33 100644 --- a/validation/upgrade/k3s/kubernetes_test.go +++ b/validation/upgrade/k3s/kubernetes_test.go @@ -57,6 +57,9 @@ func (u *UpgradeKubernetesTestSuite) SetupSuite() { u.cattleConfig, err = defaults.LoadPackageDefaults(u.cattleConfig, "") require.NoError(u.T(), err) + u.cattleConfig, err = defaults.LoadSecretsManagerDefaults(u.cattleConfig) + require.NoError(u.T(), err) + loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, u.cattleConfig, loggingConfig) diff --git a/validation/upgrade/rke2/cloud_provider_aws_migration_test.go b/validation/upgrade/rke2/cloud_provider_aws_migration_test.go index 5ca2d857ca..0a2721c7ea 100644 --- a/validation/upgrade/rke2/cloud_provider_aws_migration_test.go +++ b/validation/upgrade/rke2/cloud_provider_aws_migration_test.go @@ -55,6 +55,9 @@ func (u *MigrateCloudProviderSuite) SetupSuite() { u.cattleConfig, err = defaults.LoadPackageDefaults(u.cattleConfig, "") require.NoError(u.T(), err) + u.cattleConfig, err = defaults.LoadSecretsManagerDefaults(u.cattleConfig) + require.NoError(u.T(), err) + loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, u.cattleConfig, loggingConfig) diff --git a/validation/upgrade/rke2/kubernetes_test.go b/validation/upgrade/rke2/kubernetes_test.go index 9f63ad6424..5b5690594d 100644 --- a/validation/upgrade/rke2/kubernetes_test.go +++ b/validation/upgrade/rke2/kubernetes_test.go @@ -57,6 +57,9 @@ func (u *UpgradeKubernetesTestSuite) SetupSuite() { u.cattleConfig, err = defaults.LoadPackageDefaults(u.cattleConfig, "") require.NoError(u.T(), err) + u.cattleConfig, err = defaults.LoadSecretsManagerDefaults(u.cattleConfig) + require.NoError(u.T(), err) + loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, u.cattleConfig, loggingConfig) diff --git a/validation/upgrade/rke2/kubernetes_wins_test.go b/validation/upgrade/rke2/kubernetes_wins_test.go index 0384d63e7b..1e839b7705 100644 --- a/validation/upgrade/rke2/kubernetes_wins_test.go +++ b/validation/upgrade/rke2/kubernetes_wins_test.go @@ -59,6 +59,9 @@ func (u *UpgradeWindowsKubernetesTestSuite) SetupSuite() { u.cattleConfig, err = defaults.LoadPackageDefaults(u.cattleConfig, "") require.NoError(u.T(), err) + u.cattleConfig, err = defaults.LoadSecretsManagerDefaults(u.cattleConfig) + require.NoError(u.T(), err) + loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, u.cattleConfig, loggingConfig) diff --git a/validation/workloads/defaults/defaults.yaml b/validation/workloads/defaults/defaults.yaml index a49198c068..74bc8353ed 100644 --- a/validation/workloads/defaults/defaults.yaml +++ b/validation/workloads/defaults/defaults.yaml @@ -88,4 +88,4 @@ workloadConfigs: image: "nginx:latest" logging: - level: "info" \ No newline at end of file + level: "" \ No newline at end of file