+tlsSettings |
+ClientTLSSettings |
+
+ Use the tls_settings to specify the tls mode to use. If the remote tracing service
+uses Istio mutual TLS and shares the root CA with Pilot, specify the TLS
+mode as ISTIO_MUTUAL.
+
|
No
diff --git a/api/v1alpha1/istiocontrolplane.proto b/api/v1alpha1/istiocontrolplane.proto
index 9641a19ac..4865d0535 100644
--- a/api/v1alpha1/istiocontrolplane.proto
+++ b/api/v1alpha1/istiocontrolplane.proto
@@ -18,6 +18,7 @@ import "api/v1alpha1/common.proto";
import "api/v1alpha1/istiomeshgateway.proto";
import "k8s.io/api/core/v1/generated.proto";
import "mesh/v1alpha1/config.proto";
+import "mesh/v1alpha1/proxy.proto";
import "google/api/field_behavior.proto";
import "google/protobuf/wrappers.proto";
@@ -122,6 +123,8 @@ message IstioControlPlaneSpec {
string networkName = 23;
// Standalone sidecar injector configuration.
SidecarInjectorConfiguration sidecarInjector = 24;
+ // Tracing defines configuration for the tracing performed by Envoy instances.
+ istio.mesh.v1alpha1.Tracing tracer = 25;
}
enum ModeType {
@@ -231,6 +234,8 @@ message ProxyConfiguration {
string excludeInboundPorts = 12;
// ExcludeOutboundPorts the comma separated list of outbound ports to be excluded from redirection to Envoy
string excludeOutboundPorts = 13;
+ // Specify which tracer to use. One of: zipkin, lightstep, datadog, stackdriver
+ optional string tracer = 14;
}
enum ProxyLogLevel {
diff --git a/config/crd/bases/istio-operator-crds.gen.yaml b/config/crd/bases/istio-operator-crds.gen.yaml
index fed716285..8fb7cda54 100644
--- a/config/crd/bases/istio-operator-crds.gen.yaml
+++ b/config/crd/bases/istio-operator-crds.gen.yaml
@@ -4678,6 +4678,8 @@ spec:
x-kubernetes-int-or-string: true
type: object
type: object
+ tracer:
+ type: string
type: object
proxyInit:
properties:
@@ -8092,6 +8094,151 @@ spec:
nullable: true
type: boolean
type: object
+ tracer:
+ oneOf:
+ - not:
+ anyOf:
+ - required:
+ - zipkin
+ - required:
+ - lightstep
+ - required:
+ - datadog
+ - required:
+ - stackdriver
+ - required:
+ - openCensusAgent
+ - required:
+ - zipkin
+ - required:
+ - lightstep
+ - required:
+ - datadog
+ - required:
+ - stackdriver
+ - required:
+ - openCensusAgent
+ properties:
+ customTags:
+ additionalProperties:
+ oneOf:
+ - not:
+ anyOf:
+ - required:
+ - literal
+ - required:
+ - environment
+ - required:
+ - header
+ - required:
+ - literal
+ - required:
+ - environment
+ - required:
+ - header
+ properties:
+ environment:
+ properties:
+ defaultValue:
+ type: string
+ name:
+ type: string
+ type: object
+ header:
+ properties:
+ defaultValue:
+ type: string
+ name:
+ type: string
+ type: object
+ literal:
+ properties:
+ value:
+ type: string
+ type: object
+ type: object
+ type: object
+ datadog:
+ properties:
+ address:
+ type: string
+ type: object
+ lightstep:
+ properties:
+ accessToken:
+ type: string
+ address:
+ type: string
+ type: object
+ maxPathTagLength:
+ type: integer
+ openCensusAgent:
+ properties:
+ address:
+ type: string
+ context:
+ items:
+ enum:
+ - UNSPECIFIED
+ - W3C_TRACE_CONTEXT
+ - GRPC_BIN
+ - CLOUD_TRACE_CONTEXT
+ - B3
+ type: string
+ type: array
+ type: object
+ sampling:
+ format: double
+ type: number
+ stackdriver:
+ properties:
+ debug:
+ type: boolean
+ maxNumberOfAnnotations:
+ nullable: true
+ type: integer
+ maxNumberOfAttributes:
+ nullable: true
+ type: integer
+ maxNumberOfMessageEvents:
+ nullable: true
+ type: integer
+ type: object
+ tlsSettings:
+ properties:
+ caCertificates:
+ type: string
+ clientCertificate:
+ type: string
+ credentialName:
+ type: string
+ insecureSkipVerify:
+ nullable: true
+ type: boolean
+ mode:
+ enum:
+ - DISABLE
+ - SIMPLE
+ - MUTUAL
+ - ISTIO_MUTUAL
+ type: string
+ privateKey:
+ type: string
+ sni:
+ type: string
+ subjectAltNames:
+ items:
+ type: string
+ type: array
+ required:
+ - mode
+ type: object
+ zipkin:
+ properties:
+ address:
+ type: string
+ type: object
+ type: object
version:
pattern: ^1\.
type: string
@@ -13956,6 +14103,8 @@ spec:
x-kubernetes-int-or-string: true
type: object
type: object
+ tracer:
+ type: string
type: object
proxyInit:
properties:
@@ -17370,6 +17519,151 @@ spec:
nullable: true
type: boolean
type: object
+ tracer:
+ oneOf:
+ - not:
+ anyOf:
+ - required:
+ - zipkin
+ - required:
+ - lightstep
+ - required:
+ - datadog
+ - required:
+ - stackdriver
+ - required:
+ - openCensusAgent
+ - required:
+ - zipkin
+ - required:
+ - lightstep
+ - required:
+ - datadog
+ - required:
+ - stackdriver
+ - required:
+ - openCensusAgent
+ properties:
+ customTags:
+ additionalProperties:
+ oneOf:
+ - not:
+ anyOf:
+ - required:
+ - literal
+ - required:
+ - environment
+ - required:
+ - header
+ - required:
+ - literal
+ - required:
+ - environment
+ - required:
+ - header
+ properties:
+ environment:
+ properties:
+ defaultValue:
+ type: string
+ name:
+ type: string
+ type: object
+ header:
+ properties:
+ defaultValue:
+ type: string
+ name:
+ type: string
+ type: object
+ literal:
+ properties:
+ value:
+ type: string
+ type: object
+ type: object
+ type: object
+ datadog:
+ properties:
+ address:
+ type: string
+ type: object
+ lightstep:
+ properties:
+ accessToken:
+ type: string
+ address:
+ type: string
+ type: object
+ maxPathTagLength:
+ type: integer
+ openCensusAgent:
+ properties:
+ address:
+ type: string
+ context:
+ items:
+ enum:
+ - UNSPECIFIED
+ - W3C_TRACE_CONTEXT
+ - GRPC_BIN
+ - CLOUD_TRACE_CONTEXT
+ - B3
+ type: string
+ type: array
+ type: object
+ sampling:
+ format: double
+ type: number
+ stackdriver:
+ properties:
+ debug:
+ type: boolean
+ maxNumberOfAnnotations:
+ nullable: true
+ type: integer
+ maxNumberOfAttributes:
+ nullable: true
+ type: integer
+ maxNumberOfMessageEvents:
+ nullable: true
+ type: integer
+ type: object
+ tlsSettings:
+ properties:
+ caCertificates:
+ type: string
+ clientCertificate:
+ type: string
+ credentialName:
+ type: string
+ insecureSkipVerify:
+ nullable: true
+ type: boolean
+ mode:
+ enum:
+ - DISABLE
+ - SIMPLE
+ - MUTUAL
+ - ISTIO_MUTUAL
+ type: string
+ privateKey:
+ type: string
+ sni:
+ type: string
+ subjectAltNames:
+ items:
+ type: string
+ type: array
+ required:
+ - mode
+ type: object
+ zipkin:
+ properties:
+ address:
+ type: string
+ type: object
+ type: object
version:
pattern: ^1\.
type: string
diff --git a/controllers/istiocontrolplane_controller.go b/controllers/istiocontrolplane_controller.go
index 6edf21766..24a99d72c 100644
--- a/controllers/istiocontrolplane_controller.go
+++ b/controllers/istiocontrolplane_controller.go
@@ -79,7 +79,7 @@ const (
istioControlPlaneFinalizerID = "istio-controlplane.servicemesh.cisco.com"
meshExpansionGatewayRemovalRequeueDuration = time.Second * 30
readerServiceAccountName = "istio-reader"
- // nolint:gosec
+ //nolint:gosec
readerSecretType = "k8s.cisco.com/istio-reader-secret"
)
@@ -850,7 +850,7 @@ func (r *IstioControlPlaneReconciler) getMeshNetworks(ctx context.Context, icp *
Gw: &v1alpha1.Network_IstioNetworkGateway_Address{
Address: address,
},
- Port: 15443, // nolint:gomnd
+ Port: 15443, //nolint:gomnd
})
}
@@ -1272,7 +1272,7 @@ func (r *IstioControlPlaneReconciler) getNamespaceInjectionSourcePICP(ctx contex
var sourceICP *servicemeshv1alpha1.PeerIstioControlPlane
for _, picp := range picpList.Items {
picp := picp
- if v, ok := picp.GetAnnotations()[servicemeshv1alpha1.NamespaceInjectionSourceAnnotation]; ok && v == "true" && picp.GetStatus().IstioControlPlaneName == cp.Name { // nolint:goconst
+ if v, ok := picp.GetAnnotations()[servicemeshv1alpha1.NamespaceInjectionSourceAnnotation]; ok && v == "true" && picp.GetStatus().IstioControlPlaneName == cp.Name { //nolint:goconst
sourceICP = &picp
}
}
diff --git a/deploy/charts/go.mod b/deploy/charts/go.mod
index cc3c2452f..60c1d3661 100644
--- a/deploy/charts/go.mod
+++ b/deploy/charts/go.mod
@@ -1,3 +1,3 @@
module github.com/banzaicloud/istio-operator/deploy/charts/v2
-go 1.18
+go 1.21
diff --git a/deploy/charts/istio-operator/crds/istio-operator-crds.gen.yaml b/deploy/charts/istio-operator/crds/istio-operator-crds.gen.yaml
index fed716285..8fb7cda54 100644
--- a/deploy/charts/istio-operator/crds/istio-operator-crds.gen.yaml
+++ b/deploy/charts/istio-operator/crds/istio-operator-crds.gen.yaml
@@ -4678,6 +4678,8 @@ spec:
x-kubernetes-int-or-string: true
type: object
type: object
+ tracer:
+ type: string
type: object
proxyInit:
properties:
@@ -8092,6 +8094,151 @@ spec:
nullable: true
type: boolean
type: object
+ tracer:
+ oneOf:
+ - not:
+ anyOf:
+ - required:
+ - zipkin
+ - required:
+ - lightstep
+ - required:
+ - datadog
+ - required:
+ - stackdriver
+ - required:
+ - openCensusAgent
+ - required:
+ - zipkin
+ - required:
+ - lightstep
+ - required:
+ - datadog
+ - required:
+ - stackdriver
+ - required:
+ - openCensusAgent
+ properties:
+ customTags:
+ additionalProperties:
+ oneOf:
+ - not:
+ anyOf:
+ - required:
+ - literal
+ - required:
+ - environment
+ - required:
+ - header
+ - required:
+ - literal
+ - required:
+ - environment
+ - required:
+ - header
+ properties:
+ environment:
+ properties:
+ defaultValue:
+ type: string
+ name:
+ type: string
+ type: object
+ header:
+ properties:
+ defaultValue:
+ type: string
+ name:
+ type: string
+ type: object
+ literal:
+ properties:
+ value:
+ type: string
+ type: object
+ type: object
+ type: object
+ datadog:
+ properties:
+ address:
+ type: string
+ type: object
+ lightstep:
+ properties:
+ accessToken:
+ type: string
+ address:
+ type: string
+ type: object
+ maxPathTagLength:
+ type: integer
+ openCensusAgent:
+ properties:
+ address:
+ type: string
+ context:
+ items:
+ enum:
+ - UNSPECIFIED
+ - W3C_TRACE_CONTEXT
+ - GRPC_BIN
+ - CLOUD_TRACE_CONTEXT
+ - B3
+ type: string
+ type: array
+ type: object
+ sampling:
+ format: double
+ type: number
+ stackdriver:
+ properties:
+ debug:
+ type: boolean
+ maxNumberOfAnnotations:
+ nullable: true
+ type: integer
+ maxNumberOfAttributes:
+ nullable: true
+ type: integer
+ maxNumberOfMessageEvents:
+ nullable: true
+ type: integer
+ type: object
+ tlsSettings:
+ properties:
+ caCertificates:
+ type: string
+ clientCertificate:
+ type: string
+ credentialName:
+ type: string
+ insecureSkipVerify:
+ nullable: true
+ type: boolean
+ mode:
+ enum:
+ - DISABLE
+ - SIMPLE
+ - MUTUAL
+ - ISTIO_MUTUAL
+ type: string
+ privateKey:
+ type: string
+ sni:
+ type: string
+ subjectAltNames:
+ items:
+ type: string
+ type: array
+ required:
+ - mode
+ type: object
+ zipkin:
+ properties:
+ address:
+ type: string
+ type: object
+ type: object
version:
pattern: ^1\.
type: string
@@ -13956,6 +14103,8 @@ spec:
x-kubernetes-int-or-string: true
type: object
type: object
+ tracer:
+ type: string
type: object
proxyInit:
properties:
@@ -17370,6 +17519,151 @@ spec:
nullable: true
type: boolean
type: object
+ tracer:
+ oneOf:
+ - not:
+ anyOf:
+ - required:
+ - zipkin
+ - required:
+ - lightstep
+ - required:
+ - datadog
+ - required:
+ - stackdriver
+ - required:
+ - openCensusAgent
+ - required:
+ - zipkin
+ - required:
+ - lightstep
+ - required:
+ - datadog
+ - required:
+ - stackdriver
+ - required:
+ - openCensusAgent
+ properties:
+ customTags:
+ additionalProperties:
+ oneOf:
+ - not:
+ anyOf:
+ - required:
+ - literal
+ - required:
+ - environment
+ - required:
+ - header
+ - required:
+ - literal
+ - required:
+ - environment
+ - required:
+ - header
+ properties:
+ environment:
+ properties:
+ defaultValue:
+ type: string
+ name:
+ type: string
+ type: object
+ header:
+ properties:
+ defaultValue:
+ type: string
+ name:
+ type: string
+ type: object
+ literal:
+ properties:
+ value:
+ type: string
+ type: object
+ type: object
+ type: object
+ datadog:
+ properties:
+ address:
+ type: string
+ type: object
+ lightstep:
+ properties:
+ accessToken:
+ type: string
+ address:
+ type: string
+ type: object
+ maxPathTagLength:
+ type: integer
+ openCensusAgent:
+ properties:
+ address:
+ type: string
+ context:
+ items:
+ enum:
+ - UNSPECIFIED
+ - W3C_TRACE_CONTEXT
+ - GRPC_BIN
+ - CLOUD_TRACE_CONTEXT
+ - B3
+ type: string
+ type: array
+ type: object
+ sampling:
+ format: double
+ type: number
+ stackdriver:
+ properties:
+ debug:
+ type: boolean
+ maxNumberOfAnnotations:
+ nullable: true
+ type: integer
+ maxNumberOfAttributes:
+ nullable: true
+ type: integer
+ maxNumberOfMessageEvents:
+ nullable: true
+ type: integer
+ type: object
+ tlsSettings:
+ properties:
+ caCertificates:
+ type: string
+ clientCertificate:
+ type: string
+ credentialName:
+ type: string
+ insecureSkipVerify:
+ nullable: true
+ type: boolean
+ mode:
+ enum:
+ - DISABLE
+ - SIMPLE
+ - MUTUAL
+ - ISTIO_MUTUAL
+ type: string
+ privateKey:
+ type: string
+ sni:
+ type: string
+ subjectAltNames:
+ items:
+ type: string
+ type: array
+ required:
+ - mode
+ type: object
+ zipkin:
+ properties:
+ address:
+ type: string
+ type: object
+ type: object
version:
pattern: ^1\.
type: string
diff --git a/go.mod b/go.mod
index 40aaaa55c..b869b21fd 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module github.com/banzaicloud/istio-operator/v2
-go 1.18
+go 1.21
require (
emperror.dev/errors v0.8.0
diff --git a/go.sum b/go.sum
index 5eb770359..0f3730299 100644
--- a/go.sum
+++ b/go.sum
@@ -53,6 +53,7 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU
github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60=
+github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E=
github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
@@ -70,7 +71,9 @@ github.com/Masterminds/sprig/v3 v3.2.2/go.mod h1:UoaO7Yp8KlPnJIYWTFkMaqPUYKTfGFP
github.com/Masterminds/squirrel v1.5.3 h1:YPpoceAcxuzIljlr5iWpNKaql7hLeG1KLSrhvdHpkZc=
github.com/Masterminds/squirrel v1.5.3/go.mod h1:NNaOrjSoIDfDA40n7sr2tPNZRfjzjA400rg+riTZj10=
github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA=
+github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
github.com/Microsoft/hcsshim v0.9.6 h1:VwnDOgLeoi2du6dAznfmspNqTiwczvjv4K7NxuY9jsY=
+github.com/Microsoft/hcsshim v0.9.6/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc=
github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
@@ -78,12 +81,14 @@ github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbt
github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs=
+github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ=
+github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
@@ -110,9 +115,13 @@ github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2y
github.com/briandowns/spinner v1.12.0 h1:72O0PzqGJb6G3KgrcIOtL/JAGGZ5ptOMCn9cUHmqsmw=
github.com/briandowns/spinner v1.12.0/go.mod h1:QOuQk7x+EaDASo80FEXwlwiA+j/PPIcX3FScO+3/ZPQ=
github.com/bshuster-repo/logrus-logstash-hook v1.0.0 h1:e+C0SB5R1pu//O4MQ3f9cFuPGoOVeF2fE4Og9otCc70=
+github.com/bshuster-repo/logrus-logstash-hook v1.0.0/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk=
github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd h1:rFt+Y/IK1aEZkEHchZRSq9OQbsSzIT/OrI8YFFmRIng=
+github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8=
github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b h1:otBG+dV+YK+Soembjv71DPz3uX/V/6MMlSyD9JBQ6kQ=
+github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50=
github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0 h1:nvj0OLI3YqYXer/kZD8Ri1aaunCxIEsOst1BVJswV0o=
+github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -133,6 +142,7 @@ github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnht
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/containerd/cgroups v1.0.4 h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA=
+github.com/containerd/cgroups v1.0.4/go.mod h1:nLNQtsF7Sl2HxNebu77i1R0oDlhiTG+kO4JTrUzo6IA=
github.com/containerd/containerd v1.6.18 h1:qZbsLvmyu+Vlty0/Ex5xc0z2YtKpIsb5n45mAMI+2Ns=
github.com/containerd/containerd v1.6.18/go.mod h1:1RdCUu95+gc2v9t3IL+zIlpClSmew7/0YS8O5eQZrOw=
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
@@ -154,6 +164,7 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE=
github.com/denisenkom/go-mssqldb v0.9.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
github.com/distribution/distribution/v3 v3.0.0-20220526142353-ffbd94cbe269 h1:hbCT8ZPPMqefiAWD2ZKjn7ypokIGViTvBBg/ExLSdCk=
+github.com/distribution/distribution/v3 v3.0.0-20220526142353-ffbd94cbe269/go.mod h1:28YO/VJk9/64+sTGNuYaBjWxrXTPrj0C0XmgTIOjxX4=
github.com/docker/cli v20.10.17+incompatible h1:eO2KS7ZFeov5UJeaDmIs1NFEDRf32PaqRpvoEkKBy5M=
github.com/docker/cli v20.10.17+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
@@ -165,11 +176,13 @@ github.com/docker/docker-credential-helpers v0.6.4/go.mod h1:ofX3UI0Gz1TteYBjtgs
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c h1:+pKlWGMw7gf6bQ+oDZB4KHQFypsfjYlq/C4rfL7D3g8=
+github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA=
github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8=
github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw=
github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1 h1:ZClxb8laGDf5arXfYcAtECDFgAgHklGI8CxgjHnXKJ4=
+github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE=
github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153 h1:yUdfgN0XgIJw7foRItutHYUIhlcKzcSf5vDpdhQAKTc=
@@ -202,6 +215,7 @@ github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
+github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
@@ -258,6 +272,7 @@ github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LB
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
github.com/go-test/deep v1.0.7 h1:/VSMRlnY/JSyqxQUzQLKVMAskpY/NZKFA5j2P+0pP2M=
+github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=
github.com/gobuffalo/logger v1.0.6 h1:nnZNpxYo0zx+Aj9RfMPBm+x9zAU2OayFh/xrAWi34HU=
github.com/gobuffalo/logger v1.0.6/go.mod h1:J31TBEHR1QLV2683OXTAItYIg8pv2JMHnF/quuAbMjs=
github.com/gobuffalo/packd v1.0.1 h1:U2wXfRr4E9DH8IdsDLlRFwTZTK7hLfq9qT/QHXGVe/0=
@@ -289,6 +304,7 @@ github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71
github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk=
github.com/gomodule/redigo v1.8.4 h1:Z5JUg94HMTR1XpwBaSH4vq3+PNSIykBLxMdglbw10gg=
+github.com/gomodule/redigo v1.8.4/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0=
github.com/gonvenience/bunt v1.3.3 h1:a751qSbJIgWGbazGYr9hyuudOg7wMHh2m4JjE3tfURE=
github.com/gonvenience/bunt v1.3.3/go.mod h1:XjlODZ8sTL9jQs9c4Kj1ZBTrHSsbUGdoRy7ROCtw8nU=
github.com/gonvenience/neat v1.3.9 h1:c3nbMP8ysGtaekkkY3Veg2OPa76fK8r45ontZdSPUw0=
@@ -351,6 +367,7 @@ github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3i
github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4=
+github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q=
github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
@@ -519,6 +536,7 @@ github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQ
github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8=
github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
github.com/moby/sys/mountinfo v0.5.0 h1:2Ks8/r6lopsxWi9m58nlwjaeSzUX9iiL1vj5qB/9ObI=
+github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU=
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw=
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae h1:O4SWKdcHVCvYqyDV+9CJA1fcDN2L11Bule0iFy3YlAI=
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw=
@@ -553,6 +571,7 @@ github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9k
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
github.com/onsi/ginkgo/v2 v2.6.0 h1:9t9b9vRUbFq3C4qKFCGkVuq/fIHji802N1nrtkh1mNc=
+github.com/onsi/ginkgo/v2 v2.6.0/go.mod h1:63DOGlLAH8+REH8jUGdL3YpCpu7JODesutUjdENfUAc=
github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
@@ -565,10 +584,12 @@ github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 h1:rc3
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw=
+github.com/pborman/uuid v1.2.1/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 h1:Ii+DKncOVM8Cu1Hc+ETb5K+23HdAMvESYE3ZJ5b5cMI=
+github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE=
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -661,6 +682,7 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
github.com/texttheater/golang-levenshtein v1.0.1 h1:+cRNoVrfiwufQPhoMzB6N0Yf/Mqajr6t1lOv8GyGE2U=
github.com/texttheater/golang-levenshtein v1.0.1/go.mod h1:PYAKrbF5sAiq9wd+H82hs7gNaen0CplQ9uvm6+enD/8=
@@ -691,8 +713,11 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1
github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43 h1:+lm10QQTNSBd8DVTNGHx7o/IKu9HYDvLMffDhbyLccI=
+github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs=
github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50 h1:hlE8//ciYMztlGpl/VA+Zm1AcTPHYkHJPbHqE6WJUXE=
+github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA=
github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f h1:ERexzlUfuTvpE74urLSbIQW0Z/6hF9t8U4NsJLaioAY=
+github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg=
github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs=
github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
@@ -723,6 +748,7 @@ go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=
+go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo=
go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
diff --git a/internal/assets/manifests/istio-discovery/templates/configmap.yaml b/internal/assets/manifests/istio-discovery/templates/configmap.yaml
index 8d2db8360..ddcd90c51 100644
--- a/internal/assets/manifests/istio-discovery/templates/configmap.yaml
+++ b/internal/assets/manifests/istio-discovery/templates/configmap.yaml
@@ -17,6 +17,7 @@
image:
imageType: {{. | quote}}
{{- end }}
+ {{- if ne .Values.global.proxy.tracer "" }}
tracing:
{{- if eq .Values.global.proxy.tracer "lightstep" }}
lightstep:
@@ -53,6 +54,9 @@
{{- else if eq .Values.global.proxy.tracer "openCensusAgent" }}
{{/* Fill in openCensusAgent configuration from meshConfig so it isn't overwritten below */}}
{{ toYaml $.Values.meshConfig.defaultConfig.tracing | indent 8 }}
+ {{- end }}
+ {{- else }}
+ tracing: {}
{{- end }}
{{- if .Values.global.remotePilotAddress }}
{{- if not .Values.global.externalIstiod }}
diff --git a/internal/assets/manifests/istio-discovery/values.yaml.tpl b/internal/assets/manifests/istio-discovery/values.yaml.tpl
index 0962b3ada..4286c920b 100644
--- a/internal/assets/manifests/istio-discovery/values.yaml.tpl
+++ b/internal/assets/manifests/istio-discovery/values.yaml.tpl
@@ -83,6 +83,9 @@ logLevel: {{ .GetSpec.GetProxy.GetLogLevel | toString | lower }}
{{ valueIf (dict "key" "holdApplicationUntilProxyStarts" "value" .GetSpec.GetProxy.GetHoldApplicationUntilProxyStarts) }}
{{ toYamlIf (dict "value" .GetSpec.GetProxy.GetResources "key" "resources") }}
{{ toYamlIf (dict "value" .GetSpec.GetProxy.GetLifecycle "key" "lifecycle") }}
+{{- if (and .GetSpec.GetProxy .GetSpec.GetProxy.Tracer) }}
+{{ valueIf (dict "key" "tracer" "value" .GetSpec.GetProxy.Tracer) }}
+{{- end }}
{{- end }}
# template for proxy init values
@@ -216,6 +219,9 @@ sds:
multiCluster:
{{ valueIf (dict "key" "clusterName" "value" .GetSpec.GetClusterID) | indent 2 }}
{{ end }}
+{{- if (and .GetSpec .GetSpec.Tracer) }}
+{{ toYamlIf (dict "value" (.GetSpec.Tracer | toJsonPB | fromJson) "key" "tracer")}}
+{{- end }}
{{- end }}
{{- $x := (include "global" .) | reformatYaml }}
diff --git a/internal/components/cni/cni_test.go b/internal/components/cni/cni_test.go
index 9c8ee3bbe..d32334684 100644
--- a/internal/components/cni/cni_test.go
+++ b/internal/components/cni/cni_test.go
@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/internal/components/discovery/discovery_test.go b/internal/components/discovery/discovery_test.go
index 16df4e7c6..1764cfdfe 100644
--- a/internal/components/discovery/discovery_test.go
+++ b/internal/components/discovery/discovery_test.go
@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/internal/components/istiomeshgateway/istiomeshgateway_test.go b/internal/components/istiomeshgateway/istiomeshgateway_test.go
index 2e026a9ed..96163aadc 100644
--- a/internal/components/istiomeshgateway/istiomeshgateway_test.go
+++ b/internal/components/istiomeshgateway/istiomeshgateway_test.go
@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/internal/components/meshexpansion/meshexpansion_test.go b/internal/components/meshexpansion/meshexpansion_test.go
index 9cdd4ba3b..248a6c5c3 100644
--- a/internal/components/meshexpansion/meshexpansion_test.go
+++ b/internal/components/meshexpansion/meshexpansion_test.go
@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/internal/components/resourcesyncrule/resourcesyncrule_test.go b/internal/components/resourcesyncrule/resourcesyncrule_test.go
index a3ed59cc0..5e41eeb04 100644
--- a/internal/components/resourcesyncrule/resourcesyncrule_test.go
+++ b/internal/components/resourcesyncrule/resourcesyncrule_test.go
@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/internal/components/sidecarinjector/sidecarinjector_test.go b/internal/components/sidecarinjector/sidecarinjector_test.go
index e83c86c8a..cb4eb8dfa 100644
--- a/internal/components/sidecarinjector/sidecarinjector_test.go
+++ b/internal/components/sidecarinjector/sidecarinjector_test.go
@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/internal/util/openshift/predicate.go b/internal/util/openshift/predicate.go
index 3f2e338e5..8cba712a8 100644
--- a/internal/util/openshift/predicate.go
+++ b/internal/util/openshift/predicate.go
@@ -95,7 +95,7 @@ func removeSecretsFromServiceAccount(client client.Client, obj []byte) ([]byte,
func removeSecretsFromField(client client.Client, secretsField []interface{}, namespace string) ([]interface{}, error) {
for i, s := range secretsField {
- if secret, ok := s.(map[string]interface{}); ok { // nolint:nestif
+ if secret, ok := s.(map[string]interface{}); ok { //nolint:nestif
value, mapHasKey := secret["name"]
secretName, ok := value.(string)
secret := &corev1.Secret{}
diff --git a/internal/util/template.go b/internal/util/template.go
index 855281fce..b0e3a1861 100644
--- a/internal/util/template.go
+++ b/internal/util/template.go
@@ -86,7 +86,7 @@ func fromYamlTemplateFunc(value string) (map[string]interface{}, error) {
}
func valueIfTemplateFunc(value interface{}) (string, error) {
- if dict, ok := value.(map[string]interface{}); ok { // nolint:nestif
+ if dict, ok := value.(map[string]interface{}); ok { //nolint:nestif
var value interface{}
var key string
@@ -148,7 +148,7 @@ func reformatYamlTemplateFunc(value interface{}) (string, error) {
func toYamlIfTemplateFunc(value interface{}) (string, error) {
sprig.TxtFuncMap()
body := []string{}
- if dict, ok := value.(map[string]interface{}); ok { // nolint:nestif
+ if dict, ok := value.(map[string]interface{}); ok { //nolint:nestif
if key, ok := dict["key"]; ok {
body = append(body, fmt.Sprintf("%s:", key))
}
|