cleanup(bootstrap): replace deprecated admin_access_log_path

Use correct access logging instead using access_log

Fix #2114

Signed-off-by: Charly Molter <charly.molter@konghq.com>

pkg/xds/bootstrap/generator.go

@@ -376,7 +376,7 @@ func (b *bootstrapGenerator) adminAccessLogPath(operatingSystem string) string {
 	}
 	if b.config.Params.AdminAccessLogPath == os.DevNull && operatingSystem == "windows" {
 		// when AdminAccessLogPath was not explicitly set and DPP OS is Windows we need to set window specific DevNull.
-		// otherwise when CP is on Linux, we would set /dev/null which is not corrent on Windows.
+		// otherwise when CP is on Linux, we would set /dev/null which is not valid on Windows.
 		return "NUL"
 	}
 	return b.config.Params.AdminAccessLogPath

pkg/xds/bootstrap/template_v3.go

@@ -5,14 +5,17 @@ import (
 	"strconv"
 
 	"github.com/asaskevich/govalidator"
+	envoy_accesslog_v3 "github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v3"
 	envoy_bootstrap_v3 "github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v3"
 	envoy_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
 	envoy_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
 	envoy_config_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3"
 	envoy_grpc_credentials_v3 "github.com/envoyproxy/go-control-plane/envoy/config/grpc_credential/v3"
 	envoy_metrics_v3 "github.com/envoyproxy/go-control-plane/envoy/config/metrics/v3"
+	access_loggers_file "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/file/v3"
 	envoy_tls "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3"
 	envoy_type_matcher_v3 "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3"
+	"github.com/pkg/errors"
 
 	util_proto "github.com/kumahq/kuma/pkg/util/proto"
 	clusters_v3 "github.com/kumahq/kuma/pkg/xds/envoy/clusters/v3"
@@ -188,7 +191,6 @@ func genConfig(parameters configParameters, useTokenPath bool) (*envoy_bootstrap
 	if parameters.AdminPort != 0 {
 		res.Node.Metadata.Fields["dataplane.admin.port"] = util_proto.MustNewValueForStruct(strconv.Itoa(int(parameters.AdminPort)))
 		res.Admin = &envoy_bootstrap_v3.Admin{
-			AccessLogPath: parameters.AdminAccessLogPath,
 			Address: &envoy_core_v3.Address{
 				Address: &envoy_core_v3.Address_SocketAddress{
 					SocketAddress: &envoy_core_v3.SocketAddress{
@@ -201,6 +203,23 @@ func genConfig(parameters configParameters, useTokenPath bool) (*envoy_bootstrap
 				},
 			},
 		}
+		if parameters.AdminAccessLogPath != "" {
+			fileAccessLog := &access_loggers_file.FileAccessLog{
+				Path: parameters.AdminAccessLogPath,
+			}
+			var marshaled, err = util_proto.MarshalAnyDeterministic(fileAccessLog)
+			if err != nil {
+				return nil, errors.Wrapf(err, "could not marshall %T", fileAccessLog)
+			}
+			res.Admin.AccessLog = []*envoy_accesslog_v3.AccessLog{
+				{
+					Name: "envoy.access_loggers.file",
+					ConfigType: &envoy_accesslog_v3.AccessLog_TypedConfig{
+						TypedConfig: marshaled,
+					},
+				},
+			}
+		}
 	}
 	if parameters.DNSPort != 0 {
 		res.Node.Metadata.Fields["dataplane.dns.port"] = util_proto.MustNewValueForStruct(strconv.Itoa(int(parameters.DNSPort)))

pkg/xds/bootstrap/testdata/bootstrap.overridden.golden.yaml

@@ -1,5 +1,9 @@
 admin:
-  accessLogPath: /dev/null
+  accessLog:
+  - name: envoy.access_loggers.file
+    typedConfig:
+      '@type': type.googleapis.com/envoy.extensions.access_loggers.file.v3.FileAccessLog
+      path: /dev/null
   address:
     socketAddress:
       address: 127.0.0.1

pkg/xds/bootstrap/testdata/generator.custom-config-minimal-request.golden.yaml

@@ -1,5 +1,9 @@
 admin:
-  accessLogPath: /var/log
+  accessLog:
+  - name: envoy.access_loggers.file
+    typedConfig:
+      '@type': type.googleapis.com/envoy.extensions.access_loggers.file.v3.FileAccessLog
+      path: /var/log
   address:
     socketAddress:
       address: 192.168.0.1

pkg/xds/bootstrap/testdata/generator.custom-config.golden.yaml

@@ -1,5 +1,9 @@
 admin:
-  accessLogPath: NUL
+  accessLog:
+  - name: envoy.access_loggers.file
+    typedConfig:
+      '@type': type.googleapis.com/envoy.extensions.access_loggers.file.v3.FileAccessLog
+      path: NUL
   address:
     socketAddress:
       address: 192.168.0.1

pkg/xds/bootstrap/testdata/generator.default-config-token-path.golden.yaml

@@ -1,5 +1,9 @@
 admin:
-  accessLogPath: /dev/null
+  accessLog:
+  - name: envoy.access_loggers.file
+    typedConfig:
+      '@type': type.googleapis.com/envoy.extensions.access_loggers.file.v3.FileAccessLog
+      path: /dev/null
   address:
     socketAddress:
       address: 127.0.0.1

pkg/xds/bootstrap/testdata/generator.default-config.golden.yaml

@@ -1,5 +1,9 @@
 admin:
-  accessLogPath: /dev/null
+  accessLog:
+  - name: envoy.access_loggers.file
+    typedConfig:
+      '@type': type.googleapis.com/envoy.extensions.access_loggers.file.v3.FileAccessLog
+      path: /dev/null
   address:
     socketAddress:
       address: 127.0.0.1

pkg/xds/bootstrap/testdata/generator.default-config.kubernetes.golden.yaml

@@ -1,5 +1,9 @@
 admin:
-  accessLogPath: /dev/null
+  accessLog:
+  - name: envoy.access_loggers.file
+    typedConfig:
+      '@type': type.googleapis.com/envoy.extensions.access_loggers.file.v3.FileAccessLog
+      path: /dev/null
   address:
     socketAddress:
       address: 127.0.0.1

pkg/xds/bootstrap/testdata/generator.default-config.kubernetes.ipv6.golden.yaml

@@ -1,5 +1,9 @@
 admin:
-  accessLogPath: /dev/null
+  accessLog:
+  - name: envoy.access_loggers.file
+    typedConfig:
+      '@type': type.googleapis.com/envoy.extensions.access_loggers.file.v3.FileAccessLog
+      path: /dev/null
   address:
     socketAddress:
       address: 127.0.0.1

pkg/xds/bootstrap/testdata/generator.metrics-config.kubernetes.golden.yaml

@@ -1,5 +1,9 @@
 admin:
-  accessLogPath: /dev/null
+  accessLog:
+  - name: envoy.access_loggers.file
+    typedConfig:
+      '@type': type.googleapis.com/envoy.extensions.access_loggers.file.v3.FileAccessLog
+      path: /dev/null
   address:
     socketAddress:
       address: 127.0.0.1