Skip to content

Mount config and deployments dirs to smoke containers #5740

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.

Sign up for GitHub

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

Merged
merged 10 commits into from
Jun 13, 2024
Merged

Mount config and deployments dirs to smoke containers #5740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bf89783
mount config and deployments dirs to smoke containers
oseoin Jun 13, 2024
cd907db
mount in makefile as well
oseoin Jun 13, 2024
1e1bac9
catch nil namespaceinformer
oseoin Jun 13, 2024
b1e84c4
nil check in task queue
oseoin Jun 13, 2024
47d0ad3
test remove deployment mount
oseoin Jun 13, 2024
2eaec33
invert test mounts
oseoin Jun 13, 2024
da48079
invert test mounts
oseoin Jun 13, 2024
7bdfe85
Merge branch 'main' into remove-hardcoded-config-dir
oseoin Jun 13, 2024
99a8372
test conditional crs in scaling
oseoin Jun 13, 2024
fa77397
Merge branch 'remove-hardcoded-config-dir' of github.com:nginxinc/kub…
oseoin Jun 13, 2024
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
2 changes: 2 additions & 0 deletions .github/actions/smoke-tests/action.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ runs:
--name test-runner-${{ github.run_id }} \
--network=kind \
-v ${{ github.workspace }}/tests:/workspace/tests \
-v ${{ github.workspace }}/deployments:/workspace/deployments \
-v ${{ github.workspace }}/config:/workspace/config \
-v ~/.kube/kind/config:/root/.kube/config ${{ inputs.test-image }} \
--context=kind-${{ github.run_id }} \
--image=${{ inputs.image-name }}:${{ inputs.tag }} \
Expand Down
17 changes: 10 additions & 7 deletions internal/k8s/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -944,15 +944,18 @@ func (lbc *LoadBalancerController) updateNumberOfIngressControllerReplicas(contr
}

// handle virtualservers
resources = lbc.findVirtualServersUsingRatelimitScaling()
resourceExes = lbc.createExtendedResources(resources)
for _, vserver := range resourceExes.VirtualServerExes {
found = true
_, err := lbc.configurator.AddOrUpdateVirtualServer(vserver)
if err != nil {
glog.Errorf("Error updating ratelimit for VirtualServer %s/%s: %s", vserver.VirtualServer.Namespace, vserver.VirtualServer.Name, err)
if lbc.areCustomResourcesEnabled {
resources = lbc.findVirtualServersUsingRatelimitScaling()
resourceExes = lbc.createExtendedResources(resources)
for _, vserver := range resourceExes.VirtualServerExes {
found = true
_, err := lbc.configurator.AddOrUpdateVirtualServer(vserver)
if err != nil {
glog.Errorf("Error updating ratelimit for VirtualServer %s/%s: %s", vserver.VirtualServer.Namespace, vserver.VirtualServer.Name, err)
}
}
}

}
return found
}
Expand Down
2 changes: 2 additions & 0 deletions tests/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ run-tests-in-kind: ## Run tests in Kind
docker run --network=kind --rm \
-v $(KIND_KUBE_CONFIG_FOLDER):/root/.kube \
-v $(ROOT_DIR)/tests:/workspace/tests \
-v $(ROOT_DIR)/deployments:/workspace/deployments \
-v $(ROOT_DIR)/config:/workspace/config \
$(TEST_PREFIX):$(TEST_TAG) \
--context=kind-$(strip $(K8S_CLUSTER_NAME)) \
--image=$(BUILD_IMAGE) --image-pull-policy=$(PULL_POLICY) \
Expand Down