Skip to content

Commit 17d1bbe

Browse files
committed
add graceful recovery tests to pipeline
1 parent f908851 commit 17d1bbe

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

.github/workflows/functional.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,3 +119,9 @@ jobs:
119119
ngf_tag=${{ steps.ngf-meta.outputs.version }}
120120
make test${{ inputs.image == 'plus' && '-with-plus' || ''}} PREFIX=${ngf_prefix} TAG=${ngf_tag} GINKGO_LABEL=telemetry
121121
working-directory: ./tests
122+
- name: Run Gracefule Recovery tests
123+
run: |
124+
ngf_prefix=ghcr.io/nginxinc/nginx-gateway-fabric
125+
ngf_tag=${{ steps.ngf-meta.outputs.version }}
126+
make test${{ inputs.image == 'plus' && '-with-plus' || ''}} PREFIX=${ngf_prefix} TAG=${ngf_tag} GINKGO_LABEL=graceful-recovery
127+
working-directory: ./tests

tests/graceful-recovery/graceful-recovery.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ Ensure that NGF can recover gracefully from container failures without any user
3434
3. Check out the latest tag (unless you are installing the edge version from the main branch).
3535
4. Go into `deploy/manifests/nginx-gateway.yaml` and change the following:
3636

37-
- `runAsNonRoot` from `true` to `false`: this allows us to insert our ephemeral container as root which enables us to restart the nginx-gateway container.
3837
- Add the `--product-telemetry-disable` argument to the nginx-gateway container args.
3938

4039
5. Follow the [installation instructions](https://github.com/nginxinc/nginx-gateway-fabric/blob/main/site/content/installation/installing-ngf/manifests.md)
@@ -130,7 +129,7 @@ to deploy NGINX Gateway Fabric using manifests and expose it through a LoadBalan
130129
#### Restart Node with draining
131130

132131
1. Switch over to a one-Node Kind cluster. Can run `make create-kind-cluster` from main directory.
133-
2. Run steps 4-11 of the [Setup](#setup) section above using
132+
2. Run steps 4-10 of the [Setup](#setup) section above using
134133
[this guide](https://docs.nginx.com/nginx-gateway-fabric/installation/running-on-kind/) for running on Kind.
135134
3. Ensure NGF and NGINX container logs are set up and traffic flows through the example application correctly.
136135
4. Drain the Node of its resources.

tests/suite/graceful_recovery_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const (
2828

2929
// Since checkContainerLogsForErrors may experience interference from previous tests (as explained in the function
3030
// documentation), this test is recommended to be run separate from other nfr tests.
31-
var _ = Describe("Graceful Recovery test", Ordered, Label("nfr", "graceful-recovery"), func() {
31+
var _ = Describe("Graceful Recovery test", Ordered, Label("graceful-recovery"), func() {
3232
files := []string{
3333
"graceful-recovery/cafe.yaml",
3434
"graceful-recovery/cafe-secret.yaml",

tests/suite/system_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func setup(cfg setupConfig, extraInstallArgs ...string) {
100100
Expect(apps.AddToScheme(scheme)).To(Succeed())
101101
Expect(apiext.AddToScheme(scheme)).To(Succeed())
102102
Expect(coordination.AddToScheme(scheme)).To(Succeed())
103-
Expect(v1.AddToScheme(scheme)).To(Succeed())
103+
Expect(v1.Install(scheme)).To(Succeed())
104104
Expect(batchv1.AddToScheme(scheme)).To(Succeed())
105105

106106
options := client.Options{

0 commit comments

Comments
 (0)