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.

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

Make KinD api port configurable, add overrides for agent deployment #835

Merged
merged 1 commit into from
Jul 22, 2024
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
3 changes: 3 additions & 0 deletions src/test/config/kind/common-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ DC_APP_REPLACEME:
additionalEnvironmentVariables:
- name: PLUGIN_SSH_BASEURL
value: ssh://bitbucket.172.17.0.1.nip.io:2222
# this is for Bamboo to use the right login url
- name: BUILD_NUMBER
value: "100100"

# non existing props will be ignored, so it's safe to set them for all products
# these extra sys properties are mostly for the functional tests
Expand Down
3 changes: 3 additions & 0 deletions src/test/config/kind/kind-config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
kind: Cluster
apiVersion: kind.x-k8s.io/v1alpha4
networking:
apiServerAddress: "127.0.0.1"
apiServerPort: 6443
nodes:
- role: control-plane
# this is required due to weird nginx controller behavior where it needs to redirect smth to
Expand Down
2 changes: 1 addition & 1 deletion src/test/scripts/kind/configure_kind.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ echo "[INFO]: Deploy Nginx ingress controller"
kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/kind/deploy.yaml
kubectl wait --for=condition=ready pod \
--selector=app.kubernetes.io/component=controller \
--timeout=180s \
--timeout=300s \
-n ingress-nginx

# this is for local runs, because existing nfs server images does not run on arm64 platforms
Expand Down
4 changes: 3 additions & 1 deletion src/test/scripts/kind/deploy_app.sh
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,9 @@ deploy_app() {
--set agent.resources.container.requests.cpu=20m \
--set agent.resources.container.requests.memory=10Mi \
${OPENSHIFT_VALUES} \
--wait --timeout=180s --debug
${AGENT_OVERRIDES} \
--wait --timeout=180s \
--debug
fi

# Deploy Bitbucket Mirror in KinD only. MicroShift can't handle too many pods/processes
Expand Down
Loading