Merge branch 'main' into HTTPRoutes

CONTRIBUTING.md

@@ -68,6 +68,17 @@ To run the tests for a single package, change to package directory and run:
 go test .
 ```
 
+### Lint
+
+Before making a commit, it's always a good idea to check the code for common programming mistakes, misspellings and other potential errors. The lint checks can be run by invoking the make lint task:
+
+```shell
+make lint
+```
+
+Note: The lint tasks require the [codespell](https://github.com/codespell-project/codespell) application. Be sure to install version 2.0 or newer before running the lint tasks.
+
+
 ## Contribution workflow
 
 This section describes the process for contributing a bug fix or new feature.

_integration/testsuite/run-ingress-conformance.sh

@@ -30,8 +30,8 @@ readonly INGRESS_CONFORMANCE_IMAGE=${INGRESS_CONFORMANCE_IMAGE:-gcr.io/k8s-stagi
 
 # Set the Ingress Status Address so conformance test pods are reachable in tests
 # This multiline sed command is for compatibility across MacOS and GNU sed
-${KUBECTL} apply -f <(sed 's/\s*- serve/&\
-        - --ingress-status-address=envoy.projectcontour/' ${REPO}/examples/contour/03-contour.yaml)
+${KUBECTL} apply -f <(sed 's/imagePullPolicy: Always/imagePullPolicy: IfNotPresent/g' ${REPO}/examples/contour/03-contour.yaml | sed 's/\s*- serve/&\
+        - --ingress-status-address=envoy.projectcontour/')
 ${KUBECTL} rollout status -n projectcontour deployment contour
 
 ${SONOBUOY} run \

internal/dag/ingress_processor.go

@@ -146,6 +146,11 @@ func (p *IngressProcessor) computeIngressRule(ing *networking_v1.Ingress, rule n
 
 		s, err := p.dag.EnsureService(m, port, p.source)
 		if err != nil {
+			p.WithError(err).
+				WithField("name", ing.GetName()).
+				WithField("namespace", ing.GetNamespace()).
+				WithField("service", be.Service.Name).
+				Error("unresolved service reference")
 			continue
 		}
 

site/docs/main/architecture.md

@@ -15,7 +15,7 @@ After initialisation is complete, the Envoy container starts, retrieves the boot
 Envoy will gracefully retry if the management server is unavailable, which removes any container startup ordering issues.
 
 Contour is a client of the Kubernetes API.
-Contour watches Ingress, HTTPProxy, Secret, Service, and Endpoint objects, and acts as the management server for its Envoy sibling by translating its cache of objects into the relevant JSON stanzas: Service objects for CDS, Ingress for RDS, Endpoint objects for SDS, and so on).
+Contour watches Ingress, HTTPProxy, Secret, Service, and Endpoint objects, and acts as the management server for its Envoy sibling by translating its cache of objects into the relevant JSON stanzas: Service objects for CDS, Ingress for RDS, Endpoint objects for EDS, and so on).
 
 The transfer of information from Kubernetes to Contour is by watching the API with the SharedInformer framework.