Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

samples: small fixes to Makefile variables #761

Merged
merged 1 commit into from
Feb 4, 2023
Merged

samples: small fixes to Makefile variables #761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 5 additions & 14 deletions bottlerocket/samples/Makefile.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ skip_core_tasks = true

[env]
AGENT_IMAGE_REGISTRY = { value = "public.ecr.aws/bottlerocket-test-system", condition = { env_not_set = ["AGENT_IMAGE_REGISTRY"] } }
AGENTS = ["eks-resource-agent"]
METADATA_BASE_URL = { value = "https://updates.bottlerocket.aws/2020-07-07", condition = { env_not_set = ["METADATA_BASE_URL"] } }
ARCH = { value = "x86_64", condition = { env_not_set = ["ARCH"] } }
CLUSTER_TYPE = { value = "eks", condition = { env_not_set = ["CLUSTER_TYPE"] } }
Expand All @@ -13,7 +12,7 @@ UPGRADE_VERSION = { value = "v1.11.1", condition = { env_not_set = ["UPGRADE_VER
STARTING_VERSION = { value = "v1.11.0", condition = { env_not_set = ["STARTING_VERSION"] } }
SONOBUOY_MODE = { value = "quick", condition = { env_not_set = ["SONOBUOY_MODE"] } }
TARGETS_URL = { value = "https://updates.bottlerocket.aws/targets", condition = { env_not_set = ["TARGETS_URL"] } }
K8S_VERSION = { value = "1.24", condition = { env_not_set = ["K8S_VERSION"] } }
K8S_VERSION = { value = "v1.24", condition = { env_not_set = ["K8S_VERSION"] } }

# The following variables need values only if a workload test file is being created. `WORKLOAD_TEST_NAME` is an identifier for the workload test. `WORKLOAD_TEST_IMAGE_URI` is the URI to the workload test image.

Expand Down Expand Up @@ -62,7 +61,7 @@ VSPHERE_VM_RESOURCE_AGENT_IMAGE_URI = { value = "${AGENT_IMAGE_REGISTRY}/vsphere
CONTROLLER_IMAGE_URI = { value = "${AGENT_IMAGE_REGISTRY}/controller:v${AGENT_IMAGE_VERSION}", condition = { env_not_set = ["CONTROLLER_IMAGE_URI"] } }

[tasks.metadata-url.env]
METADATA_URL = { script=["echo ${METADATA_BASE_URL}/${VARIANT}/${ARCH}"], condition = { env_not_set = ["METADATA_URL"] } }
METADATA_URL = { script=["echo ${METADATA_BASE_URL}/${VARIANT}/${ARCH}/"], condition = { env_not_set = ["METADATA_URL"] } }

[tasks.cluster-name.env]
CLUSTER_NAME = { script=['''
Expand Down Expand Up @@ -106,7 +105,7 @@ fi
[tasks.mgmt-cluster-kubeconfig-base64.env]
MGMT_CLUSTER_KUBECONFIG_BASE64 = {script=['''
if [ -n "${MGMT_CLUSTER_KUBECONFIG_PATH}" ]; then
cat ${MGMT_CLUSTER_KUBECONFIG_PATH} | base64
cat ${MGMT_CLUSTER_KUBECONFIG_PATH} | base64 -w 0
fi
''']}

Expand Down Expand Up @@ -177,7 +176,7 @@ script = '''
[tasks.workload-preconditions]
condition = { env_contains = { "TEST_TYPE" = "workload" } }
script = '''
if [ -z ${WORKLOAD_TEST_NAME} ] || [ -z ${WORKLOAD_TEST_IMAGE} ]; then
if [ -z ${WORKLOAD_TEST_NAME} ] || [ -z ${WORKLOAD_TEST_IMAGE_URI} ]; then
echo "WORKLOAD_TEST_NAME or WORKLOAD_TEST_IMAGE_URI not set"
exit 1
fi
Expand Down Expand Up @@ -207,15 +206,7 @@ echo "${OUTPUT_FILE}"
'''

[tasks.create-inner.env]
OUTPUT_FILE = {script=['''
if echo ${TEST_TYPE} | grep 'migration' > /dev/null; then
echo "output/${CLUSTER_NAME}-migration.yaml"
elif echo ${TEST_TYPE} | grep 'workload' > /dev/null; then
echo "output/${CLUSTER_NAME}-workload.yaml"
else
echo "output/${CLUSTER_NAME}.yaml"
fi
''']}
OUTPUT_FILE = { script = [ "echo 'output/${CLUSTER_NAME}.yaml'" ] }

[tasks.create]
script = '''
Expand Down
33 changes: 17 additions & 16 deletions bottlerocket/samples/eks/vmware-migration-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ metadata:
spec:
agent:
configuration:
awsRegion: ${REGION}
instanceIds: \${${CLUSTER_NAME}-vms.ids}
awsRegion: ${AWS_REGION}
instanceIds: \${${CLUSTER_NAME}-vms.instanceIds}
migrateToVersion: ${UPGRADE_VERSION}
tufRepo:
metadataUrl: ${METADATA_URL}
Expand Down Expand Up @@ -69,8 +69,8 @@ metadata:
spec:
agent:
configuration:
awsRegion: ${REGION}
instanceIds: \${${CLUSTER_NAME}-vms.ids}
awsRegion: ${AWS_REGION}
instanceIds: \${${CLUSTER_NAME}-vms.instanceIds}
migrateToVersion: ${STARTING_VERSION}
tufRepo:
metadataUrl: ${METADATA_URL}
Expand Down Expand Up @@ -114,6 +114,7 @@ spec:
name: agent
image: ${VSPHERE_K8S_CLUSTER_RESOURCE_AGENT_IMAGE_URI}
keepRunning: true
privileged: true
configuration:
controlPlaneEndpointIp: ${CONTROL_PLANE_ENDPOINT_IP}
creationPolicy: ifNotExists
Expand All @@ -124,12 +125,12 @@ spec:
metadataUrl: ${METADATA_URL}
targetsUrl: ${TARGETS_URL}
version: ${K8S_VERSION}
vcenterDatacenter: ${VCENTER_DATACENTER}
vcenterDatastore: ${VCENTER_DATASTORE}
vcenterHostUrl: ${VCENTER_HOST_URL}
vcenterNetwork: ${VCENTER_NETWORK}
vcenterResourcePool: ${VCENTER_RESOURCE_POOL}
vcenterWorkloadFolder: ${VCENTER_WORKLOAD_FOLDER}
vcenterDatacenter: ${GOVC_DATACENTER}
vcenterDatastore: ${GOVC_DATASTORE}
vcenterHostUrl: ${GOVC_URL}
vcenterNetwork: ${GOVC_NETWORK}
vcenterResourcePool: ${GOVC_RESOURCE_POOL}
vcenterWorkloadFolder: ${GOVC_FOLDER}
secrets:
vsphereCredentials: vsphere-creds
dependsOn: []
Expand All @@ -155,12 +156,12 @@ spec:
tufRepo:
metadataUrl: ${METADATA_URL}
targetsUrl: ${TARGETS_URL}
vcenterDatacenter: ${VCENTER_DATACENTER}
vcenterDatastore: ${VCENTER_DATASTORE}
vcenterHostUrl: ${VCENTER_HOST_URL}
vcenterNetwork: ${VCENTER_NETWORK}
vcenterResourcePool: ${VCENTER_RESOURCE_POOL}
vcenterWorkloadFolder: ${VCENTER_WORKLOAD_FOLDER}
vcenterDatacenter: ${GOVC_DATACENTER}
vcenterDatastore: ${GOVC_DATASTORE}
vcenterHostUrl: ${GOVC_URL}
vcenterNetwork: ${GOVC_NETWORK}
vcenterResourcePool: ${GOVC_RESOURCE_POOL}
vcenterWorkloadFolder: ${GOVC_FOLDER}
vmCount: 2
secrets:
vsphereCredentials: vsphere-creds
Expand Down
25 changes: 13 additions & 12 deletions bottlerocket/samples/eks/vmware-sonobuoy-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ spec:
name: agent
image: ${VSPHERE_K8S_CLUSTER_RESOURCE_AGENT_IMAGE_URI}
keepRunning: true
privileged: true
configuration:
controlPlaneEndpointIp: ${CONTROL_PLANE_ENDPOINT_IP}
creationPolicy: ifNotExists
Expand All @@ -38,12 +39,12 @@ spec:
metadataUrl: ${METADATA_URL}
targetsUrl: ${TARGETS_URL}
version: ${K8S_VERSION}
vcenterDatacenter: ${VCENTER_DATACENTER}
vcenterDatastore: ${VCENTER_DATASTORE}
vcenterHostUrl: ${VCENTER_HOST_URL}
vcenterNetwork: ${VCENTER_NETWORK}
vcenterResourcePool: ${VCENTER_RESOURCE_POOL}
vcenterWorkloadFolder: ${VCENTER_WORKLOAD_FOLDER}
vcenterDatacenter: ${GOVC_DATACENTER}
vcenterDatastore: ${GOVC_DATASTORE}
vcenterHostUrl: ${GOVC_URL}
vcenterNetwork: ${GOVC_NETWORK}
vcenterResourcePool: ${GOVC_RESOURCE_POOL}
vcenterWorkloadFolder: ${GOVC_FOLDER}
secrets:
vsphereCredentials: vsphere-creds
dependsOn: []
Expand All @@ -69,12 +70,12 @@ spec:
tufRepo:
metadataUrl: ${METADATA_URL}
targetsUrl: ${TARGETS_URL}
vcenterDatacenter: ${VCENTER_DATACENTER}
vcenterDatastore: ${VCENTER_DATASTORE}
vcenterHostUrl: ${VCENTER_HOST_URL}
vcenterNetwork: ${VCENTER_NETWORK}
vcenterResourcePool: ${VCENTER_RESOURCE_POOL}
vcenterWorkloadFolder: ${VCENTER_WORKLOAD_FOLDER}
vcenterDatacenter: ${GOVC_DATACENTER}
vcenterDatastore: ${GOVC_DATASTORE}
vcenterHostUrl: ${GOVC_URL}
vcenterNetwork: ${GOVC_NETWORK}
vcenterResourcePool: ${GOVC_RESOURCE_POOL}
vcenterWorkloadFolder: ${GOVC_FOLDER}
vmCount: 2
secrets:
vsphereCredentials: vsphere-creds
Expand Down
25 changes: 13 additions & 12 deletions bottlerocket/samples/kind/vmware-sonobuoy-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ spec:
name: agent
image: ${VSPHERE_K8S_CLUSTER_RESOURCE_AGENT_IMAGE_URI}
keepRunning: true
privileged: true
configuration:
controlPlaneEndpointIp: ${CONTROL_PLANE_ENDPOINT_IP}
creationPolicy: ifNotExists
Expand All @@ -38,12 +39,12 @@ spec:
metadataUrl: ${METADATA_URL}
targetsUrl: ${TARGETS_URL}
version: ${K8S_VERSION}
vcenterDatacenter: ${VCENTER_DATACENTER}
vcenterDatastore: ${VCENTER_DATASTORE}
vcenterHostUrl: ${VCENTER_HOST_URL}
vcenterNetwork: ${VCENTER_NETWORK}
vcenterResourcePool: ${VCENTER_RESOURCE_POOL}
vcenterWorkloadFolder: ${VCENTER_WORKLOAD_FOLDER}
vcenterDatacenter: ${GOVC_DATACENTER}
vcenterDatastore: ${GOVC_DATASTORE}
vcenterHostUrl: ${GOVC_URL}
vcenterNetwork: ${GOVC_NETWORK}
vcenterResourcePool: ${GOVC_RESOURCE_POOL}
vcenterWorkloadFolder: ${GOVC_FOLDER}
secrets:
vsphereCredentials: vsphere-creds
dependsOn: []
Expand All @@ -69,12 +70,12 @@ spec:
tufRepo:
metadataUrl: ${METADATA_URL}
targetsUrl: ${TARGETS_URL}
vcenterDatacenter: ${VCENTER_DATACENTER}
vcenterDatastore: ${VCENTER_DATASTORE}
vcenterHostUrl: ${VCENTER_HOST_URL}
vcenterNetwork: ${VCENTER_NETWORK}
vcenterResourcePool: ${VCENTER_RESOURCE_POOL}
vcenterWorkloadFolder: ${VCENTER_WORKLOAD_FOLDER}
vcenterDatacenter: ${GOVC_DATACENTER}
vcenterDatastore: ${GOVC_DATASTORE}
vcenterHostUrl: ${GOVC_URL}
vcenterNetwork: ${GOVC_NETWORK}
vcenterResourcePool: ${GOVC_RESOURCE_POOL}
vcenterWorkloadFolder: ${GOVC_FOLDER}
vmCount: 2
secrets:
vsphereCredentials: vsphere-creds
Expand Down
6 changes: 3 additions & 3 deletions bottlerocket/types/src/agent_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,7 +807,7 @@ mod test {
fn vmware_migration_test() {
let s = read_eks_file("vmware-migration-test.yaml");
let s = s
.replace("\\${${CLUSTER_NAME}-vms.ids}", r#"["a", "b", "c"]"#)
.replace("\\${${CLUSTER_NAME}-vms.instanceIds}", r#"["a", "b", "c"]"#)
.replace("\\${${CLUSTER_NAME}.publicSubnetIds}", r#"["a", "b", "c"]"#)
.replace("\\${${CLUSTER_NAME}.securityGroups}", r#"["a", "b", "c"]"#)
.replace("${K8S_VERSION}", "v1.24")
Expand Down Expand Up @@ -870,7 +870,7 @@ mod test {
fn vmware_sonobuoy_test() {
let s = read_eks_file("vmware-sonobuoy-test.yaml");
let s = s
.replace("\\${${CLUSTER_NAME}-vms.ids}", r#"["a", "b", "c"]"#)
.replace("\\${${CLUSTER_NAME}-vms.instanceIds}", r#"["a", "b", "c"]"#)
.replace("\\${${CLUSTER_NAME}.publicSubnetIds}", r#"["a", "b", "c"]"#)
.replace("\\${${CLUSTER_NAME}.securityGroups}", r#"["a", "b", "c"]"#)
.replace("${K8S_VERSION}", "v1.24")
Expand Down Expand Up @@ -1003,7 +1003,7 @@ mod test {
fn vmware_sonobuoy_test_kind() {
let s = read_kind_file("vmware-sonobuoy-test.yaml");
let s = s
.replace("\\${${CLUSTER_NAME}-vms.ids}", r#"["a", "b", "c"]"#)
.replace("\\${${CLUSTER_NAME}-vms.instanceIds}", r#"["a", "b", "c"]"#)
.replace("\\${${CLUSTER_NAME}.publicSubnetIds}", r#"["a", "b", "c"]"#)
.replace(
"\\\\${${CLUSTER_NAME}.securityGroups}",
Expand Down