Skip to content

Commit

Permalink
samples: small fixes to Makefile variables
Browse files Browse the repository at this point in the history
  • Loading branch information
@mjsterckx
mjsterckx committed Feb 3, 2023
1 parent 838b5bb commit 9c3613c
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 50 deletions.
19 changes: 5 additions & 14 deletions bottlerocket/samples/Makefile.toml
View file
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
24 changes: 12 additions & 12 deletions bottlerocket/samples/eks/vmware-migration-test.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,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 +155,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
24 changes: 12 additions & 12 deletions bottlerocket/samples/eks/vmware-sonobuoy-test.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,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 +69,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
24 changes: 12 additions & 12 deletions bottlerocket/samples/kind/vmware-sonobuoy-test.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,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 +69,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

0 comments on commit 9c3613c

Please sign in to comment.