Merge remote-tracking branch 'upstream/main' into dev-1.24

2022-03-21 07:53:48 -07:00
parent 284c492292 6d22e08903
commit ee1a85d08e
42 changed files with 1549 additions and 1064 deletions
@@ -316,7 +316,7 @@ spec:
  parameters:
    # The parameters for this IngressClass are specified in an
    # IngressParameter (API group k8s.example.com) named "external-config",
-    # that's in the "external-configuration" configuration namespace.
+    # that's in the "external-configuration" namespace.
    scope: Namespace
    apiGroup: k8s.example.com
    kind: IngressParameter