Merge branch 'main' into vhost-stats

envoyproxy · Aug 31, 2023 · 2374572 · 2374572
2 parents 4766f5b + a324513
commit 2374572
Show file tree

Hide file tree

Showing 23 changed files with 142 additions and 88 deletions.
diff --git a/charts/gateway-helm/crds/gatewayapi-crds.yaml b/charts/gateway-helm/crds/gatewayapi-crds.yaml
@@ -24,7 +24,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2245
-    gateway.networking.k8s.io/bundle-version: v0.8.0-rc2
+    gateway.networking.k8s.io/bundle-version: v0.8.0
     gateway.networking.k8s.io/channel: experimental
   creationTimestamp: null
   name: gatewayclasses.gateway.networking.k8s.io
@@ -469,7 +469,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2245
-    gateway.networking.k8s.io/bundle-version: v0.8.0-rc2
+    gateway.networking.k8s.io/bundle-version: v0.8.0
     gateway.networking.k8s.io/channel: experimental
   creationTimestamp: null
   name: gateways.gateway.networking.k8s.io
@@ -2060,7 +2060,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2245
-    gateway.networking.k8s.io/bundle-version: v0.8.0-rc2
+    gateway.networking.k8s.io/bundle-version: v0.8.0
     gateway.networking.k8s.io/channel: experimental
   creationTimestamp: null
   name: grpcroutes.gateway.networking.k8s.io
@@ -3765,7 +3765,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2245
-    gateway.networking.k8s.io/bundle-version: v0.8.0-rc2
+    gateway.networking.k8s.io/bundle-version: v0.8.0
     gateway.networking.k8s.io/channel: experimental
   creationTimestamp: null
   name: httproutes.gateway.networking.k8s.io
@@ -8596,7 +8596,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2245
-    gateway.networking.k8s.io/bundle-version: v0.8.0-rc2
+    gateway.networking.k8s.io/bundle-version: v0.8.0
     gateway.networking.k8s.io/channel: experimental
   creationTimestamp: null
   name: referencegrants.gateway.networking.k8s.io
@@ -8885,7 +8885,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2245
-    gateway.networking.k8s.io/bundle-version: v0.8.0-rc2
+    gateway.networking.k8s.io/bundle-version: v0.8.0
     gateway.networking.k8s.io/channel: experimental
   creationTimestamp: null
   name: tcproutes.gateway.networking.k8s.io
@@ -9501,7 +9501,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2245
-    gateway.networking.k8s.io/bundle-version: v0.8.0-rc2
+    gateway.networking.k8s.io/bundle-version: v0.8.0
     gateway.networking.k8s.io/channel: experimental
   creationTimestamp: null
   name: tlsroutes.gateway.networking.k8s.io
@@ -10166,7 +10166,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2245
-    gateway.networking.k8s.io/bundle-version: v0.8.0-rc2
+    gateway.networking.k8s.io/bundle-version: v0.8.0
     gateway.networking.k8s.io/channel: experimental
   creationTimestamp: null
   name: udproutes.gateway.networking.k8s.io
@@ -10847,7 +10847,7 @@ spec:
     spec:
       containers:
       - name: webhook
-        image: registry.k8s.io/gateway-api/admission-server:v0.8.0-rc2
+        image: registry.k8s.io/gateway-api/admission-server:v0.8.0
         imagePullPolicy: IfNotPresent
         args:
         - -logtostderr

diff --git a/docs/latest/design/accesslog.md b/docs/latest/design/accesslog.md
@@ -133,7 +133,7 @@ metadata:
 spec:
   telemetry:
     accessLog:
-      disabled: true
+      disable: true
 ```
 
 2. The following is an example with text format access log.

diff --git a/docs/latest/user/proxy-observability.md b/docs/latest/user/proxy-observability.md
@@ -93,7 +93,7 @@ Verify logs from loki:
 curl -s "http://$LOKI_IP:3100/loki/api/v1/query_range" --data-urlencode "query={job=\"fluentbit\"}" | jq '.data.result[0].values'
 ```
 
-If you want to disable it, set the `telemetry.accesslog.disabled` to `true` in the `EnvoyProxy` CRD.
+If you want to disable it, set the `telemetry.accesslog.disable` to `true` in the `EnvoyProxy` CRD.
 
 ```shell
 kubectl apply -f https://raw.githubusercontent.com/envoyproxy/gateway/latest/examples/kubernetes/accesslog/disable-accesslog.yaml
@@ -130,4 +130,4 @@ curl -s "http://$TEMPO_IP:3100/api/search" --data-urlencode "q={ component=envoy
 
 ```shell
 curl -s "http://$TEMPO_IP:3100/api/traces/<trace_id>" | jq
-```
+```
diff --git a/docs/v0.5.0/design/accesslog.md b/docs/v0.5.0/design/accesslog.md
@@ -133,7 +133,7 @@ metadata:
 spec:
   telemetry:
     accessLog:
-      disabled: true
+      disable: true
 ```
 
 2. The following is an example with text format access log.

diff --git a/docs/v0.5.0/user/proxy-observability.md b/docs/v0.5.0/user/proxy-observability.md
@@ -93,7 +93,7 @@ Verify logs from loki:
 curl -s "http://$LOKI_IP:3100/loki/api/v1/query_range" --data-urlencode "query={job=\"fluentbit\"}" | jq '.data.result[0].values'
 ```
 
-If you want to disable it, set the `telemetry.accesslog.disabled` to `true` in the `EnvoyProxy` CRD.
+If you want to disable it, set the `telemetry.accesslog.disable` to `true` in the `EnvoyProxy` CRD.
 
 ```shell
 kubectl apply -f https://raw.githubusercontent.com/envoyproxy/gateway/latest/examples/kubernetes/accesslog/disable-accesslog.yaml
@@ -130,4 +130,4 @@ curl -s "http://$TEMPO_IP:3100/api/search" --data-urlencode "q={ component=envoy
 
 ```shell
 curl -s "http://$TEMPO_IP:3100/api/traces/<trace_id>" | jq
-```
+```
diff --git a/examples/kubernetes/accesslog/disable-accesslog.yaml b/examples/kubernetes/accesslog/disable-accesslog.yaml
@@ -18,4 +18,4 @@ metadata:
 spec:
   telemetry:
     accessLog:
-      disabled: true
+      disable: true
diff --git a/examples/kubernetes/tracing/default.yaml b/examples/kubernetes/tracing/default.yaml
@@ -23,6 +23,7 @@ spec:
       provider:
         host: otel-collector.monitoring.svc.cluster.local
         port: 4317
+        type: OpenTelemetry
       customTags:
         # This is an example of using a literal as a tag value
         key1:

diff --git a/go.mod b/go.mod
@@ -36,8 +36,8 @@ require (
 	k8s.io/client-go v0.28.1
 	k8s.io/kubectl v0.28.1
 	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
-	sigs.k8s.io/controller-runtime v0.15.1
-	sigs.k8s.io/gateway-api v0.8.0-rc2
+	sigs.k8s.io/controller-runtime v0.16.0
+	sigs.k8s.io/gateway-api v0.8.0
 	sigs.k8s.io/yaml v1.3.0
 )
 
@@ -101,7 +101,7 @@ require (
 	golang.org/x/term v0.11.0 // indirect
 	golang.org/x/text v0.12.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
+	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20230526203410-71b5a4ffd15e // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect