Merge branch 'main' into dependabot

.github/workflows/build_and_test.yaml

@@ -86,19 +86,19 @@ jobs:
       with:
         name: envoy-gateway
         path: bin/
-    
+
     - name: Give Privileges To EG Binaries
       run: |
         chmod +x bin/linux/amd64/envoy-gateway
         chmod +x bin/linux/arm64/envoy-gateway
 
     # conformance
-    - name: Run Conformance Tests 
+    - name: Run Conformance Tests
       env:
         KIND_NODE_TAG: ${{ matrix.version }}
         IMAGE_PULL_POLICY: IfNotPresent
       run: make conformance
-  
+
   e2e-test:
     runs-on: ubuntu-latest
     needs: [build]
@@ -114,22 +114,22 @@ jobs:
       with:
         name: envoy-gateway
         path: bin/
-    
+
     - name: Give Privileges To EG Binaries
       run: |
         chmod +x bin/linux/amd64/envoy-gateway
         chmod +x bin/linux/arm64/envoy-gateway
 
     # E2E
-    - name: Run E2E Tests 
+    - name: Run E2E Tests
       env:
         KIND_NODE_TAG: ${{ matrix.version }}
         IMAGE_PULL_POLICY: IfNotPresent
       run: make e2e
 
   publish:
     runs-on: ubuntu-latest
-    needs: [conformance-test]
+    needs: [conformance-test, e2e-test]
     steps:
     - uses: actions/checkout@v3
     - uses: ./tools/github-actions/setup-deps

.github/workflows/docs.yaml

@@ -34,7 +34,7 @@ jobs:
       - name: Generate EG Pages
         run: make docs
 
-      # Upload docs for GitHub Pages    
+      # Upload docs for GitHub Pages
       - name: Upload GitHub Pages artifact
         uses: actions/[email protected]
         with:

.github/workflows/latest_release.yaml

@@ -17,7 +17,7 @@ jobs:
       run: make generate-manifests IMAGE=envoyproxy/gateway-dev TAG=latest OUTPUT_DIR=release-artifacts
 
     - name: Build egctl latest multiarch binaries
-      run: | 
+      run: |
         make build-multiarch BINS="egctl"
         tar -zcvf egctl_latest_linux_amd64.tar.gz bin/linux/amd64/
         tar -zcvf egctl_latest_linux_arm64.tar.gz bin/linux/arm64/
@@ -63,7 +63,7 @@ jobs:
           egctl_latest_darwin_arm64.tar.gz
         body: |
           This is the "latest" release of **Envoy Gateway**, which contains the most recent commits from the main branch.
-          
+
           This release **might not be stable**.
 
           It is only intended for developers wishing to try out the latest features in Envoy Gateway, some of which may not be fully implemented.
@@ -75,7 +75,7 @@ jobs:
           ```
 
     # Check if latest release and tag are created properly,
-    # if not, the workflow needs to report an error, 
+    # if not, the workflow needs to report an error,
     # let maintainers be aware of it and rerun it manually.
     # After Recreate the Latest Release and Tag, we need to sleep some time to wait
     # new tag and release are created before checking it.

.github/workflows/release.yaml

@@ -3,7 +3,7 @@ name: Release
 on:
   push:
     # Sequence of patterns matched against refs/tags
-    tags:        
+    tags:
       - "v*.*.*"
 jobs:
   release:

.github/workflows/retest.yaml

@@ -21,10 +21,10 @@ jobs:
             console.log(`Comment: ${comment}`);
             console.log(`Contains Trigger: ${containsTrigger}`);
             return containsTrigger;
-      
+
       - name: Install @octokit/core
         run: npm install @octokit/core@^3
-      
+
       - name: Rerun Action
         if: steps.check_comment.outputs.result == 'true'
         uses: actions/github-script@v6

api/config/v1alpha1/envoygateway_types.go

@@ -95,8 +95,8 @@ const (
 	// LogComponentProviderRunner defines the "provider" runner component.
 	LogComponentProviderRunner EnvoyGatewayLogComponent = "provider"
 
-	// LogComponentGatewayApiRunner defines the "gateway-api" runner component.
-	LogComponentGatewayApiRunner EnvoyGatewayLogComponent = "gateway-api"
+	// LogComponentGatewayAPIRunner defines the "gateway-api" runner component.
+	LogComponentGatewayAPIRunner EnvoyGatewayLogComponent = "gateway-api"
 
 	// LogComponentXdsTranslatorRunner defines the "xds-translator" runner component.
 	LogComponentXdsTranslatorRunner EnvoyGatewayLogComponent = "xds-translator"

api/config/v1alpha1/validate_test.go

@@ -284,17 +284,17 @@ func TestDefaultEnvoyGatewayLoggingLevel(t *testing.T) {
 		},
 		{
 			name: "test gateway-api error level for error level",
-			args: args{component: string(LogComponentGatewayApiRunner), level: LogLevelError},
+			args: args{component: string(LogComponentGatewayAPIRunner), level: LogLevelError},
 			want: LogLevelError,
 		},
 		{
 			name: "test gateway-api info level for info level",
-			args: args{component: string(LogComponentGatewayApiRunner), level: LogLevelInfo},
+			args: args{component: string(LogComponentGatewayAPIRunner), level: LogLevelInfo},
 			want: LogLevelInfo,
 		},
 		{
 			name: "test default gateway-api warn level for info level",
-			args: args{component: string(LogComponentGatewayApiRunner), level: ""},
+			args: args{component: string(LogComponentGatewayAPIRunner), level: ""},
 			want: LogLevelInfo,
 		},
 	}

buf.gen.yaml

@@ -3,6 +3,7 @@ plugins:
   - plugin: go
     out: ./
     path: tools/bin/protoc-gen-go
+    opt: paths=source_relative
   - plugin: go-grpc
     out: ./
     path: tools/bin/protoc-gen-go-grpc

charts/gateway-helm/templates/envoy-gateway-config.yaml

@@ -15,5 +15,5 @@ data:
     provider:
       type: {{ .Values.config.envoyGateway.provider.type | quote }}
     logging:
-      level: 
+      level:
         default: info

docs/latest/dev/README.md

@@ -47,6 +47,7 @@ __Note:__ The binaries get generated in the `bin/$OS/$ARCH` directory, for examp
 ### Running Linters
 
 * Run `make lint` to make sure your code passes all the linter checks.
+__Note:__ The `golangci-lint` configuration resides [here](https://github.com/envoyproxy/gateway/blob/main/tools/linter/golangci-lint/.golangci.yml).
 
 ### Building and Pushing the Image
 

examples/kubernetes/grpc-routing.yaml

@@ -66,16 +66,16 @@ kind: GRPCRoute
 metadata:
   name: yages
   labels:
-    example: grpc-routing        
+    example: grpc-routing
 spec:
   parentRefs:
-    - name: example-gateway 
+    - name: example-gateway
   hostnames:
     - "grpc-example.com"
   rules:
     - backendRefs:
         - group: ""
           kind: Service
-          name: yages 
+          name: yages
           port: 9000
           weight: 1

examples/loki/loki.yaml

@@ -84,7 +84,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
 data:
   runtime-config.yaml: |
-    
+
     {}
 ---
 # Source: loki/templates/service-memberlist.yaml

examples/otel-collector/helm-values.yaml

@@ -17,7 +17,7 @@ config:
           key: loki.attribute.labels
           # k8s.pod.name is OpenTelemetry format for Kubernetes Pod name,
           # Loki will convert this to k8s_pod_name label.
-          value: k8s.pod.name, k8s.namespace.name 
+          value: k8s.pod.name, k8s.namespace.name
   receivers:
     otlp:
       protocols:

go.mod

@@ -21,7 +21,7 @@ require (
 	go.opentelemetry.io/proto/otlp v0.20.0
 	go.uber.org/zap v1.24.0
 	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e
-	google.golang.org/grpc v1.56.0
+	google.golang.org/grpc v1.56.1
 	google.golang.org/protobuf v1.30.0
 	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/api v0.27.3

go.sum

@@ -311,8 +311,8 @@ google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZi
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.56.0 h1:+y7Bs8rtMd07LeXmL3NxcTLn7mUkbKZqEpPhMNkwJEE=
-google.golang.org/grpc v1.56.0/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s=
+google.golang.org/grpc v1.56.1 h1:z0dNfjIl0VpaZ9iSVjA6daGatAYwPGstTjt5vkRMFkQ=
+google.golang.org/grpc v1.56.1/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

internal/cmd/egctl/testdata/translate/in/default-resources.yaml

@@ -161,7 +161,7 @@ metadata:
   name: endpointslice-providedBackend
   namespace: default
   labels:
-    kubernetes.io/service-name: providedBackend 
+    kubernetes.io/service-name: providedBackend
 addressType: IPv4
 ports:
   - name: http

internal/cmd/egctl/testdata/translate/in/invalid-envoyproxy.yaml

@@ -2,7 +2,7 @@ apiVersion: config.gateway.envoyproxy.io/v1alpha1
 kind: EnvoyProxy
 metadata:
   name: example
-  namespace: default 
+  namespace: default
 spec:
   bootstrap: |
     admin:
@@ -26,7 +26,7 @@ spec:
     group: config.gateway.envoyproxy.io
     kind: EnvoyProxy
     name: example
-    namespace: default 
+    namespace: default
 ---
 apiVersion: gateway.networking.k8s.io/v1beta1
 kind: Gateway

internal/cmd/egctl/testdata/translate/in/valid-envoyproxy.yaml

@@ -2,14 +2,14 @@ apiVersion: config.gateway.envoyproxy.io/v1alpha1
 kind: EnvoyProxy
 metadata:
   name: example
-  namespace: default 
+  namespace: default
 spec:
   provider:
     type: Kubernetes
     kubernetes:
       envoyService:
         annotations:
-          custom1: svc-annotation1 
+          custom1: svc-annotation1
 ---
 apiVersion: gateway.networking.k8s.io/v1beta1
 kind: GatewayClass
@@ -21,7 +21,7 @@ spec:
     group: config.gateway.envoyproxy.io
     kind: EnvoyProxy
     name: example
-    namespace: default 
+    namespace: default
 ---
 apiVersion: gateway.networking.k8s.io/v1beta1
 kind: Gateway