Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
Signed-off-by: Eddie Torres <[email protected]>
  • Loading branch information
torredil committed Dec 13, 2023
1 parent 1aa09de commit 87682d0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 12 deletions.
14 changes: 6 additions & 8 deletions hack/e2e/kops.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,12 @@ function kops_create_cluster() {
ZONES=${3}
NODE_COUNT=${4}
INSTANCE_TYPE=${5}
AMI_ID=${6}
K8S_VERSION=${7}
CLUSTER_FILE=${8}
KUBECONFIG=${9}
KOPS_PATCH_FILE=${10}
KOPS_PATCH_NODE_FILE=${11}
KOPS_STATE_FILE=${12}
K8S_VERSION=${6}
CLUSTER_FILE=${7}
KUBECONFIG=${8}
KOPS_PATCH_FILE=${9}
KOPS_PATCH_NODE_FILE=${10}
KOPS_STATE_FILE=${11}

if kops_cluster_exists "${CLUSTER_NAME}" "${BIN}" "${KOPS_STATE_FILE}"; then
loudecho "Replacing cluster $CLUSTER_NAME with $CLUSTER_FILE"
Expand All @@ -45,7 +44,6 @@ function kops_create_cluster() {
--zones "${ZONES}" \
--node-count="${NODE_COUNT}" \
--node-size="${INSTANCE_TYPE}" \
--image="${AMI_ID}" \
--kubernetes-version="${K8S_VERSION}" \
--dry-run \
-o yaml \
Expand Down
5 changes: 1 addition & 4 deletions hack/e2e/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,8 @@ K8S_VERSION_EKSCTL=${K8S_VERSION_EKSCTL:-${K8S_VERSION:-1.28}}

KOPS_VERSION=${KOPS_VERSION:-1.28.0}
KOPS_STATE_FILE=${KOPS_STATE_FILE:-s3://k8s-kops-csi-shared-e2e}
KOPS_PATCH_FILE=${KOPS_PATCH_FILE:-./hack/kops-patch.yaml}
KOPS_PATCH_FILE=${KOsPS_PATCH_FILE:-./hack/kops-patch.yaml}
KOPS_PATCH_NODE_FILE=${KOPS_PATCH_NODE_FILE:-./hack/kops-patch-node.yaml}
AMI_PARAMETER=${AMI_PARAMETER:-/aws/service/ami-amazon-linux-latest/al2023-ami-kernel-default-x86_64}
AMI_ID=$(aws ssm get-parameters --names ${AMI_PARAMETER} --region ${REGION} --query 'Parameters[0].Value' --output text)

EKSCTL_VERSION=${EKSCTL_VERSION:-0.164.0}
EKSCTL_PATCH_FILE=${EKSCTL_PATCH_FILE:-./hack/eksctl-patch.yaml}
Expand Down Expand Up @@ -149,7 +147,6 @@ if [[ "${CLUSTER_TYPE}" == "kops" ]]; then
"$ZONES" \
"$NODE_COUNT" \
"$INSTANCE_TYPE" \
"$AMI_ID" \
"$K8S_VERSION_KOPS" \
"$CLUSTER_FILE" \
"$KUBECONFIG" \
Expand Down

0 comments on commit 87682d0

Please sign in to comment.