Skip to content
Merged
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
10 changes: 10 additions & 0 deletions scripts/kind-build-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,16 @@ for crd_file in $service_config_dir/crd/common/bases; do
done
echo "ok."

echo -n "creating ack-system namespace"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One questions:

  1. deployment.yaml file in kustomize tries to kubectl apply ack-system namespace again? Did you any error/warning for that when running test locally?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kustomize doesn't care - it just overwrites it with the same value.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vijtrip2 What @RedbackThomson said is correct, since this is creating the namespace the same way as in the deployment.yaml there aren't any issues/warnings/errors. Below are the logs for clarity, meant to add them to the PR but forgot.

creating ack-system namespacenamespace/ack-system created
loading RBAC manifests for s3 into the cluster ... ok.
loading service controller Deployment for s3 into the cluster ...ok.

kubectl apply -f - <<'EOF'
apiVersion: v1
kind: Namespace
metadata:
labels:
control-plane: controller
name: ack-system
EOF

echo -n "loading RBAC manifests for $AWS_SERVICE into the cluster ... "
kustomize build "$service_config_dir"/rbac | kubectl apply -f - 1>/dev/null
echo "ok."
Expand Down
6 changes: 0 additions & 6 deletions scripts/kind-two-node-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,5 @@ kind: Cluster
apiVersion: kind.x-k8s.io/v1alpha4
nodes:
- role: control-plane
kubeadmConfigPatches:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any reason for removing this?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adam and I were trying to debug an issue with his KIND cluster not being created properly. I noticed this unnecessary config patch for the cluster and we deleted it just to make sure it wasn't affecting him. It's not necessary for the e2e tests, so we figured we'd just leave it out.

- |
apiVersion: kubeadm.k8s.io/v1beta2
kind: ClusterConfiguration
metadata:
name: config
- role: worker

12 changes: 6 additions & 6 deletions scripts/provision-kind-cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ else
KIND_CONFIG_FILE="$SCRIPTS_DIR/kind-two-node-cluster.yaml"
fi

K8_1_21="kindest/node:v1.21.1@sha256:f2b782464e6c368487071ed114bc37d7f033658bfa27666f47629c6cf2d515c7"
K8_1_18="kindest/node:v1.18.4@sha256:9ddbe5ba7dad96e83aec914feae9105ac1cffeb6ebd0d5aa42e820defe840fd4"
K8_1_17="kindest/node:v1.17.5@sha256:ab3f9e6ec5ad8840eeb1f76c89bb7948c77bbf76bcebe1a8b59790b8ae9a283a"
K8_1_16="kindest/node:v1.16.9@sha256:7175872357bc85847ec4b1aba46ed1d12fa054c83ac7a8a11f5c268957fd5765"
K8_1_15="kindest/node:v1.15.11@sha256:6cc31f3533deb138792db2c7d1ffc36f7456a06f1db5556ad3b6927641016f50"
K8_1_14="kindest/node:v1.14.10@sha256:6cd43ff41ae9f02bb46c8f455d5323819aec858b99534a290517ebc181b443c6"
K8_1_21="kindest/node:v1.21.1"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

K8_1_18="kindest/node:v1.18.4"
K8_1_17="kindest/node:v1.17.5"
K8_1_16="kindest/node:v1.16.9"
K8_1_15="kindest/node:v1.15.11"
K8_1_14="kindest/node:v1.14.10"

USAGE="
Usage:
Expand Down