From 018d226df0237777d24894c1a71e9172e1f7580d Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 3 May 2022 22:54:08 -0400 Subject: [PATCH 01/30] spelling: annotations Signed-off-by: Josh Soref --- internal/configs/annotations.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/configs/annotations.go b/internal/configs/annotations.go index 777709d032..f2e2fdc929 100644 --- a/internal/configs/annotations.go +++ b/internal/configs/annotations.go @@ -252,7 +252,7 @@ func parseAnnotations(ingEx *IngressEx, baseCfgParams *ConfigParams, isPlus bool } if parsingErrors { - glog.Errorf("Ingress %s/%s: There are configuration issues with hsts annotations, skipping annotions for all hsts settings", ingEx.Ingress.GetNamespace(), ingEx.Ingress.GetName()) + glog.Errorf("Ingress %s/%s: There are configuration issues with hsts annotations, skipping annotations for all hsts settings", ingEx.Ingress.GetNamespace(), ingEx.Ingress.GetName()) } else { cfgParams.HSTS = hsts if existsMA { From dd49ab0b062ae71a322d006323542d7398a61603 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 3 May 2022 23:51:22 -0400 Subject: [PATCH 02/30] spelling: certificate Signed-off-by: Josh Soref --- tests/data/virtual-server-certmanager/certmanager.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/data/virtual-server-certmanager/certmanager.yaml b/tests/data/virtual-server-certmanager/certmanager.yaml index fa140bcb68..cab627397d 100644 --- a/tests/data/virtual-server-certmanager/certmanager.yaml +++ b/tests/data/virtual-server-certmanager/certmanager.yaml @@ -4557,7 +4557,7 @@ rules: --- # Source: cert-manager/templates/rbac.yaml # Permission to: -# - Update and sign CertificatSigningeRequests referencing cert-manager.io Issuers and ClusterIssuers +# - Update and sign CertificateSigningeRequests referencing cert-manager.io Issuers and ClusterIssuers # - Perform SubjectAccessReviews to test whether users are able to reference Namespaced Issuers apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole From 71834e353c008c3551dd8520c3d05f62b56a53b8 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 3 May 2022 23:50:28 -0400 Subject: [PATCH 03/30] spelling: coffee Signed-off-by: Josh Soref --- internal/configs/ingress_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/configs/ingress_test.go b/internal/configs/ingress_test.go index 8a094f7522..fc99b3aebc 100644 --- a/internal/configs/ingress_test.go +++ b/internal/configs/ingress_test.go @@ -416,7 +416,7 @@ func TestGenerateNginxCfgForMergeableIngressesForJWT(t *testing.T) { mergeableIngresses.Minions[0].Ingress.Annotations["nginx.com/jwt-key"] = "coffee-jwk" mergeableIngresses.Minions[0].Ingress.Annotations["nginx.com/jwt-realm"] = "Coffee" mergeableIngresses.Minions[0].Ingress.Annotations["nginx.com/jwt-token"] = "$cookie_auth_token_coffee" - mergeableIngresses.Minions[0].Ingress.Annotations["nginx.com/jwt-login-url"] = "https://login.cofee.example.com" + mergeableIngresses.Minions[0].Ingress.Annotations["nginx.com/jwt-login-url"] = "https://login.coffee.example.com" mergeableIngresses.Minions[0].SecretRefs["coffee-jwk"] = &secrets.SecretReference{ Secret: &v1.Secret{ Type: secrets.SecretTypeJWK, @@ -446,7 +446,7 @@ func TestGenerateNginxCfgForMergeableIngressesForJWT(t *testing.T) { }, { Name: "@login_url_default-cafe-ingress-coffee-minion", - LoginURL: "https://login.cofee.example.com", + LoginURL: "https://login.coffee.example.com", }, } From 6db850d63c4af31758ffded7b632ea6546e78bad Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 3 May 2022 23:50:29 -0400 Subject: [PATCH 04/30] spelling: configurable Signed-off-by: Josh Soref --- tests/suite/test_transport_server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/suite/test_transport_server.py b/tests/suite/test_transport_server.py index 564b97adb9..bbc1ed810a 100644 --- a/tests/suite/test_transport_server.py +++ b/tests/suite/test_transport_server.py @@ -66,7 +66,7 @@ def test_snippets( and "limit_conn addr 1;" in conf # server-snippets ) - def test_configurble_timeout_directives( + def test_configurable_timeout_directives( self, kube_apis, crd_ingress_controller, transport_server_setup, ingress_controller_prerequisites ): """ From f89530137bcd3da8fff2321d1299dec6b5ed22f7 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 3 May 2022 23:50:29 -0400 Subject: [PATCH 05/30] spelling: configurations Signed-off-by: Josh Soref --- internal/k8s/configuration_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/k8s/configuration_test.go b/internal/k8s/configuration_test.go index 70d7d318b7..141ad9ebfa 100644 --- a/internal/k8s/configuration_test.go +++ b/internal/k8s/configuration_test.go @@ -3357,7 +3357,7 @@ func TestGetTransportServerMetrics(t *testing.T) { } } -func TestIsEqualForIngressConfigurationes(t *testing.T) { +func TestIsEqualForIngressConfigurations(t *testing.T) { regularIng := createTestIngress("regular-ingress", "foo.example.com") ingConfigWithInvalidHost := NewRegularIngressConfiguration(regularIng) From 8a0152c2964bdff04d148836d2f85e76822c0968 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 3 May 2022 23:50:30 -0400 Subject: [PATCH 06/30] spelling: defines Signed-off-by: Josh Soref --- .../common/crds/appprotectdos.f5.com_dosprotectedresources.yaml | 2 +- .../crds/appprotectdos.f5.com_dosprotectedresources.yaml | 2 +- pkg/apis/dos/v1beta1/types.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deployments/common/crds/appprotectdos.f5.com_dosprotectedresources.yaml b/deployments/common/crds/appprotectdos.f5.com_dosprotectedresources.yaml index 0c6f16b970..275438cc77 100644 --- a/deployments/common/crds/appprotectdos.f5.com_dosprotectedresources.yaml +++ b/deployments/common/crds/appprotectdos.f5.com_dosprotectedresources.yaml @@ -31,7 +31,7 @@ spec: metadata: type: object spec: - description: DosProtectedResourceSpec deines the properties and values a DosProtectedResource can have. + description: DosProtectedResourceSpec defines the properties and values a DosProtectedResource can have. type: object properties: apDosMonitor: diff --git a/deployments/helm-chart/crds/appprotectdos.f5.com_dosprotectedresources.yaml b/deployments/helm-chart/crds/appprotectdos.f5.com_dosprotectedresources.yaml index 0c6f16b970..275438cc77 100644 --- a/deployments/helm-chart/crds/appprotectdos.f5.com_dosprotectedresources.yaml +++ b/deployments/helm-chart/crds/appprotectdos.f5.com_dosprotectedresources.yaml @@ -31,7 +31,7 @@ spec: metadata: type: object spec: - description: DosProtectedResourceSpec deines the properties and values a DosProtectedResource can have. + description: DosProtectedResourceSpec defines the properties and values a DosProtectedResource can have. type: object properties: apDosMonitor: diff --git a/pkg/apis/dos/v1beta1/types.go b/pkg/apis/dos/v1beta1/types.go index fa205102ee..b5c5cb96e2 100644 --- a/pkg/apis/dos/v1beta1/types.go +++ b/pkg/apis/dos/v1beta1/types.go @@ -15,7 +15,7 @@ type DosProtectedResource struct { Spec DosProtectedResourceSpec `json:"spec"` } -// DosProtectedResourceSpec deines the properties and values a DosProtectedResource can have. +// DosProtectedResourceSpec defines the properties and values a DosProtectedResource can have. type DosProtectedResourceSpec struct { // Enable enables the DOS feature if set to true Enable bool `json:"enable"` From c8e26679f8cc2a7775f2e58bb20e6d6ef64ccaac Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 3 May 2022 23:50:31 -0400 Subject: [PATCH 07/30] spelling: endpoints Signed-off-by: Josh Soref --- internal/k8s/utils.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/k8s/utils.go b/internal/k8s/utils.go index 4c1e192470..15aea992bc 100644 --- a/internal/k8s/utils.go +++ b/internal/k8s/utils.go @@ -83,7 +83,7 @@ func (ipl indexerToPodLister) ListByNamespace(ns string, selector labels.Selecto return pods, err } -// storeToEndpointLister makes a Store that lists Endponts +// storeToEndpointLister makes a Store that lists Endpoints type storeToEndpointLister struct { cache.Store } From 4c186baed85643990e555bafa44ba934e66f2eb7 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 3 May 2022 23:50:32 -0400 Subject: [PATCH 08/30] spelling: factory Signed-off-by: Josh Soref --- internal/k8s/controller.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/k8s/controller.go b/internal/k8s/controller.go index ed8762e3a5..61b223e679 100644 --- a/internal/k8s/controller.go +++ b/internal/k8s/controller.go @@ -102,7 +102,7 @@ type LoadBalancerController struct { restConfig *rest.Config cacheSyncs []cache.InformerSynced sharedInformerFactory informers.SharedInformerFactory - confSharedInformerFactorry k8s_nginx_informers.SharedInformerFactory + confSharedInformerFactory k8s_nginx_informers.SharedInformerFactory configMapController cache.Controller dynInformerFactory dynamicinformer.DynamicSharedInformerFactory globalConfigurationController cache.Controller @@ -269,7 +269,7 @@ func NewLoadBalancerController(input NewLoadBalancerControllerInput) *LoadBalanc lbc.addPodHandler() if lbc.areCustomResourcesEnabled { - lbc.confSharedInformerFactorry = k8s_nginx_informers.NewSharedInformerFactoryWithOptions(lbc.confClient, input.ResyncPeriod, k8s_nginx_informers.WithNamespace(lbc.namespace)) + lbc.confSharedInformerFactory = k8s_nginx_informers.NewSharedInformerFactoryWithOptions(lbc.confClient, input.ResyncPeriod, k8s_nginx_informers.WithNamespace(lbc.namespace)) lbc.addVirtualServerHandler(createVirtualServerHandlers(lbc)) lbc.addVirtualServerRouteHandler(createVirtualServerRouteHandlers(lbc)) @@ -413,7 +413,7 @@ func (lbc *LoadBalancerController) addAppProtectDosLogConfHandler(handlers cache // addAppProtectDosLogConfHandler creates dynamic informer for custom appprotectdos logging config resource func (lbc *LoadBalancerController) addAppProtectDosProtectedResourceHandler(handlers cache.ResourceEventHandlerFuncs) { - informer := lbc.confSharedInformerFactorry.Appprotectdos().V1beta1().DosProtectedResources().Informer() + informer := lbc.confSharedInformerFactory.Appprotectdos().V1beta1().DosProtectedResources().Informer() informer.AddEventHandler(handlers) lbc.appProtectDosProtectedLister = informer.GetStore() @@ -479,7 +479,7 @@ func (lbc *LoadBalancerController) addPodHandler() { } func (lbc *LoadBalancerController) addVirtualServerHandler(handlers cache.ResourceEventHandlerFuncs) { - informer := lbc.confSharedInformerFactorry.K8s().V1().VirtualServers().Informer() + informer := lbc.confSharedInformerFactory.K8s().V1().VirtualServers().Informer() informer.AddEventHandler(handlers) lbc.virtualServerLister = informer.GetStore() @@ -487,7 +487,7 @@ func (lbc *LoadBalancerController) addVirtualServerHandler(handlers cache.Resour } func (lbc *LoadBalancerController) addVirtualServerRouteHandler(handlers cache.ResourceEventHandlerFuncs) { - informer := lbc.confSharedInformerFactorry.K8s().V1().VirtualServerRoutes().Informer() + informer := lbc.confSharedInformerFactory.K8s().V1().VirtualServerRoutes().Informer() informer.AddEventHandler(handlers) lbc.virtualServerRouteLister = informer.GetStore() @@ -495,7 +495,7 @@ func (lbc *LoadBalancerController) addVirtualServerRouteHandler(handlers cache.R } func (lbc *LoadBalancerController) addPolicyHandler(handlers cache.ResourceEventHandlerFuncs) { - informer := lbc.confSharedInformerFactorry.K8s().V1().Policies().Informer() + informer := lbc.confSharedInformerFactory.K8s().V1().Policies().Informer() informer.AddEventHandler(handlers) lbc.policyLister = informer.GetStore() @@ -517,7 +517,7 @@ func (lbc *LoadBalancerController) addGlobalConfigurationHandler(handlers cache. } func (lbc *LoadBalancerController) addTransportServerHandler(handlers cache.ResourceEventHandlerFuncs) { - informer := lbc.confSharedInformerFactorry.K8s().V1alpha1().TransportServers().Informer() + informer := lbc.confSharedInformerFactory.K8s().V1alpha1().TransportServers().Informer() informer.AddEventHandler(handlers) lbc.transportServerLister = informer.GetStore() @@ -562,7 +562,7 @@ func (lbc *LoadBalancerController) Run() { go lbc.configMapController.Run(lbc.ctx.Done()) } if lbc.areCustomResourcesEnabled { - go lbc.confSharedInformerFactorry.Start(lbc.ctx.Done()) + go lbc.confSharedInformerFactory.Start(lbc.ctx.Done()) } if lbc.watchGlobalConfiguration { go lbc.globalConfigurationController.Run(lbc.ctx.Done()) From 8a165c6640e3ce97e61163be1acc2a97e79de658 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 3 May 2022 22:41:13 -0400 Subject: [PATCH 09/30] spelling: github Signed-off-by: Josh Soref --- CHANGELOG.md | 34 ++++++++++++++++---------------- README.md | 2 +- hack/repo-changelog-template.txt | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a888105b8..602944e244 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,103 +2,103 @@ ### 2.2.0 -An automatically generated list of changes can be found on Github at: [2.2.0 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v2.2.0) +An automatically generated list of changes can be found on GitHub at: [2.2.0 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v2.2.0) A curated list of changes can be found on the [Releases](http://docs.nginx.com/nginx-ingress-controller/releases/) page on the NGINX Documentation website. ### 2.1.2 -An automatically generated list of changes can be found on Github at: [2.1.2 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v2.1.2) +An automatically generated list of changes can be found on GitHub at: [2.1.2 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v2.1.2) A curated list of changes can be found in the [Releases](http://docs.nginx.com/nginx-ingress-controller/releases/) page on NGINX Documentation website. ### 1.12.4 -An automatically generated list of changes can be found on Github at: [1.12.4 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.12.4) +An automatically generated list of changes can be found on GitHub at: [1.12.4 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.12.4) A curated list of changes can be found in the [Releases](http://docs.nginx.com/nginx-ingress-controller/releases/) page on NGINX Documentation website. ### 2.1.1 -An automatically generated list of changes can be found on Github at: [2.1.1 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v2.1.1) +An automatically generated list of changes can be found on GitHub at: [2.1.1 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v2.1.1) A curated list of changes can be found in the [Releases](http://docs.nginx.com/nginx-ingress-controller/releases/) page on NGINX Documentation website. ### 2.1.0 -An automatically generated list of changes can be found on Github at: [2.1.0 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v2.1.0) +An automatically generated list of changes can be found on GitHub at: [2.1.0 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v2.1.0) A curated list of changes can be found in the [Releases](http://docs.nginx.com/nginx-ingress-controller/releases/) page on NGINX Documentation website. ### 2.0.3 -An automatically generated list of changes can be found on Github at: [2.0.3 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v2.0.3) +An automatically generated list of changes can be found on GitHub at: [2.0.3 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v2.0.3) A curated list of changes can be found in the [Releases](http://docs.nginx.com/nginx-ingress-controller/releases/) page on NGINX Documentation website. ### 1.12.3 -An automatically generated list of changes can be found on Github at: [1.12.3 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.12.3) +An automatically generated list of changes can be found on GitHub at: [1.12.3 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.12.3) A curated list of changes can be found in the [Releases](http://docs.nginx.com/nginx-ingress-controller/releases/) page on NGINX Documentation website. ### 2.0.2 -An automatically generated list of changes can be found on Github at: [2.0.2 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v2.0.2) +An automatically generated list of changes can be found on GitHub at: [2.0.2 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v2.0.2) A curated list of changes can be found in the [Releases](http://docs.nginx.com/nginx-ingress-controller/releases/) page on NGINX Documentation website. ### 2.0.1 -An automatically generated list of changes can be found on Github at: [2.0.1 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v2.0.1) +An automatically generated list of changes can be found on GitHub at: [2.0.1 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v2.0.1) A curated list of changes can be found in the [Releases](http://docs.nginx.com/nginx-ingress-controller/releases/) page on NGINX Documentation website. ### 1.12.2 -An automatically generated list of changes can be found on Github at: [1.12.2 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.12.2) +An automatically generated list of changes can be found on GitHub at: [1.12.2 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.12.2) A curated list of changes can be found in the [Releases](http://docs.nginx.com/nginx-ingress-controller/releases/) page on NGINX Documentation website. ### 2.0.0 -An automatically generated list of changes can be found on Github at: [2.0.0 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v2.0.0) +An automatically generated list of changes can be found on GitHub at: [2.0.0 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v2.0.0) A curated list of changes can be found in the [Releases](http://docs.nginx.com/nginx-ingress-controller/releases/) page on NGINX Documentation website. ### 1.12.1 -An automatically generated list of changes can be found on Github at: [1.12.1 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.12.1) +An automatically generated list of changes can be found on GitHub at: [1.12.1 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.12.1) A curated list of changes can be found in the [Releases](http://docs.nginx.com/nginx-ingress-controller/releases/) page on NGINX Documentation website. ### 1.12.0 -An automatically generated list of changes can be found on Github at: [1.12.0 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.12.0) +An automatically generated list of changes can be found on GitHub at: [1.12.0 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.12.0) A curated list of changes can be found in the [Releases](http://docs.nginx.com/nginx-ingress-controller/releases/) page on NGINX Documentation website. ### 1.11.3 -An automatically generated list of changes can be found on Github at: [1.11.3 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.11.3) +An automatically generated list of changes can be found on GitHub at: [1.11.3 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.11.3) A curated list of changes can be found in the [Releases](http://docs.nginx.com/nginx-ingress-controller/releases/) page on NGINX Documentation website. ### 1.11.2 -An automatically generated list of changes can be found on Github at: [1.11.2 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.11.2) +An automatically generated list of changes can be found on GitHub at: [1.11.2 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.11.2) A curated list of changes can be found in the [Releases](http://docs.nginx.com/nginx-ingress-controller/releases/) page on NGINX Documentation website. ### 1.11.1 -An automatically generated list of changes can be found on Github at: [1.11.1 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.11.1) +An automatically generated list of changes can be found on GitHub at: [1.11.1 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.11.1) A curated list of changes can be found in the [Releases](http://docs.nginx.com/nginx-ingress-controller/releases/) page on NGINX Documentation website. ### 1.11.0 -An automatically generated list of changes can be found on Github at: [1.11.0 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.11.0) +An automatically generated list of changes can be found on GitHub at: [1.11.0 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.11.0) A curated list of changes can be found in the [Releases](http://docs.nginx.com/nginx-ingress-controller/releases/) page on NGINX Documentation website. diff --git a/README.md b/README.md index 0fe1b2140a..4e104695fa 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ The table below summarizes the options regarding the images, manifests, helm cha ## Contacts -We’d like to hear your feedback! If you have any suggestions or experience issues with our Ingress Controller, please create an issue or send a pull request on Github. +We’d like to hear your feedback! If you have any suggestions or experience issues with our Ingress Controller, please create an issue or send a pull request on GitHub. You can contact us directly via [kubernetes@nginx.com](mailto:kubernetes@nginx.com) or on the [NGINX Community Slack](https://nginxcommunity.slack.com/channels/nginx-ingress-controller). ## Contributing diff --git a/hack/repo-changelog-template.txt b/hack/repo-changelog-template.txt index 06f8085075..6e5c0cf5ca 100644 --- a/hack/repo-changelog-template.txt +++ b/hack/repo-changelog-template.txt @@ -1,6 +1,6 @@ %%TITLE%% -An automatically generated list of changes can be found on Github at: [%%IC_VERSION%% Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v%%IC_VERSION%%) +An automatically generated list of changes can be found on GitHub at: [%%IC_VERSION%% Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v%%IC_VERSION%%) A curated list of changes can be found on the [Releases](http://docs.nginx.com/nginx-ingress-controller/releases/) page on the NGINX Documentation website. From bab915fea592059bb9b31544f0e0e1de79829dc9 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 3 May 2022 23:50:33 -0400 Subject: [PATCH 10/30] spelling: grpc Signed-off-by: Josh Soref --- examples/custom-resources/grpc-upstreams/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/custom-resources/grpc-upstreams/README.md b/examples/custom-resources/grpc-upstreams/README.md index 85ea15df64..06ac43df8b 100644 --- a/examples/custom-resources/grpc-upstreams/README.md +++ b/examples/custom-resources/grpc-upstreams/README.md @@ -19,7 +19,7 @@ metadata: spec: host: grpc.example.com tls: - secret: gprc-secret + secret: grpc-secret upstreams: - name: grpc1 service: grpc-svc From 90139f0faa1599a955249ab48af86975ed35dfe7 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 3 May 2022 23:50:33 -0400 Subject: [PATCH 11/30] spelling: implementation Signed-off-by: Josh Soref --- internal/nginx/fake_manager.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/nginx/fake_manager.go b/internal/nginx/fake_manager.go index 0f0a644c6e..42f8c59edd 100644 --- a/internal/nginx/fake_manager.go +++ b/internal/nginx/fake_manager.go @@ -155,22 +155,22 @@ func (*FakeManager) AppProtectAgentStart(_ chan error, _ string) { glog.V(3).Infof("Starting FakeAppProtectAgent") } -// AppProtectAgentQuit is a fake implementtion AppProtectAgentQuit +// AppProtectAgentQuit is a fake implementation AppProtectAgentQuit func (*FakeManager) AppProtectAgentQuit() { glog.V(3).Infof("Quitting FakeAppProtectAgent") } -// AppProtectPluginStart is a fake implementtion AppProtectPluginStart +// AppProtectPluginStart is a fake implementation AppProtectPluginStart func (*FakeManager) AppProtectPluginStart(_ chan error) { glog.V(3).Infof("Starting FakeAppProtectPlugin") } -// AppProtectPluginQuit is a fake implementtion AppProtectPluginQuit +// AppProtectPluginQuit is a fake implementation AppProtectPluginQuit func (*FakeManager) AppProtectPluginQuit() { glog.V(3).Infof("Quitting FakeAppProtectPlugin") } -// AppProtectDosAgentQuit is a fake implementtion AppProtectAgentQuit +// AppProtectDosAgentQuit is a fake implementation AppProtectAgentQuit func (*FakeManager) AppProtectDosAgentQuit() { glog.V(3).Infof("Quitting FakeAppProtectDosAgent") } From 1c921d2fe2cfa2679f8332351f491c8dcf5858e8 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 3 May 2022 23:50:34 -0400 Subject: [PATCH 12/30] spelling: ingress Signed-off-by: Josh Soref --- internal/configs/configurator_test.go | 10 +++++----- internal/configs/version1/templates_test.go | 2 +- .../ingress-mtls/policies/ingress-mtls-invalid.yaml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/configs/configurator_test.go b/internal/configs/configurator_test.go index fd7a4a85ce..5541d577ec 100644 --- a/internal/configs/configurator_test.go +++ b/internal/configs/configurator_test.go @@ -105,9 +105,9 @@ func TestAddOrUpdateMergeableIngress(t *testing.T) { t.Errorf("Failed to create a test configurator: %v", err) } - mergeableIngess := createMergeableCafeIngress() + mergeableIngress := createMergeableCafeIngress() - warnings, err := cnf.AddOrUpdateMergeableIngress(mergeableIngess) + warnings, err := cnf.AddOrUpdateMergeableIngress(mergeableIngress) if err != nil { t.Errorf("AddOrUpdateMergeableIngress returned \n%v, expected \n%v", err, nil) } @@ -115,7 +115,7 @@ func TestAddOrUpdateMergeableIngress(t *testing.T) { t.Errorf("AddOrUpdateMergeableIngress returned warnings: %v", warnings) } - cnfHasMergeableIngress := cnf.HasIngress(mergeableIngess.Master.Ingress) + cnfHasMergeableIngress := cnf.HasIngress(mergeableIngress.Master.Ingress) if !cnfHasMergeableIngress { t.Errorf("AddOrUpdateMergeableIngress didn't add mergeable ingress successfully. HasIngress returned %v, expected %v", cnfHasMergeableIngress, true) } @@ -146,9 +146,9 @@ func TestAddOrUpdateMergeableIngressFailsWithInvalidIngressTemplate(t *testing.T t.Errorf("Failed to create a test configurator: %v", err) } - mergeableIngess := createMergeableCafeIngress() + mergeableIngress := createMergeableCafeIngress() - warnings, err := cnf.AddOrUpdateMergeableIngress(mergeableIngess) + warnings, err := cnf.AddOrUpdateMergeableIngress(mergeableIngress) if err == nil { t.Errorf("AddOrUpdateMergeableIngress returned \n%v, but expected \n%v", nil, "template execution error") } diff --git a/internal/configs/version1/templates_test.go b/internal/configs/version1/templates_test.go index 230ce77e31..d1d6c51e51 100644 --- a/internal/configs/version1/templates_test.go +++ b/internal/configs/version1/templates_test.go @@ -49,7 +49,7 @@ var ingCfg = IngressNginxConfig{ Key: "/etc/nginx/secrets/key.jwk", Realm: "closed site", Token: "$cookie_auth_token", - RedirectLocationName: "@login_url-default-cafe-ingres", + RedirectLocationName: "@login_url-default-cafe-ingress", }, SSL: true, SSLCertificate: "secret.pem", diff --git a/tests/data/ingress-mtls/policies/ingress-mtls-invalid.yaml b/tests/data/ingress-mtls/policies/ingress-mtls-invalid.yaml index e0e9fff61a..876fbed741 100644 --- a/tests/data/ingress-mtls/policies/ingress-mtls-invalid.yaml +++ b/tests/data/ingress-mtls/policies/ingress-mtls-invalid.yaml @@ -3,7 +3,7 @@ kind: Policy metadata: name: ingress-mtls-policy spec: - ingredsssMTLS: # invalid/mis-spelled yaml keys + ingress_MTLS: # invalid/mis-spelled yaml keys clientCertSecrettt: ingress-mtls-secret verifyadClient: "on" verifyDeaerpth: 1 \ No newline at end of file From cfaa0a54e4fd142702f18903fbeeae567be89224 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 3 May 2022 23:50:37 -0400 Subject: [PATCH 13/30] spelling: internal Signed-off-by: Josh Soref --- internal/configs/configurator_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/configs/configurator_test.go b/internal/configs/configurator_test.go index 5541d577ec..b44cea797b 100644 --- a/internal/configs/configurator_test.go +++ b/internal/configs/configurator_test.go @@ -345,7 +345,7 @@ func TestAddInternalRouteConfig(t *testing.T) { } if !cnf.staticCfgParams.EnableInternalRoutes { - t.Errorf("AddInternalRouteConfig failed to set EnableInteralRoutes field of staticCfgParams to true") + t.Errorf("AddInternalRouteConfig failed to set EnableInternalRoutes field of staticCfgParams to true") } if cnf.staticCfgParams.PodName != "nginx-ingress" { t.Errorf("AddInternalRouteConfig failed to set PodName field of staticCfgParams") From e4064fc64e9acaed75550994933bf7b02172e1a3 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 3 May 2022 23:50:37 -0400 Subject: [PATCH 14/30] spelling: invalid Signed-off-by: Josh Soref --- internal/k8s/appprotect/app_protect_configuration_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/k8s/appprotect/app_protect_configuration_test.go b/internal/k8s/appprotect/app_protect_configuration_test.go index 793c64ba65..981c7ae8e9 100644 --- a/internal/k8s/appprotect/app_protect_configuration_test.go +++ b/internal/k8s/appprotect/app_protect_configuration_test.go @@ -1162,7 +1162,7 @@ func TestGetAppProtectResource(t *testing.T) { key: "testing/test3", wantErr: true, errMsg: "Unknown App Protect resource kind Notreal", - msg: "Ivalid kind, Negative", + msg: "Invalid kind, Negative", }, } appProtectConfiguration := newConfigurationImpl() From b322df5be9ba3eb316e0a9797a983d7d6c4a12fd Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 3 May 2022 23:50:38 -0400 Subject: [PATCH 15/30] spelling: kubernetes Signed-off-by: Josh Soref --- tests/suite/fixtures.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/suite/fixtures.py b/tests/suite/fixtures.py index 176d0f9494..53ab4385a1 100644 --- a/tests/suite/fixtures.py +++ b/tests/suite/fixtures.py @@ -331,7 +331,7 @@ def fin(): @pytest.fixture(scope="session") def kube_apis(cli_arguments) -> KubeApis: """ - Set up kubernets-client to operate in cluster. + Set up kubernetes-client to operate in cluster. :param cli_arguments: a set of command-line arguments :return: KubeApis From 489ce36d88c7117698e9c50fe5e667ff3dfee20a Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 3 May 2022 23:50:38 -0400 Subject: [PATCH 16/30] spelling: manager Signed-off-by: Josh Soref --- internal/nginx/fake_manager.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/nginx/fake_manager.go b/internal/nginx/fake_manager.go index 42f8c59edd..063017eebf 100644 --- a/internal/nginx/fake_manager.go +++ b/internal/nginx/fake_manager.go @@ -16,7 +16,7 @@ type FakeManager struct { dhparamFilename string } -// NewFakeManager creates a FakeMananger. +// NewFakeManager creates a FakeManager. func NewFakeManager(confPath string) *FakeManager { return &FakeManager{ confdPath: path.Join(confPath, "conf.d"), From 880851dbdf39117dab9d91999e2688e3e4e1a5fd Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 3 May 2022 23:50:39 -0400 Subject: [PATCH 17/30] spelling: mtls Signed-off-by: Josh Soref --- examples/custom-resources/egress-mtls/README.md | 2 +- examples/custom-resources/ingress-mtls/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/custom-resources/egress-mtls/README.md b/examples/custom-resources/egress-mtls/README.md index e3c3765645..da12a081b6 100644 --- a/examples/custom-resources/egress-mtls/README.md +++ b/examples/custom-resources/egress-mtls/README.md @@ -22,7 +22,7 @@ Create the application deployment, service and secret: $ kubectl apply -f secure-app.yaml ``` -## Step 2 - Deploy the Egress MLTS Secret +## Step 2 - Deploy the Egress MTLS Secret Create a secret with the name `egress-mtls-secret` that will be used for authentication to application: ``` diff --git a/examples/custom-resources/ingress-mtls/README.md b/examples/custom-resources/ingress-mtls/README.md index da54ae7601..85b88e1470 100644 --- a/examples/custom-resources/ingress-mtls/README.md +++ b/examples/custom-resources/ingress-mtls/README.md @@ -21,7 +21,7 @@ Create the application deployment and service: $ kubectl apply -f webapp.yaml ``` -## Step 2 - Deploy the Ingress MLTS Secret +## Step 2 - Deploy the Ingress MTLS Secret Create a secret with the name `ingress-mtls-secret` that will be used for Ingress MTLS validation: ``` From 39695a7132142b9d148c3f81159544d5af2d5e43 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 3 May 2022 23:50:40 -0400 Subject: [PATCH 18/30] spelling: multipart Signed-off-by: Josh Soref --- internal/metrics/collectors/latency.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/metrics/collectors/latency.go b/internal/metrics/collectors/latency.go index c49d9ffac3..c953b4a395 100644 --- a/internal/metrics/collectors/latency.go +++ b/internal/metrics/collectors/latency.go @@ -275,7 +275,7 @@ func parseMessage(msg string) (latencyMetric, error) { return lm, nil } -// parseMutlipartResponse checks if the input string contains commas. +// parseMultipartResponse checks if the input string contains commas. // If it does it returns the last item of the list, otherwise it returns input. func parseMultipartResponse(input string) string { parts := strings.Split(input, ",") From 6ca4522844e2affe2a4c9ec5504d8523afddf2ce Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 3 May 2022 23:50:40 -0400 Subject: [PATCH 19/30] spelling: namespace Signed-off-by: Josh Soref --- internal/configs/virtualserver.go | 8 ++++---- tests/suite/resources_utils.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/configs/virtualserver.go b/internal/configs/virtualserver.go index 0395c88025..269880df92 100644 --- a/internal/configs/virtualserver.go +++ b/internal/configs/virtualserver.go @@ -1027,8 +1027,8 @@ func (p *policiesCfg) addWAFConfig( if waf.ApPolicy != "" { apPolKey := waf.ApPolicy - hasNamepace := strings.Contains(apPolKey, "/") - if !hasNamepace { + hasNamespace := strings.Contains(apPolKey, "/") + if !hasNamespace { apPolKey = fmt.Sprintf("%v/%v", polNamespace, apPolKey) } @@ -1045,8 +1045,8 @@ func (p *policiesCfg) addWAFConfig( p.WAF.ApSecurityLogEnable = true logConfKey := waf.SecurityLog.ApLogConf - hasNamepace := strings.Contains(logConfKey, "/") - if !hasNamepace { + hasNamespace := strings.Contains(logConfKey, "/") + if !hasNamespace { logConfKey = fmt.Sprintf("%v/%v", polNamespace, logConfKey) } diff --git a/tests/suite/resources_utils.py b/tests/suite/resources_utils.py index b6a36e7984..de3d3a512e 100644 --- a/tests/suite/resources_utils.py +++ b/tests/suite/resources_utils.py @@ -1277,7 +1277,7 @@ def create_ingress_with_dos_annotations( ) -> None: """ Create an ingress with AppProtect annotations - :param dos_protected: the namepsace/name of the dos protected resource + :param dos_protected: the namespace/name of the dos protected resource :param kube_apis: KubeApis :param yaml_manifest: an absolute path to ingress yaml :param namespace: namespace From b370fed6ffe7bb5be7def68d6e8de8b23a6f329d Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 3 May 2022 23:50:42 -0400 Subject: [PATCH 20/30] spelling: nginx Signed-off-by: Josh Soref --- internal/configs/oidc/oidc.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/configs/oidc/oidc.conf b/internal/configs/oidc/oidc.conf index b6e963fc55..50ae4c1151 100644 --- a/internal/configs/oidc/oidc.conf +++ b/internal/configs/oidc/oidc.conf @@ -88,7 +88,7 @@ # location /api/ { # api write=on; - # allow 127.0.0.1; # Only the NGINX host may call the NIGNX Plus API + # allow 127.0.0.1; # Only the NGINX host may call the NGINX Plus API # deny all; # access_log off; # } From 03acf0f5b2414db6a4768730719d4ee09509ea31 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 3 May 2022 23:50:42 -0400 Subject: [PATCH 21/30] spelling: override Signed-off-by: Josh Soref --- tests/suite/test_ac_policies_vsr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/suite/test_ac_policies_vsr.py b/tests/suite/test_ac_policies_vsr.py index 72b97cf413..2b29ac23bb 100644 --- a/tests/suite/test_ac_policies_vsr.py +++ b/tests/suite/test_ac_policies_vsr.py @@ -341,7 +341,7 @@ def test_invalid_policy_vsr( ) @pytest.mark.parametrize("src", [vs_spec_vsr_override_src, vs_route_vsr_override_src]) - def test_overide_vs_vsr( + def test_override_vs_vsr( self, kube_apis, crd_ingress_controller, From 29da1be57cca192d3c8abe832d1f90dbc767ef2b Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 3 May 2022 23:50:43 -0400 Subject: [PATCH 22/30] spelling: passthrough Signed-off-by: Josh Soref --- internal/configs/transportserver_test.go | 2 +- internal/k8s/configuration_test.go | 2 +- pkg/apis/configuration/validation/transportserver_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/configs/transportserver_test.go b/internal/configs/transportserver_test.go index 8f1a982421..7232e88527 100644 --- a/internal/configs/transportserver_test.go +++ b/internal/configs/transportserver_test.go @@ -319,7 +319,7 @@ func TestGenerateTransportServerConfigForTCPMaxConnections(t *testing.T) { } } -func TestGenerateTransportServerConfigForTLSPasstrhough(t *testing.T) { +func TestGenerateTransportServerConfigForTLSPassthrough(t *testing.T) { t.Parallel() transportServerEx := TransportServerEx{ TransportServer: &conf_v1alpha1.TransportServer{ diff --git a/internal/k8s/configuration_test.go b/internal/k8s/configuration_test.go index 141ad9ebfa..810e75f2ee 100644 --- a/internal/k8s/configuration_test.go +++ b/internal/k8s/configuration_test.go @@ -3320,7 +3320,7 @@ func TestGetTransportServerMetrics(t *testing.T) { TotalTCP: 1, TotalUDP: 1, }, - msg: "TLSPasstrough, TCP and UDP TransportServers", + msg: "TLSPassthrough, TCP and UDP TransportServers", }, } diff --git a/pkg/apis/configuration/validation/transportserver_test.go b/pkg/apis/configuration/validation/transportserver_test.go index cf48cba8bc..9cd8a87923 100644 --- a/pkg/apis/configuration/validation/transportserver_test.go +++ b/pkg/apis/configuration/validation/transportserver_test.go @@ -417,7 +417,7 @@ func TestValidateTransportListener(t *testing.T) { allErrs := tsv.validateTransportListener(test.listener, field.NewPath("listener")) if len(allErrs) > 0 { - t.Errorf("validateTransportListener() returned errors %v for valid input %+v when tlsPassithrough is %v", allErrs, test.listener, test.tlsPassthrough) + t.Errorf("validateTransportListener() returned errors %v for valid input %+v when tlsPassthrough is %v", allErrs, test.listener, test.tlsPassthrough) } } } From d01147a5befe51451eb5f550559325f51db075cb Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 3 May 2022 23:50:45 -0400 Subject: [PATCH 23/30] spelling: processes Signed-off-by: Josh Soref --- internal/metrics/collectors/processes.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/metrics/collectors/processes.go b/internal/metrics/collectors/processes.go index 3a8da2f19d..7324fc5ffc 100644 --- a/internal/metrics/collectors/processes.go +++ b/internal/metrics/collectors/processes.go @@ -34,13 +34,13 @@ func NewNginxProcessesMetricsCollector(constLabels map[string]string) *NginxProc // updateWorkerProcessCount sets the number of NGINX worker processes func (pc *NginxProcessesMetricsCollector) updateWorkerProcessCount() { - currWorkerProcesses, prevWorkerPrcesses, err := getWorkerProcesses() + currWorkerProcesses, prevWorkerProcesses, err := getWorkerProcesses() if err != nil { glog.Errorf("unable to collect process metrics : %v", err) return } pc.workerProcessTotal.WithLabelValues("current").Set(float64(currWorkerProcesses)) - pc.workerProcessTotal.WithLabelValues("old").Set(float64(prevWorkerPrcesses)) + pc.workerProcessTotal.WithLabelValues("old").Set(float64(prevWorkerProcesses)) } func getWorkerProcesses() (int, int, error) { From 8205a842f4434d248d1926048c4fb46568865c51 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 3 May 2022 23:50:45 -0400 Subject: [PATCH 24/30] spelling: resource Signed-off-by: Josh Soref --- docs/content/app-protect-dos/configuration.md | 2 +- tests/settings.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/content/app-protect-dos/configuration.md b/docs/content/app-protect-dos/configuration.md index 529d521cf2..0aba1d4799 100644 --- a/docs/content/app-protect-dos/configuration.md +++ b/docs/content/app-protect-dos/configuration.md @@ -89,7 +89,7 @@ You would create an `APDosPolicy` resource with the policy defined in the `spec` tls_fingerprint: "on" ``` -Then add a reference in the `DosProtectedResrouce` to the `ApDosPolicy`: +Then add a reference in the `DosProtectedResource` to the `ApDosPolicy`: ```yaml apiVersion: appprotectdos.f5.com/v1beta1 kind: DosProtectedResource diff --git a/tests/settings.py b/tests/settings.py index 5695247ab8..336f9c4ba2 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -16,7 +16,7 @@ DEFAULT_DEPLOYMENT_TYPE = "deployment" ALLOWED_DEPLOYMENT_TYPES = ["deployment", "daemon-set"] BATCH_START = "False" -# Number of Ingress/VS resources to deploy based on BATCH_START value, ref. line #264 in rresource_utils.py +# Number of Ingress/VS resources to deploy based on BATCH_START value, ref. line #264 in resource_utils.py BATCH_RESOURCES = 1 # Time in seconds to ensure reconfiguration changes in cluster RECONFIGURATION_DELAY = 3 From 480ca47cf27b7c7514eebcf0bc9eb5e11a4d70bd Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 3 May 2022 22:43:20 -0400 Subject: [PATCH 25/30] spelling: secret Signed-off-by: Josh Soref --- internal/configs/virtualserver_test.go | 16 ++++++++-------- .../policies/ingress-mtls-invalid.yaml | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/configs/virtualserver_test.go b/internal/configs/virtualserver_test.go index 7571f2c0aa..9f7d3d02d6 100644 --- a/internal/configs/virtualserver_test.go +++ b/internal/configs/virtualserver_test.go @@ -4913,13 +4913,13 @@ func TestGenerateSSLConfig(t *testing.T) { }, { inputTLS: &conf_v1.TLS{ - Secret: "secret", + Secret: "missing", }, inputCfgParams: &ConfigParams{}, wildcard: false, inputSecretRefs: map[string]*secrets.SecretReference{ - "default/secret": { - Error: errors.New("secret doesn't exist"), + "default/missing": { + Error: errors.New("missing doesn't exist"), }, }, expectedSSL: &version2.SSL{ @@ -4927,18 +4927,18 @@ func TestGenerateSSLConfig(t *testing.T) { RejectHandshake: true, }, expectedWarnings: Warnings{ - nil: []string{"TLS secret secret is invalid: secret doesn't exist"}, + nil: []string{"TLS secret missing is invalid: missing doesn't exist"}, }, - msg: "secret doesn't exist in the cluster with HTTPS", + msg: "missing doesn't exist in the cluster with HTTPS", }, { inputTLS: &conf_v1.TLS{ - Secret: "secret", + Secret: "mistyped", }, inputCfgParams: &ConfigParams{}, wildcard: false, inputSecretRefs: map[string]*secrets.SecretReference{ - "default/secret": { + "default/mistyped": { Secret: &api_v1.Secret{ Type: secrets.SecretTypeCA, }, @@ -4949,7 +4949,7 @@ func TestGenerateSSLConfig(t *testing.T) { RejectHandshake: true, }, expectedWarnings: Warnings{ - nil: []string{"TLS secret secret is of a wrong type 'nginx.org/ca', must be 'kubernetes.io/tls'"}, + nil: []string{"TLS secret mistyped is of a wrong type 'nginx.org/ca', must be 'kubernetes.io/tls'"}, }, msg: "wrong secret type", }, diff --git a/tests/data/ingress-mtls/policies/ingress-mtls-invalid.yaml b/tests/data/ingress-mtls/policies/ingress-mtls-invalid.yaml index 876fbed741..90d07379ac 100644 --- a/tests/data/ingress-mtls/policies/ingress-mtls-invalid.yaml +++ b/tests/data/ingress-mtls/policies/ingress-mtls-invalid.yaml @@ -4,6 +4,6 @@ metadata: name: ingress-mtls-policy spec: ingress_MTLS: # invalid/mis-spelled yaml keys - clientCertSecrettt: ingress-mtls-secret + clientCertSecret_: ingress-mtls-secret verifyadClient: "on" verifyDeaerpth: 1 \ No newline at end of file From 92bfc84695a695ed8e1dbfa55df713610eb167a9 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 3 May 2022 23:52:22 -0400 Subject: [PATCH 26/30] spelling: signing Signed-off-by: Josh Soref --- tests/data/virtual-server-certmanager/certmanager.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/data/virtual-server-certmanager/certmanager.yaml b/tests/data/virtual-server-certmanager/certmanager.yaml index cab627397d..5ab0bb0a04 100644 --- a/tests/data/virtual-server-certmanager/certmanager.yaml +++ b/tests/data/virtual-server-certmanager/certmanager.yaml @@ -4557,7 +4557,7 @@ rules: --- # Source: cert-manager/templates/rbac.yaml # Permission to: -# - Update and sign CertificateSigningeRequests referencing cert-manager.io Issuers and ClusterIssuers +# - Update and sign CertificateSigningRequests referencing cert-manager.io Issuers and ClusterIssuers # - Perform SubjectAccessReviews to test whether users are able to reference Namespaced Issuers apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole From 80694f2bcb58ecf26054c864ac607e26015195e0 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 3 May 2022 22:41:47 -0400 Subject: [PATCH 27/30] spelling: the Signed-off-by: Josh Soref --- docs/content/configuration/policy-resource.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/configuration/policy-resource.md b/docs/content/configuration/policy-resource.md index 91c72e2527..74c567d49e 100644 --- a/docs/content/configuration/policy-resource.md +++ b/docs/content/configuration/policy-resource.md @@ -115,7 +115,7 @@ rateLimit: |``delay`` | The delay parameter specifies a limit at which excessive requests become delayed. If not set all excessive requests are delayed. | ``int`` | No | |``noDelay`` | Disables the delaying of excessive requests while requests are being limited. Overrides ``delay`` if both are set. | ``bool`` | No | |``burst`` | Excessive requests are delayed until their number exceeds the ``burst`` size, in which case the request is terminated with an error. | ``int`` | No | -|``dryRun`` | Enables the dry run mode. In this mode, the rate limit is not actually applied, but the the number of excessive requests is accounted as usual in the shared memory zone. | ``bool`` | No | +|``dryRun`` | Enables the dry run mode. In this mode, the rate limit is not actually applied, but the number of excessive requests is accounted as usual in the shared memory zone. | ``bool`` | No | |``logLevel`` | Sets the desired logging level for cases when the server refuses to process requests due to rate exceeding, or delays request processing. Allowed values are ``info``, ``notice``, ``warn`` or ``error``. Default is ``error``. | ``string`` | No | |``rejectCode`` | Sets the status code to return in response to rejected requests. Must fall into the range ``400..599``. Default is ``503``. | ``string`` | No | {{% /table %}} From 41cd30c06d101e69dc8cdb7f6c68088baddd3d12 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 3 May 2022 23:50:48 -0400 Subject: [PATCH 28/30] spelling: validate Signed-off-by: Josh Soref --- pkg/apis/configuration/validation/virtualserver_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/apis/configuration/validation/virtualserver_test.go b/pkg/apis/configuration/validation/virtualserver_test.go index 29d6b32395..b996c8b0cd 100644 --- a/pkg/apis/configuration/validation/virtualserver_test.go +++ b/pkg/apis/configuration/validation/virtualserver_test.go @@ -1375,7 +1375,7 @@ func TestValidateRouteField(t *testing.T) { } } -func TestValdateReferencedUpstream(t *testing.T) { +func TestValidateReferencedUpstream(t *testing.T) { t.Parallel() upstream := "test" upstreamNames := map[string]sets.Empty{ @@ -1388,7 +1388,7 @@ func TestValdateReferencedUpstream(t *testing.T) { } } -func TestValdateUpstreamFails(t *testing.T) { +func TestValidateUpstreamFails(t *testing.T) { t.Parallel() tests := []struct { upstream string From 72b30df530960cef7562d024e6f92c2f2d767560 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 3 May 2022 23:50:49 -0400 Subject: [PATCH 29/30] spelling: wildcard Signed-off-by: Josh Soref --- examples/wildcard-tls-certificate/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/wildcard-tls-certificate/README.md b/examples/wildcard-tls-certificate/README.md index b2fd4cded2..777b3bef17 100644 --- a/examples/wildcard-tls-certificate/README.md +++ b/examples/wildcard-tls-certificate/README.md @@ -9,7 +9,7 @@ The wildcard TLS certificate simplifies the configuration of TLS termination if Start the Ingress Controller with the `-wildcard-tls-secret` [command-line argument](https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/command-line-arguments/#cmdoption-wildcard-tls-secret) set to a TLS secret with a wildcard cert/key. For example: ```yaml --wildcard-tls-secret=nginx-ingress/wildlcard-tls-secret +-wildcard-tls-secret=nginx-ingress/wildcard-tls-secret ``` **Note**: the Ingress Controller supports only one wildcard TLS secret. From 38514c91cf96b056c7c2eb328fd91e8fc0579729 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 3 May 2022 23:59:13 -0400 Subject: [PATCH 30/30] spelling: with Signed-off-by: Josh Soref --- internal/k8s/handlers_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/k8s/handlers_test.go b/internal/k8s/handlers_test.go index 000ba8de27..e2b880e706 100644 --- a/internal/k8s/handlers_test.go +++ b/internal/k8s/handlers_test.go @@ -258,7 +258,7 @@ func TestAreResourcesDifferent(t *testing.T) { }, expected: true, expectErr: nil, - msg: "not equal resources with with first resource missing spec", + msg: "not equal resources with first resource missing spec", }, }