Merge branch 'main' into docs-gateway-mode

Author: cnvergence

.github/dependabot.yml

@@ -36,19 +36,23 @@ updates:
       # Ignore github.com/docker/docker, since it should be updated alongside github.com/google/go-containerregistry
       - dependency-name: github.com/docker/docker
     groups:
-      github.com:
+      gomod:
         patterns:
           - "github.com*"
+          - "go.opentelemetry.io*"
+          - "golang*"
+          - "google*"
+          - "fortio.org*"
+          - "gopkg.in*"
+          - "helm.sh*"
+          - "gomodules.xyz"
+        exclude-patterns:
+          # Exclude envoyproxy/go-control-plane, since it needs more work to update
+          - "github.com/envoyproxy/go-control-plane*"
       k8s.io:
         patterns:
           - "k8s.io/*"
           - "sigs.k8s.io/*"
-      go.opentelemetry.io:
-        patterns:
-          - "go.opentelemetry.io*"
-          # Merge golang/google groups into group, since it should be updated alongside opentelemetry
-          - "golang*"
-          - "google*"
   - package-ecosystem: pip
     directories:
       - /tools/src/codespell

internal/cmd/server.go

@@ -161,10 +161,8 @@ func startRunners(ctx context.Context, cfg *config.Server) (err error) {
 
 	// Setup the Extension Manager
 	var extMgr types.Manager
-	if cfg.EnvoyGateway.Provider.Type == egv1a1.ProviderTypeKubernetes {
-		if extMgr, err = extensionregistry.NewManager(cfg); err != nil {
-			return err
-		}
+	if extMgr, err = extensionregistry.NewManager(cfg, cfg.EnvoyGateway.Provider.Type == egv1a1.ProviderTypeKubernetes); err != nil {
+		return err
 	}
 
 	runners := []struct {

internal/extension/registry/extension_manager.go

@@ -59,10 +59,14 @@ type Manager struct {
 }
 
 // NewManager returns a new Manager
-func NewManager(cfg *config.Server) (extTypes.Manager, error) {
-	cli, err := k8scli.New(k8sclicfg.GetConfigOrDie(), k8scli.Options{Scheme: envoygateway.GetScheme()})
-	if err != nil {
-		return nil, err
+func NewManager(cfg *config.Server, inK8s bool) (extTypes.Manager, error) {
+	var cli k8scli.Client
+	var err error
+	if inK8s {
+		cli, err = k8scli.New(k8sclicfg.GetConfigOrDie(), k8scli.Options{Scheme: envoygateway.GetScheme()})
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	var extension *egv1a1.ExtensionManager
@@ -271,6 +275,9 @@ func setupGRPCOpts(ctx context.Context, client k8scli.Client, ext *egv1a1.Extens
 	if ext.Service == nil {
 		return nil, errors.New("the registered extension doesn't have a service config")
 	}
+	if ext.Service.TLS != nil && client == nil {
+		return nil, errors.New("the registered extension's service config has TLS enabled but no k8s client was provided")
+	}
 
 	var opts []grpc.DialOption
 	if ext.Service.TLS != nil {

internal/gatewayapi/testdata/gateway-namespace-mode-infra-httproute.in.yaml

@@ -13,6 +13,34 @@ gateways:
           allowedRoutes:
             namespaces:
               from: All
+  - apiVersion: gateway.networking.k8s.io/v1
+    kind: Gateway
+    metadata:
+      namespace: default
+      name: gateway-2
+    spec:
+      gatewayClassName: envoy-gateway-class
+      listeners:
+        - name: http
+          protocol: HTTP
+          port: 80
+          allowedRoutes:
+            namespaces:
+              from: All
+  - apiVersion: gateway.networking.k8s.io/v1
+    kind: Gateway
+    metadata:
+      namespace: test-ns
+      name: gateway-3
+    spec:
+      gatewayClassName: envoy-gateway-class
+      listeners:
+        - name: http
+          protocol: HTTP
+          port: 80
+          allowedRoutes:
+            namespaces:
+              from: All
 httpRoutes:
   - apiVersion: gateway.networking.k8s.io/v1
     kind: HTTPRoute
@@ -21,12 +49,101 @@ httpRoutes:
       name: httproute-1
     spec:
       parentRefs:
-        - namespace: envoy-gateway
+        - namespace: default
           name: gateway-1
       rules:
         - matches:
             - path:
                 value: "/"
           backendRefs:
             - name: service-1
+              namespace: default
+              port: 8080
+  - apiVersion: gateway.networking.k8s.io/v1
+    kind: HTTPRoute
+    metadata:
+      namespace: default
+      name: httproute-2
+    spec:
+      parentRefs:
+        - namespace: default
+          name: gateway-2
+      rules:
+        - matches:
+            - path:
+                value: "/"
+          backendRefs:
+            - name: service-2
+              namespace: default
+              port: 8080
+  - apiVersion: gateway.networking.k8s.io/v1
+    kind: HTTPRoute
+    metadata:
+      namespace: test-ns
+      name: httproute-3
+    spec:
+      parentRefs:
+        - namespace: test-ns
+          name: gateway-3
+      rules:
+        - matches:
+            - path:
+                value: "/"
+          backendRefs:
+            - name: service-3
+              namespace: test-ns
               port: 8080
+services:
+  - apiVersion: v1
+    kind: Service
+    metadata:
+      namespace: default
+      name: service-1
+    spec:
+      clusterIP: 1.1.1.1
+      ports:
+        - name: http
+          port: 8080
+          protocol: TCP
+          targetPort: 8080
+  - apiVersion: v1
+    kind: Service
+    metadata:
+      namespace: default
+      name: service-2
+    spec:
+      clusterIP: 2.2.2.2
+      ports:
+        - name: http
+          port: 8080
+          protocol: TCP
+          targetPort: 8080
+  - apiVersion: v1
+    kind: Service
+    metadata:
+      namespace: default
+      name: service-2
+    spec:
+      clusterIP: 2.2.2.2
+      ports:
+        - name: http
+          port: 8080
+          protocol: TCP
+          targetPort: 8080
+  - apiVersion: v1
+    kind: Service
+    metadata:
+      namespace: test-ns
+      name: service-3
+    spec:
+      clusterIP: 2.2.2.2
+      ports:
+        - name: http
+          port: 8080
+          protocol: TCP
+          targetPort: 8080
+namespaces:
+  - apiVersion: v1
+    kind: Namespace
+    metadata:
+      name: test-ns