Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion tests/e2e/scenarios/upgrade-ab/run-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ fi

export KOPS_BASE_URL

# Configure a gossip cluster: cluster name must end in .k8s.local. The kubetest2
# deployer builds the auto-generated cluster name as <jobname>.${KOPS_DNS_DOMAIN}
# for AWS when --dns=none is not in create-args, so overriding KOPS_DNS_DOMAIN
# yields a .k8s.local suffix without changing the rest of the name.
export KOPS_DNS_DOMAIN="tests-kops-aws.k8s.local"

echo "Cleaning up any leaked resources from previous cluster"
# For KOPS_VERSION_B, the value "latest" means build of the tree
if [[ "${KOPS_VERSION_B}" == "latest" ]]; then
Expand Down Expand Up @@ -93,7 +99,7 @@ ${KUBETEST2} \
--kubernetes-version="${K8S_VERSION_A}" \
--control-plane-size="${KOPS_CONTROL_PLANE_COUNT:-1}" \
--template-path="${KOPS_TEMPLATE:-}" \
--create-args="--networking calico ${KOPS_EXTRA_FLAGS:-}"
--create-args="--networking cilium --api-loadbalancer-type=public ${KOPS_EXTRA_FLAGS:-}"

# Source the env file to get exported variables, in particular CLUSTER_NAME and KOPS_STATE_STORE
# shellcheck disable=SC1091
Expand Down
6 changes: 3 additions & 3 deletions tests/e2e/templates/many-addons.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
authorization:
rbac: {}
awsLoadBalancerController:
enabled: true
enabled: false
kubernetesApiAccess:
- {{.publicIP}}
certManager:
Expand Down Expand Up @@ -54,7 +54,7 @@ spec:
nodeProblemDetector:
enabled: true
nodeTerminationHandler:
enabled: true
enabled: false
enableSQSTerminationDraining: true
nonMasqueradeCIDR: 100.64.0.0/10
podIdentityWebhook:
Expand All @@ -72,7 +72,7 @@ spec:
maxSurge: "100%"
topology:
dns:
type: None
type: Private
---

apiVersion: kops.k8s.io/v1alpha2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ spec:
k8s-app: dns-controller
version: {{ KopsVersionForLabel }}
spec:
priorityClassName: system-cluster-critical
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
Expand Down
Loading