Fix Contour helm chart (#4901)

Signed-off-by: Keith Mattix II <[email protected]>

Author: keithmattix

.gitignore

@@ -45,7 +45,8 @@ creds.json
 screenlog.*
 demo/bin/
 *.tgz
-!**/charts/*.tgz # dependency charts pulled by Helm
+# dependency charts pulled by Helm
+!**/charts/*.tgz
 *.wasm
 
 ## Ignore test coverage files
@@ -84,4 +85,4 @@ rootfs/
 envoy_*.json
 
 # Interim files that can stick around from a bad mockgen run.
-gomock_reflect_*/
+gomock_reflect_*/

charts/osm/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: contour
   repository: https://charts.bitnami.com/bitnami
-  version: 5.1.0
-digest: sha256:bbc686aab46f03b363c02b9d4423e328d3406f40ce87cfae45f587447175d9b9
-generated: "2021-08-03T16:19:34.9654452-07:00"
+  version: 8.0.4
+digest: sha256:93fedd26b88a45f5e98392c050edf7418b89a609a96d1a4c4d0adc9dfe8d9038
+generated: "2022-07-13T18:00:50.820831-05:00"

charts/osm/Chart.yaml

@@ -25,6 +25,6 @@ kubeVersion: ">= 1.22.9-0"
 
 dependencies:
 - name: contour
-  version: 5.1.0
+  version: 8.0.4
   repository: https://charts.bitnami.com/bitnami
   condition: contour.enabled

charts/osm/README.md

@@ -59,7 +59,7 @@ The following table lists the configurable parameters of the osm chart and their
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| contour.contour | object | `{"image":{"registry":"docker.io","repository":"projectcontour/contour","tag":"v1.21.1"}}` | Contour controller configuration |
+| contour.contour | object | `{"image":{"registry":"ghcr.io","repository":"projectcontour/contour","tag":"v1.21.1"}}` | Contour controller configuration |
 | contour.enabled | bool | `false` | Enables deployment of Contour control plane and gateway |
 | contour.envoy | object | `{"image":{"registry":"docker.io","repository":"envoyproxy/envoy-distroless","tag":"v1.22.2"}}` | Contour envoy edge proxy configuration |
 | osm.caBundleSecretName | string | `"osm-ca-bundle"` | The Kubernetes secret name to store CA bundle for the root CA used in OSM |

charts/osm/charts/contour-5.1.0.tgz

@@ -611,7 +611,7 @@ contour:
   # -- Contour controller configuration
   contour:
     image:
-      registry: docker.io
+      registry: ghcr.io
       repository: projectcontour/contour
       tag: v1.21.1
   # -- Contour envoy edge proxy configuration
@@ -625,4 +625,4 @@ contour:
 # -- SMI configuration
 smi:
   # -- Enables validation of SMI Traffic Target
-  validateTrafficTarget: true
+  validateTrafficTarget: true