linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add linkerd- prefix to all objects in linkerd install (#1920) 

Signed-off-by: Kevin Lingerfelt <kl@buoyant.io>
This commit is contained in:
Kevin Lingerfelt 2018-12-04 15:41:47 -08:00 committed by GitHub
parent ad2366f208
commit 37ae423bb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
50 changed files with 250 additions and 254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cli/cmd/dashboard.go
View File

@ -58,13 +58,13 @@ func newCmdDashboard() *cobra.Command {
os.Exit(1)
}
url, err := kubernetesProxy.URLFor(controlPlaneNamespace, "/services/web:http/proxy/")
url, err := kubernetesProxy.URLFor(controlPlaneNamespace, "/services/linkerd-web:http/proxy/")
if err != nil {
fmt.Fprintf(os.Stderr, "Failed to generate URL for dashboard: %s\n", err)
os.Exit(1)
}
grafanaUrl, err := kubernetesProxy.URLFor(controlPlaneNamespace, "/services/grafana:http/proxy/")
grafanaUrl, err := kubernetesProxy.URLFor(controlPlaneNamespace, "/services/linkerd-grafana:http/proxy/")
if err != nil {
fmt.Fprintf(os.Stderr, "Failed to generate URL for Grafana: %s\n", err)
os.Exit(1)

4
cli/cmd/inject.go
View File

@ -31,7 +31,7 @@ const (
// must be in absolute form for the proxy to special-case it.
LocalhostDNSNameOverride = "localhost."
// ControlPlanePodName default control plane pod name.
ControlPlanePodName = "controller"
ControlPlanePodName = "linkerd-controller"
// The name of the variable used to pass the pod's namespace.
PodNamespaceEnvVarName = "LINKERD2_PROXY_POD_NAMESPACE"
@ -224,7 +224,7 @@ func injectPodSpec(t *v1.PodSpec, identity k8s.TLSIdentity, controlPlaneDNSNameO
Privileged: &f,
},
}
controlPlaneDNS := fmt.Sprintf("proxy-api.%s.svc.cluster.local", controlPlaneNamespace)
controlPlaneDNS := fmt.Sprintf("linkerd-proxy-api.%s.svc.cluster.local", controlPlaneNamespace)
if controlPlaneDNSNameOverride != "" {
controlPlaneDNS = controlPlaneDNSNameOverride
}

2
cli/cmd/install.go
View File

@ -48,7 +48,6 @@ type installConfig struct {
ProxyMetricsPort uint
ProxyControlPort uint
ProxyInjectorTLSSecret string
ProxyInjectorSidecarConfig string
ProxySpecFileName string
ProxyInitSpecFileName string
ProxyInitImage string
@ -173,7 +172,6 @@ func validateAndBuildConfig(options *installOptions) (*installConfig, error) {
ProxyMetricsPort: options.proxyMetricsPort,
ProxyControlPort: options.proxyControlPort,
ProxyInjectorTLSSecret: k8s.ProxyInjectorTLSSecret,
ProxyInjectorSidecarConfig: k8s.ProxyInjectorSidecarConfig,
ProxySpecFileName: k8s.ProxySpecFileName,
ProxyInitSpecFileName: k8s.ProxyInitSpecFileName,
ProxyInitImage: options.taggedProxyInitImage(),

1
cli/cmd/install_test.go
View File

@ -54,7 +54,6 @@ func TestRender(t *testing.T) {
ProxyInitImage: "ProxyInitImage",
ProxyImage: "ProxyImage",
ProxyInjectorTLSSecret: "ProxyInjectorTLSSecret",
ProxyInjectorSidecarConfig: "ProxyInjectorSidecarConfig",
ProxySpecFileName: "ProxySpecFileName",
ProxyInitSpecFileName: "ProxyInitSpecFileName",
IgnoreInboundPorts: "4190,4191,1,2,3",

2
cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml vendored
View File

@ -32,7 +32,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.linkerd.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER

4
cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml vendored
View File

@ -32,7 +32,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.linkerd.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER
@ -123,7 +123,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.linkerd.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER

2
cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml vendored
View File

@ -32,7 +32,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.linkerd.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER

2
cli/cmd/testdata/inject_emojivoto_deployment.golden.yml vendored
View File

@ -43,7 +43,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.linkerd.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER

4
cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml vendored
View File

@ -43,7 +43,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.linkerd.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER
@ -145,7 +145,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.linkerd.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER

2
cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml vendored
View File

@ -44,7 +44,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.linkerd.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER

2
cli/cmd/testdata/inject_emojivoto_deployment_tls.golden.yml vendored
View File

@ -43,7 +43,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.linkerd.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER

2
cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml vendored
View File

@ -45,7 +45,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.linkerd.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER

2
cli/cmd/testdata/inject_emojivoto_list.golden.yml vendored
View File

@ -45,7 +45,7 @@ items:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.linkerd.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER

2
cli/cmd/testdata/inject_emojivoto_pod.golden.yml vendored
View File

@ -26,7 +26,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.linkerd.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER

2
cli/cmd/testdata/inject_emojivoto_pod_tls.golden.yml vendored
View File

@ -26,7 +26,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.linkerd.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER

2
cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml vendored
View File

@ -26,7 +26,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.linkerd.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER

2
cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml vendored
View File

@ -43,7 +43,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.linkerd.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER

4
cli/cmd/testdata/inject_gettest_deployment.good.golden.yml vendored
View File

@ -45,7 +45,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.linkerd.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER
@ -149,7 +149,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.linkerd.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER

48
cli/cmd/testdata/install_default.golden vendored
View File

@ -81,7 +81,7 @@ subjects:
kind: Service
apiVersion: v1
metadata:
name: api
name: linkerd-controller-api
namespace: linkerd
labels:
linkerd.io/control-plane-component: controller
@ -100,7 +100,7 @@ spec:
kind: Service
apiVersion: v1
metadata:
name: proxy-api
name: linkerd-proxy-api
namespace: linkerd
labels:
linkerd.io/control-plane-component: controller
@ -124,7 +124,7 @@ metadata:
creationTimestamp: null
labels:
linkerd.io/control-plane-component: controller
name: controller
name: linkerd-controller
namespace: linkerd
spec:
replicas: 1
@ -138,12 +138,12 @@ spec:
labels:
linkerd.io/control-plane-component: controller
linkerd.io/control-plane-ns: linkerd
linkerd.io/proxy-deployment: controller
linkerd.io/proxy-deployment: linkerd-controller
spec:
containers:
- args:
- public-api
- -prometheus-url=http://prometheus.linkerd.svc.cluster.local:9090
- -prometheus-url=http://linkerd-prometheus.linkerd.svc.cluster.local:9090
- -controller-namespace=linkerd
- -single-namespace=false
- -log-level=info
@ -303,7 +303,7 @@ spec:
kind: Service
apiVersion: v1
metadata:
name: web
name: linkerd-web
namespace: linkerd
labels:
linkerd.io/control-plane-component: web
@ -330,7 +330,7 @@ metadata:
creationTimestamp: null
labels:
linkerd.io/control-plane-component: web
name: web
name: linkerd-web
namespace: linkerd
spec:
replicas: 1
@ -344,11 +344,11 @@ spec:
labels:
linkerd.io/control-plane-component: web
linkerd.io/control-plane-ns: linkerd
linkerd.io/proxy-deployment: web
linkerd.io/proxy-deployment: linkerd-web
spec:
containers:
- args:
- -api-addr=api.linkerd.svc.cluster.local:8085
- -api-addr=linkerd-controller-api.linkerd.svc.cluster.local:8085
- -uuid=deaab91a-f4ab-448a-b7d1-c832a2fa0a60
- -controller-namespace=linkerd
- -log-level=info
@ -377,7 +377,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.linkerd.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER
@ -437,7 +437,7 @@ status: {}
kind: Service
apiVersion: v1
metadata:
name: prometheus
name: linkerd-prometheus
namespace: linkerd
labels:
linkerd.io/control-plane-component: prometheus
@ -461,7 +461,7 @@ metadata:
creationTimestamp: null
labels:
linkerd.io/control-plane-component: prometheus
name: prometheus
name: linkerd-prometheus
namespace: linkerd
spec:
replicas: 1
@ -475,7 +475,7 @@ spec:
labels:
linkerd.io/control-plane-component: prometheus
linkerd.io/control-plane-ns: linkerd
linkerd.io/proxy-deployment: prometheus
linkerd.io/proxy-deployment: linkerd-prometheus
spec:
containers:
- args:
@ -510,7 +510,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.linkerd.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER
@ -570,14 +570,14 @@ spec:
serviceAccount: linkerd-prometheus
volumes:
- configMap:
name: prometheus-config
name: linkerd-prometheus-config
name: prometheus-config
status: {}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: prometheus-config
name: linkerd-prometheus-config
namespace: linkerd
labels:
linkerd.io/control-plane-component: prometheus
@ -664,7 +664,7 @@ data:
kind: Service
apiVersion: v1
metadata:
name: grafana
name: linkerd-grafana
namespace: linkerd
labels:
linkerd.io/control-plane-component: grafana
@ -688,7 +688,7 @@ metadata:
creationTimestamp: null
labels:
linkerd.io/control-plane-component: grafana
name: grafana
name: linkerd-grafana
namespace: linkerd
spec:
replicas: 1
@ -702,7 +702,7 @@ spec:
labels:
linkerd.io/control-plane-component: grafana
linkerd.io/control-plane-ns: linkerd
linkerd.io/proxy-deployment: grafana
linkerd.io/proxy-deployment: linkerd-grafana
spec:
containers:
- image: gcr.io/linkerd-io/grafana:undefined
@ -731,7 +731,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.linkerd.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER
@ -795,14 +795,14 @@ spec:
path: provisioning/datasources/datasources.yaml
- key: dashboards.yaml
path: provisioning/dashboards/dashboards.yaml
name: grafana-config
name: linkerd-grafana-config
name: grafana-config
status: {}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: grafana-config
name: linkerd-grafana-config
namespace: linkerd
labels:
linkerd.io/control-plane-component: grafana
@ -813,7 +813,7 @@ data:
instance_name = linkerd-grafana
[server]
root_url = %(protocol)s://%(domain)s:/api/v1/namespaces/linkerd/services/grafana:http/proxy/
root_url = %(protocol)s://%(domain)s:/api/v1/namespaces/linkerd/services/linkerd-grafana:http/proxy/
[auth]
disable_login_form = true
@ -835,7 +835,7 @@ data:
type: prometheus
access: proxy
orgId: 1
url: http://prometheus.linkerd.svc.cluster.local:9090
url: http://linkerd-prometheus.linkerd.svc.cluster.local:9090
isDefault: true
jsonData:
timeInterval: "5s"

48
cli/cmd/testdata/install_ha_output.golden vendored
View File

@ -81,7 +81,7 @@ subjects:
kind: Service
apiVersion: v1
metadata:
name: api
name: linkerd-controller-api
namespace: linkerd
labels:
linkerd.io/control-plane-component: controller
@ -100,7 +100,7 @@ spec:
kind: Service
apiVersion: v1
metadata:
name: proxy-api
name: linkerd-proxy-api
namespace: linkerd
labels:
linkerd.io/control-plane-component: controller
@ -124,7 +124,7 @@ metadata:
creationTimestamp: null
labels:
linkerd.io/control-plane-component: controller
name: controller
name: linkerd-controller
namespace: linkerd
spec:
replicas: 3
@ -138,12 +138,12 @@ spec:
labels:
linkerd.io/control-plane-component: controller
linkerd.io/control-plane-ns: linkerd
linkerd.io/proxy-deployment: controller
linkerd.io/proxy-deployment: linkerd-controller
spec:
containers:
- args:
- public-api
- -prometheus-url=http://prometheus.linkerd.svc.cluster.local:9090
- -prometheus-url=http://linkerd-prometheus.linkerd.svc.cluster.local:9090
- -controller-namespace=linkerd
- -single-namespace=false
- -log-level=info
@ -315,7 +315,7 @@ spec:
kind: Service
apiVersion: v1
metadata:
name: web
name: linkerd-web
namespace: linkerd
labels:
linkerd.io/control-plane-component: web
@ -342,7 +342,7 @@ metadata:
creationTimestamp: null
labels:
linkerd.io/control-plane-component: web
name: web
name: linkerd-web
namespace: linkerd
spec:
replicas: 1
@ -356,11 +356,11 @@ spec:
labels:
linkerd.io/control-plane-component: web
linkerd.io/control-plane-ns: linkerd
linkerd.io/proxy-deployment: web
linkerd.io/proxy-deployment: linkerd-web
spec:
containers:
- args:
- -api-addr=api.linkerd.svc.cluster.local:8085
- -api-addr=linkerd-controller-api.linkerd.svc.cluster.local:8085
- -uuid=deaab91a-f4ab-448a-b7d1-c832a2fa0a60
- -controller-namespace=linkerd
- -log-level=info
@ -392,7 +392,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.linkerd.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER
@ -455,7 +455,7 @@ status: {}
kind: Service
apiVersion: v1
metadata:
name: prometheus
name: linkerd-prometheus
namespace: linkerd
labels:
linkerd.io/control-plane-component: prometheus
@ -479,7 +479,7 @@ metadata:
creationTimestamp: null
labels:
linkerd.io/control-plane-component: prometheus
name: prometheus
name: linkerd-prometheus
namespace: linkerd
spec:
replicas: 1
@ -493,7 +493,7 @@ spec:
labels:
linkerd.io/control-plane-component: prometheus
linkerd.io/control-plane-ns: linkerd
linkerd.io/proxy-deployment: prometheus
linkerd.io/proxy-deployment: linkerd-prometheus
spec:
containers:
- args:
@ -531,7 +531,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.linkerd.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER
@ -594,14 +594,14 @@ spec:
serviceAccount: linkerd-prometheus
volumes:
- configMap:
name: prometheus-config
name: linkerd-prometheus-config
name: prometheus-config
status: {}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: prometheus-config
name: linkerd-prometheus-config
namespace: linkerd
labels:
linkerd.io/control-plane-component: prometheus
@ -688,7 +688,7 @@ data:
kind: Service
apiVersion: v1
metadata:
name: grafana
name: linkerd-grafana
namespace: linkerd
labels:
linkerd.io/control-plane-component: grafana
@ -712,7 +712,7 @@ metadata:
creationTimestamp: null
labels:
linkerd.io/control-plane-component: grafana
name: grafana
name: linkerd-grafana
namespace: linkerd
spec:
replicas: 1
@ -726,7 +726,7 @@ spec:
labels:
linkerd.io/control-plane-component: grafana
linkerd.io/control-plane-ns: linkerd
linkerd.io/proxy-deployment: grafana
linkerd.io/proxy-deployment: linkerd-grafana
spec:
containers:
- image: gcr.io/linkerd-io/grafana:undefined
@ -758,7 +758,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.linkerd.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER
@ -825,14 +825,14 @@ spec:
path: provisioning/datasources/datasources.yaml
- key: dashboards.yaml
path: provisioning/dashboards/dashboards.yaml
name: grafana-config
name: linkerd-grafana-config
name: grafana-config
status: {}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: grafana-config
name: linkerd-grafana-config
namespace: linkerd
labels:
linkerd.io/control-plane-component: grafana
@ -843,7 +843,7 @@ data:
instance_name = linkerd-grafana
[server]
root_url = %(protocol)s://%(domain)s:/api/v1/namespaces/linkerd/services/grafana:http/proxy/
root_url = %(protocol)s://%(domain)s:/api/v1/namespaces/linkerd/services/linkerd-grafana:http/proxy/
[auth]
disable_login_form = true
@ -865,7 +865,7 @@ data:
type: prometheus
access: proxy
orgId: 1
url: http://prometheus.linkerd.svc.cluster.local:9090
url: http://linkerd-prometheus.linkerd.svc.cluster.local:9090
isDefault: true
jsonData:
timeInterval: "5s"

48
cli/cmd/testdata/install_ha_with_overrides_output.golden vendored
View File

@ -81,7 +81,7 @@ subjects:
kind: Service
apiVersion: v1
metadata:
name: api
name: linkerd-controller-api
namespace: linkerd
labels:
linkerd.io/control-plane-component: controller
@ -100,7 +100,7 @@ spec:
kind: Service
apiVersion: v1
metadata:
name: proxy-api
name: linkerd-proxy-api
namespace: linkerd
labels:
linkerd.io/control-plane-component: controller
@ -124,7 +124,7 @@ metadata:
creationTimestamp: null
labels:
linkerd.io/control-plane-component: controller
name: controller
name: linkerd-controller
namespace: linkerd
spec:
replicas: 2
@ -138,12 +138,12 @@ spec:
labels:
linkerd.io/control-plane-component: controller
linkerd.io/control-plane-ns: linkerd
linkerd.io/proxy-deployment: controller
linkerd.io/proxy-deployment: linkerd-controller
spec:
containers:
- args:
- public-api
- -prometheus-url=http://prometheus.linkerd.svc.cluster.local:9090
- -prometheus-url=http://linkerd-prometheus.linkerd.svc.cluster.local:9090
- -controller-namespace=linkerd
- -single-namespace=false
- -log-level=info
@ -315,7 +315,7 @@ spec:
kind: Service
apiVersion: v1
metadata:
name: web
name: linkerd-web
namespace: linkerd
labels:
linkerd.io/control-plane-component: web
@ -342,7 +342,7 @@ metadata:
creationTimestamp: null
labels:
linkerd.io/control-plane-component: web
name: web
name: linkerd-web
namespace: linkerd
spec:
replicas: 1
@ -356,11 +356,11 @@ spec:
labels:
linkerd.io/control-plane-component: web
linkerd.io/control-plane-ns: linkerd
linkerd.io/proxy-deployment: web
linkerd.io/proxy-deployment: linkerd-web
spec:
containers:
- args:
- -api-addr=api.linkerd.svc.cluster.local:8085
- -api-addr=linkerd-controller-api.linkerd.svc.cluster.local:8085
- -uuid=deaab91a-f4ab-448a-b7d1-c832a2fa0a60
- -controller-namespace=linkerd
- -log-level=info
@ -392,7 +392,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.linkerd.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER
@ -455,7 +455,7 @@ status: {}
kind: Service
apiVersion: v1
metadata:
name: prometheus
name: linkerd-prometheus
namespace: linkerd
labels:
linkerd.io/control-plane-component: prometheus
@ -479,7 +479,7 @@ metadata:
creationTimestamp: null
labels:
linkerd.io/control-plane-component: prometheus
name: prometheus
name: linkerd-prometheus
namespace: linkerd
spec:
replicas: 1
@ -493,7 +493,7 @@ spec:
labels:
linkerd.io/control-plane-component: prometheus
linkerd.io/control-plane-ns: linkerd
linkerd.io/proxy-deployment: prometheus
linkerd.io/proxy-deployment: linkerd-prometheus
spec:
containers:
- args:
@ -531,7 +531,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.linkerd.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER
@ -594,14 +594,14 @@ spec:
serviceAccount: linkerd-prometheus
volumes:
- configMap:
name: prometheus-config
name: linkerd-prometheus-config
name: prometheus-config
status: {}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: prometheus-config
name: linkerd-prometheus-config
namespace: linkerd
labels:
linkerd.io/control-plane-component: prometheus
@ -688,7 +688,7 @@ data:
kind: Service
apiVersion: v1
metadata:
name: grafana
name: linkerd-grafana
namespace: linkerd
labels:
linkerd.io/control-plane-component: grafana
@ -712,7 +712,7 @@ metadata:
creationTimestamp: null
labels:
linkerd.io/control-plane-component: grafana
name: grafana
name: linkerd-grafana
namespace: linkerd
spec:
replicas: 1
@ -726,7 +726,7 @@ spec:
labels:
linkerd.io/control-plane-component: grafana
linkerd.io/control-plane-ns: linkerd
linkerd.io/proxy-deployment: grafana
linkerd.io/proxy-deployment: linkerd-grafana
spec:
containers:
- image: gcr.io/linkerd-io/grafana:undefined
@ -758,7 +758,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.linkerd.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER
@ -825,14 +825,14 @@ spec:
path: provisioning/datasources/datasources.yaml
- key: dashboards.yaml
path: provisioning/dashboards/dashboards.yaml
name: grafana-config
name: linkerd-grafana-config
name: grafana-config
status: {}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: grafana-config
name: linkerd-grafana-config
namespace: linkerd
labels:
linkerd.io/control-plane-component: grafana
@ -843,7 +843,7 @@ data:
instance_name = linkerd-grafana
[server]
root_url = %(protocol)s://%(domain)s:/api/v1/namespaces/linkerd/services/grafana:http/proxy/
root_url = %(protocol)s://%(domain)s:/api/v1/namespaces/linkerd/services/linkerd-grafana:http/proxy/
[auth]
disable_login_form = true
@ -865,7 +865,7 @@ data:
type: prometheus
access: proxy
orgId: 1
url: http://prometheus.linkerd.svc.cluster.local:9090
url: http://linkerd-prometheus.linkerd.svc.cluster.local:9090
isDefault: true
jsonData:
timeInterval: "5s"

68
cli/cmd/testdata/install_output.golden vendored
View File

@ -83,7 +83,7 @@ subjects:
kind: Service
apiVersion: v1
metadata:
name: api
name: linkerd-controller-api
namespace: Namespace
labels:
ControllerComponentLabel: controller
@ -102,7 +102,7 @@ spec:
kind: Service
apiVersion: v1
metadata:
name: proxy-api
name: linkerd-proxy-api
namespace: Namespace
labels:
ControllerComponentLabel: controller
@ -126,7 +126,7 @@ metadata:
creationTimestamp: null
labels:
ControllerComponentLabel: controller
name: controller
name: linkerd-controller
namespace: Namespace
spec:
replicas: 1
@ -141,12 +141,12 @@ spec:
labels:
ControllerComponentLabel: controller
linkerd.io/control-plane-ns: Namespace
linkerd.io/proxy-deployment: controller
linkerd.io/proxy-deployment: linkerd-controller
spec:
containers:
- args:
- public-api
- -prometheus-url=http://prometheus.Namespace.svc.cluster.local:9090
- -prometheus-url=http://linkerd-prometheus.Namespace.svc.cluster.local:9090
- -controller-namespace=Namespace
- -single-namespace=false
- -log-level=ControllerLogLevel
@ -306,7 +306,7 @@ spec:
kind: Service
apiVersion: v1
metadata:
name: web
name: linkerd-web
namespace: Namespace
labels:
ControllerComponentLabel: web
@ -333,7 +333,7 @@ metadata:
creationTimestamp: null
labels:
ControllerComponentLabel: web
name: web
name: linkerd-web
namespace: Namespace
spec:
replicas: 1
@ -348,11 +348,11 @@ spec:
labels:
ControllerComponentLabel: web
linkerd.io/control-plane-ns: Namespace
linkerd.io/proxy-deployment: web
linkerd.io/proxy-deployment: linkerd-web
spec:
containers:
- args:
- -api-addr=api.Namespace.svc.cluster.local:8085
- -api-addr=linkerd-controller-api.Namespace.svc.cluster.local:8085
- -uuid=UUID
- -controller-namespace=Namespace
- -log-level=ControllerLogLevel
@ -381,7 +381,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.Namespace.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.Namespace.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER
@ -441,7 +441,7 @@ status: {}
kind: Service
apiVersion: v1
metadata:
name: prometheus
name: linkerd-prometheus
namespace: Namespace
labels:
ControllerComponentLabel: prometheus
@ -465,7 +465,7 @@ metadata:
creationTimestamp: null
labels:
ControllerComponentLabel: prometheus
name: prometheus
name: linkerd-prometheus
namespace: Namespace
spec:
replicas: 1
@ -480,7 +480,7 @@ spec:
labels:
ControllerComponentLabel: prometheus
linkerd.io/control-plane-ns: Namespace
linkerd.io/proxy-deployment: prometheus
linkerd.io/proxy-deployment: linkerd-prometheus
spec:
containers:
- args:
@ -515,7 +515,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.Namespace.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.Namespace.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER
@ -575,14 +575,14 @@ spec:
serviceAccount: linkerd-prometheus
volumes:
- configMap:
name: prometheus-config
name: linkerd-prometheus-config
name: prometheus-config
status: {}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: prometheus-config
name: linkerd-prometheus-config
namespace: Namespace
labels:
ControllerComponentLabel: prometheus
@ -669,7 +669,7 @@ data:
kind: Service
apiVersion: v1
metadata:
name: grafana
name: linkerd-grafana
namespace: Namespace
labels:
ControllerComponentLabel: grafana
@ -693,7 +693,7 @@ metadata:
creationTimestamp: null
labels:
ControllerComponentLabel: grafana
name: grafana
name: linkerd-grafana
namespace: Namespace
spec:
replicas: 1
@ -708,7 +708,7 @@ spec:
labels:
ControllerComponentLabel: grafana
linkerd.io/control-plane-ns: Namespace
linkerd.io/proxy-deployment: grafana
linkerd.io/proxy-deployment: linkerd-grafana
spec:
containers:
- image: GrafanaImage
@ -737,7 +737,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.Namespace.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.Namespace.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER
@ -801,14 +801,14 @@ spec:
path: provisioning/datasources/datasources.yaml
- key: dashboards.yaml
path: provisioning/dashboards/dashboards.yaml
name: grafana-config
name: linkerd-grafana-config
name: grafana-config
status: {}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: grafana-config
name: linkerd-grafana-config
namespace: Namespace
labels:
ControllerComponentLabel: grafana
@ -819,7 +819,7 @@ data:
instance_name = linkerd-grafana
[server]
root_url = %(protocol)s://%(domain)s:/api/v1/namespaces/Namespace/services/grafana:http/proxy/
root_url = %(protocol)s://%(domain)s:/api/v1/namespaces/Namespace/services/linkerd-grafana:http/proxy/
[auth]
disable_login_form = true
@ -841,7 +841,7 @@ data:
type: prometheus
access: proxy
orgId: 1
url: http://prometheus.Namespace.svc.cluster.local:9090
url: http://linkerd-prometheus.Namespace.svc.cluster.local:9090
isDefault: true
jsonData:
timeInterval: "5s"
@ -920,7 +920,7 @@ metadata:
creationTimestamp: null
labels:
ControllerComponentLabel: ca
name: ca
name: linkerd-ca
namespace: Namespace
spec:
replicas: 1
@ -935,7 +935,7 @@ spec:
labels:
ControllerComponentLabel: ca
linkerd.io/control-plane-ns: Namespace
linkerd.io/proxy-deployment: ca
linkerd.io/proxy-deployment: linkerd-ca
spec:
containers:
- args:
@ -967,7 +967,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.Namespace.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.Namespace.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER
@ -1033,7 +1033,7 @@ metadata:
creationTimestamp: null
labels:
ControllerComponentLabel: proxy-injector
name: proxy-injector
name: linkerd-proxy-injector
namespace: Namespace
spec:
replicas: 1
@ -1051,7 +1051,7 @@ spec:
labels:
ControllerComponentLabel: proxy-injector
linkerd.io/control-plane-ns: Namespace
linkerd.io/proxy-deployment: proxy-injector
linkerd.io/proxy-deployment: linkerd-proxy-injector
spec:
containers:
- args:
@ -1090,7 +1090,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.Namespace.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.Namespace.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER
@ -1152,7 +1152,7 @@ spec:
optional: true
secretName: ProxyInjectorTLSSecret
- configMap:
name: ProxyInjectorSidecarConfig
name: linkerd-proxy-injector-sidecar-config
name: proxy-spec
status: {}
---
@ -1194,7 +1194,7 @@ roleRef:
kind: Service
apiVersion: v1
metadata:
name: proxy-injector
name: linkerd-proxy-injector
namespace: Namespace
labels:
ControllerComponentLabel: proxy-injector
@ -1214,7 +1214,7 @@ spec:
kind: ConfigMap
apiVersion: v1
metadata:
name: ProxyInjectorSidecarConfig
name: linkerd-proxy-injector-sidecar-config
namespace: Namespace
labels:
ControllerComponentLabel: proxy-injector
@ -1249,7 +1249,7 @@ data:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 1m
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.Namespace.svc.cluster.local:123
value: tcp://linkerd-proxy-api.Namespace.svc.cluster.local:123
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER

54
cli/cmd/testdata/install_single_namespace_output.golden vendored
View File

@ -85,7 +85,7 @@ subjects:
kind: Service
apiVersion: v1
metadata:
name: api
name: linkerd-controller-api
namespace: Namespace
labels:
ControllerComponentLabel: controller
@ -104,7 +104,7 @@ spec:
kind: Service
apiVersion: v1
metadata:
name: proxy-api
name: linkerd-proxy-api
namespace: Namespace
labels:
ControllerComponentLabel: controller
@ -128,7 +128,7 @@ metadata:
creationTimestamp: null
labels:
ControllerComponentLabel: controller
name: controller
name: linkerd-controller
namespace: Namespace
spec:
replicas: 1
@ -143,12 +143,12 @@ spec:
labels:
ControllerComponentLabel: controller
linkerd.io/control-plane-ns: Namespace
linkerd.io/proxy-deployment: controller
linkerd.io/proxy-deployment: linkerd-controller
spec:
containers:
- args:
- public-api
- -prometheus-url=http://prometheus.Namespace.svc.cluster.local:9090
- -prometheus-url=http://linkerd-prometheus.Namespace.svc.cluster.local:9090
- -controller-namespace=Namespace
- -single-namespace=true
- -log-level=ControllerLogLevel
@ -308,7 +308,7 @@ spec:
kind: Service
apiVersion: v1
metadata:
name: web
name: linkerd-web
namespace: Namespace
labels:
ControllerComponentLabel: web
@ -335,7 +335,7 @@ metadata:
creationTimestamp: null
labels:
ControllerComponentLabel: web
name: web
name: linkerd-web
namespace: Namespace
spec:
replicas: 1
@ -350,11 +350,11 @@ spec:
labels:
ControllerComponentLabel: web
linkerd.io/control-plane-ns: Namespace
linkerd.io/proxy-deployment: web
linkerd.io/proxy-deployment: linkerd-web
spec:
containers:
- args:
- -api-addr=api.Namespace.svc.cluster.local:8085
- -api-addr=linkerd-controller-api.Namespace.svc.cluster.local:8085
- -uuid=UUID
- -controller-namespace=Namespace
- -log-level=ControllerLogLevel
@ -383,7 +383,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.Namespace.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.Namespace.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER
@ -443,7 +443,7 @@ status: {}
kind: Service
apiVersion: v1
metadata:
name: prometheus
name: linkerd-prometheus
namespace: Namespace
labels:
ControllerComponentLabel: prometheus
@ -467,7 +467,7 @@ metadata:
creationTimestamp: null
labels:
ControllerComponentLabel: prometheus
name: prometheus
name: linkerd-prometheus
namespace: Namespace
spec:
replicas: 1
@ -482,7 +482,7 @@ spec:
labels:
ControllerComponentLabel: prometheus
linkerd.io/control-plane-ns: Namespace
linkerd.io/proxy-deployment: prometheus
linkerd.io/proxy-deployment: linkerd-prometheus
spec:
containers:
- args:
@ -517,7 +517,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.Namespace.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.Namespace.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER
@ -577,14 +577,14 @@ spec:
serviceAccount: linkerd-prometheus
volumes:
- configMap:
name: prometheus-config
name: linkerd-prometheus-config
name: prometheus-config
status: {}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: prometheus-config
name: linkerd-prometheus-config
namespace: Namespace
labels:
ControllerComponentLabel: prometheus
@ -673,7 +673,7 @@ data:
kind: Service
apiVersion: v1
metadata:
name: grafana
name: linkerd-grafana
namespace: Namespace
labels:
ControllerComponentLabel: grafana
@ -697,7 +697,7 @@ metadata:
creationTimestamp: null
labels:
ControllerComponentLabel: grafana
name: grafana
name: linkerd-grafana
namespace: Namespace
spec:
replicas: 1
@ -712,7 +712,7 @@ spec:
labels:
ControllerComponentLabel: grafana
linkerd.io/control-plane-ns: Namespace
linkerd.io/proxy-deployment: grafana
linkerd.io/proxy-deployment: linkerd-grafana
spec:
containers:
- image: GrafanaImage
@ -741,7 +741,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.Namespace.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.Namespace.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER
@ -805,14 +805,14 @@ spec:
path: provisioning/datasources/datasources.yaml
- key: dashboards.yaml
path: provisioning/dashboards/dashboards.yaml
name: grafana-config
name: linkerd-grafana-config
name: grafana-config
status: {}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: grafana-config
name: linkerd-grafana-config
namespace: Namespace
labels:
ControllerComponentLabel: grafana
@ -823,7 +823,7 @@ data:
instance_name = linkerd-grafana
[server]
root_url = %(protocol)s://%(domain)s:/api/v1/namespaces/Namespace/services/grafana:http/proxy/
root_url = %(protocol)s://%(domain)s:/api/v1/namespaces/Namespace/services/linkerd-grafana:http/proxy/
[auth]
disable_login_form = true
@ -845,7 +845,7 @@ data:
type: prometheus
access: proxy
orgId: 1
url: http://prometheus.Namespace.svc.cluster.local:9090
url: http://linkerd-prometheus.Namespace.svc.cluster.local:9090
isDefault: true
jsonData:
timeInterval: "5s"
@ -923,7 +923,7 @@ metadata:
creationTimestamp: null
labels:
ControllerComponentLabel: ca
name: ca
name: linkerd-ca
namespace: Namespace
spec:
replicas: 1
@ -938,7 +938,7 @@ spec:
labels:
ControllerComponentLabel: ca
linkerd.io/control-plane-ns: Namespace
linkerd.io/proxy-deployment: ca
linkerd.io/proxy-deployment: linkerd-ca
spec:
containers:
- args:
@ -969,7 +969,7 @@ spec:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.Namespace.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.Namespace.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER

46
cli/install/template.go
View File

@ -100,7 +100,7 @@ subjects:
kind: Service
apiVersion: v1
metadata:
name: api
name: linkerd-controller-api
namespace: {{.Namespace}}
labels:
{{.ControllerComponentLabel}}: controller
@ -119,7 +119,7 @@ spec:
kind: Service
apiVersion: v1
metadata:
name: proxy-api
name: linkerd-proxy-api
namespace: {{.Namespace}}
labels:
{{.ControllerComponentLabel}}: controller
@ -138,7 +138,7 @@ spec:
kind: Deployment
apiVersion: extensions/v1beta1
metadata:
name: controller
name: linkerd-controller
namespace: {{.Namespace}}
labels:
{{.ControllerComponentLabel}}: controller
@ -165,7 +165,7 @@ spec:
imagePullPolicy: {{.ImagePullPolicy}}
args:
- "public-api"
- "-prometheus-url=http://prometheus.{{.Namespace}}.svc.cluster.local:9090"
- "-prometheus-url=http://linkerd-prometheus.{{.Namespace}}.svc.cluster.local:9090"
- "-controller-namespace={{.Namespace}}"
- "-single-namespace={{.SingleNamespace}}"
- "-log-level={{.ControllerLogLevel}}"
@ -271,7 +271,7 @@ spec:
kind: Service
apiVersion: v1
metadata:
name: web
name: linkerd-web
namespace: {{.Namespace}}
labels:
{{.ControllerComponentLabel}}: web
@ -293,7 +293,7 @@ spec:
kind: Deployment
apiVersion: extensions/v1beta1
metadata:
name: web
name: linkerd-web
namespace: {{.Namespace}}
labels:
{{.ControllerComponentLabel}}: web
@ -318,7 +318,7 @@ spec:
image: {{.WebImage}}
imagePullPolicy: {{.ImagePullPolicy}}
args:
- "-api-addr=api.{{.Namespace}}.svc.cluster.local:8085"
- "-api-addr=linkerd-controller-api.{{.Namespace}}.svc.cluster.local:8085"
- "-uuid={{.UUID}}"
- "-controller-namespace={{.Namespace}}"
- "-log-level={{.ControllerLogLevel}}"
@ -344,7 +344,7 @@ spec:
kind: Service
apiVersion: v1
metadata:
name: prometheus
name: linkerd-prometheus
namespace: {{.Namespace}}
labels:
{{.ControllerComponentLabel}}: prometheus
@ -363,7 +363,7 @@ spec:
kind: Deployment
apiVersion: extensions/v1beta1
metadata:
name: prometheus
name: linkerd-prometheus
namespace: {{.Namespace}}
labels:
{{.ControllerComponentLabel}}: prometheus
@ -382,7 +382,7 @@ spec:
volumes:
- name: prometheus-config
configMap:
name: prometheus-config
name: linkerd-prometheus-config
containers:
- name: prometheus
ports:
@ -420,7 +420,7 @@ spec:
kind: ConfigMap
apiVersion: v1
metadata:
name: prometheus-config
name: linkerd-prometheus-config
namespace: {{.Namespace}}
labels:
{{.ControllerComponentLabel}}: prometheus
@ -511,7 +511,7 @@ data:
kind: Service
apiVersion: v1
metadata:
name: grafana
name: linkerd-grafana
namespace: {{.Namespace}}
labels:
{{.ControllerComponentLabel}}: grafana
@ -530,7 +530,7 @@ spec:
kind: Deployment
apiVersion: extensions/v1beta1
metadata:
name: grafana
name: linkerd-grafana
namespace: {{.Namespace}}
labels:
{{.ControllerComponentLabel}}: grafana
@ -548,7 +548,7 @@ spec:
volumes:
- name: grafana-config
configMap:
name: grafana-config
name: linkerd-grafana-config
items:
- key: grafana.ini
path: grafana.ini
@ -586,7 +586,7 @@ spec:
kind: ConfigMap
apiVersion: v1
metadata:
name: grafana-config
name: linkerd-grafana-config
namespace: {{.Namespace}}
labels:
{{.ControllerComponentLabel}}: grafana
@ -597,7 +597,7 @@ data:
instance_name = linkerd-grafana
[server]
root_url = %(protocol)s://%(domain)s:/api/v1/namespaces/{{.Namespace}}/services/grafana:http/proxy/
root_url = %(protocol)s://%(domain)s:/api/v1/namespaces/{{.Namespace}}/services/linkerd-grafana:http/proxy/
[auth]
disable_login_form = true
@ -619,7 +619,7 @@ data:
type: prometheus
access: proxy
orgId: 1
url: http://prometheus.{{.Namespace}}.svc.cluster.local:9090
url: http://linkerd-prometheus.{{.Namespace}}.svc.cluster.local:9090
isDefault: true
jsonData:
timeInterval: "5s"
@ -703,7 +703,7 @@ subjects:
kind: Deployment
apiVersion: extensions/v1beta1
metadata:
name: ca
name: linkerd-ca
namespace: {{.Namespace}}
labels:
{{.ControllerComponentLabel}}: ca
@ -758,7 +758,7 @@ const ProxyInjectorTemplate = `
kind: Deployment
apiVersion: apps/v1
metadata:
name: proxy-injector
name: linkerd-proxy-injector
namespace: {{.Namespace}}
labels:
{{.ControllerComponentLabel}}: proxy-injector
@ -814,7 +814,7 @@ spec:
optional: true
- name: proxy-spec
configMap:
name: {{.ProxyInjectorSidecarConfig}}
name: linkerd-proxy-injector-sidecar-config
{{- if .EnableHA }}
resources:
requests:
@ -861,7 +861,7 @@ roleRef:
kind: Service
apiVersion: v1
metadata:
name: proxy-injector
name: linkerd-proxy-injector
namespace: {{.Namespace}}
labels:
{{.ControllerComponentLabel}}: proxy-injector
@ -881,7 +881,7 @@ spec:
kind: ConfigMap
apiVersion: v1
metadata:
name: {{.ProxyInjectorSidecarConfig}}
name: linkerd-proxy-injector-sidecar-config
namespace: {{.Namespace}}
labels:
{{.ControllerComponentLabel}}: proxy-injector
@ -920,7 +920,7 @@ data:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: {{.ProxyBindTimeout}}
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.{{.Namespace}}.svc.cluster.local:{{.ProxyAPIPort}}
value: tcp://linkerd-proxy-api.{{.Namespace}}.svc.cluster.local:{{.ProxyAPIPort}}
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:{{.ProxyControlPort}}
- name: LINKERD2_PROXY_METRICS_LISTENER

2
controller/api/public/client.go
View File

@ -200,7 +200,7 @@ func NewInternalClient(controlPlaneNamespace string, kubeAPIHost string) (pb.Api
}
func NewExternalClient(controlPlaneNamespace string, kubeAPI *k8s.KubernetesAPI) (pb.ApiClient, error) {
apiURL, err := kubeAPI.UrlFor(controlPlaneNamespace, "/services/http:api:http/proxy/")
apiURL, err := kubeAPI.UrlFor(controlPlaneNamespace, "/services/linkerd-controller-api:http/proxy/")
if err != nil {
return nil, err
}

2
controller/cmd/proxy-injector/main.go
View File

@ -23,7 +23,7 @@ func main() {
kubeconfig := flag.String("kubeconfig", "", "path to kubeconfig")
controllerNamespace := flag.String("controller-namespace", "linkerd", "namespace in which Linkerd is installed")
volumeMountsWaitTime := flag.Duration("volume-mounts-wait", 3*time.Minute, "maximum wait time for the secret volumes to mount before the timeout expires")
webhookServiceName := flag.String("webhook-service", "proxy-injector.linkerd.io", "name of the admission webhook")
webhookServiceName := flag.String("webhook-service", "linkerd-proxy-injector.linkerd.io", "name of the admission webhook")
flags.ConfigureAndParse()
stop := make(chan os.Signal, 1)

2
controller/proxy-injector/fake/data/config-proxy.yaml
View File

@ -4,7 +4,7 @@ env:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.linkerd.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER

2
controller/proxy-injector/fake/data/inject-enabled-response.yaml
View File

@ -68,6 +68,6 @@ request:
username: minikube-user
response:
allowed: true
patch: W3sib3AiOiJhZGQiLCJwYXRoIjoiL3NwZWMvdGVtcGxhdGUvc3BlYy9jb250YWluZXJzLy0iLCJ2YWx1ZSI6eyJuYW1lIjoibGlua2VyZC1wcm94eSIsImltYWdlIjoiZ2NyLmlvL2xpbmtlcmQtaW8vcHJveHk6djE4LjguNCIsInBvcnRzIjpbeyJuYW1lIjoibGlua2VyZC1wcm94eSIsImNvbnRhaW5lclBvcnQiOjQxNDN9LHsibmFtZSI6ImxpbmtlcmQtbWV0cmljcyIsImNvbnRhaW5lclBvcnQiOjQxOTF9XSwiZW52IjpbeyJuYW1lIjoiTElOS0VSRDJfUFJPWFlfTE9HIiwidmFsdWUiOiJ3YXJuLGxpbmtlcmQyX3Byb3h5PWluZm8ifSx7Im5hbWUiOiJMSU5LRVJEMl9QUk9YWV9CSU5EX1RJTUVPVVQiLCJ2YWx1ZSI6IjEwcyJ9LHsibmFtZSI6IkxJTktFUkQyX1BST1hZX0NPTlRST0xfVVJMIiwidmFsdWUiOiJ0Y3A6Ly9wcm94eS1hcGkubGlua2VyZC5zdmMuY2x1c3Rlci5sb2NhbDo4MDg2In0seyJuYW1lIjoiTElOS0VSRDJfUFJPWFlfQ09OVFJPTF9MSVNURU5FUiIsInZhbHVlIjoidGNwOi8vMC4wLjAuMDo0MTkwIn0seyJuYW1lIjoiTElOS0VSRDJfUFJPWFlfTUVUUklDU19MSVNURU5FUiIsInZhbHVlIjoidGNwOi8vMC4wLjAuMDo0MTkxIn0seyJuYW1lIjoiTElOS0VSRDJfUFJPWFlfT1VUQk9VTkRfTElTVEVORVIiLCJ2YWx1ZSI6InRjcDovLzEyNy4wLjAuMTo0MTQwIn0seyJuYW1lIjoiTElOS0VSRDJfUFJPWFlfSU5CT1VORF9MSVNURU5FUiIsInZhbHVlIjoidGNwOi8vMC4wLjAuMDo0MTQzIn0seyJuYW1lIjoiTElOS0VSRDJfUFJPWFlfUE9EX05BTUVTUEFDRSIsInZhbHVlRnJvbSI6eyJmaWVsZFJlZiI6eyJmaWVsZFBhdGgiOiJtZXRhZGF0YS5uYW1lc3BhY2UifX19LHsibmFtZSI6IkxJTktFUkQyX1BST1hZX1RMU19UUlVTVF9BTkNIT1JTIiwidmFsdWUiOiIvdmFyL2xpbmtlcmQtaW8vdHJ1c3QtYW5jaG9ycy90cnVzdC1hbmNob3JzLnBlbSJ9LHsibmFtZSI6IkxJTktFUkQyX1BST1hZX1RMU19DRVJUIiwidmFsdWUiOiIvdmFyL2xpbmtlcmQtaW8vaWRlbnRpdHkvY2VydGlmaWNhdGUuY3J0In0seyJuYW1lIjoiTElOS0VSRDJfUFJPWFlfVExTX1BSSVZBVEVfS0VZIiwidmFsdWUiOiIvdmFyL2xpbmtlcmQtaW8vaWRlbnRpdHkvcHJpdmF0ZS1rZXkucDgifSx7Im5hbWUiOiJMSU5LRVJEMl9QUk9YWV9UTFNfUE9EX0lERU5USVRZIiwidmFsdWUiOiJuZ2lueC5kZXBsb3ltZW50Lmt1YmUtcHVibGljLmxpbmtlcmQtbWFuYWdlZC5saW5rZXJkLnN2Yy5jbHVzdGVyLmxvY2FsIn0seyJuYW1lIjoiTElOS0VSRDJfUFJPWFlfQ09OVFJPTExFUl9OQU1FU1BBQ0UiLCJ2YWx1ZSI6ImxpbmtlcmQifSx7Im5hbWUiOiJMSU5LRVJEMl9QUk9YWV9UTFNfQ09OVFJPTExFUl9JREVOVElUWSIsInZhbHVlIjoiY29udHJvbGxlci5kZXBsb3ltZW50LmxpbmtlcmQubGlua2VyZC1tYW5hZ2VkLmxpbmtlcmQuc3ZjLmNsdXN0ZXIubG9jYWwifV0sInJlc291cmNlcyI6e30sInZvbHVtZU1vdW50cyI6W3sibmFtZSI6ImxpbmtlcmQtdHJ1c3QtYW5jaG9ycyIsInJlYWRPbmx5Ijp0cnVlLCJtb3VudFBhdGgiOiIvdmFyL2xpbmtlcmQtaW8vdHJ1c3QtYW5jaG9ycyJ9LHsibmFtZSI6ImxpbmtlcmQtc2VjcmV0cyIsInJlYWRPbmx5Ijp0cnVlLCJtb3VudFBhdGgiOiIvdmFyL2xpbmtlcmQtaW8vaWRlbnRpdHkifV0sImxpdmVuZXNzUHJvYmUiOnsiaHR0cEdldCI6eyJwYXRoIjoiL21ldHJpY3MiLCJwb3J0Ijo0MTkxfSwiaW5pdGlhbERlbGF5U2Vjb25kcyI6MTB9LCJyZWFkaW5lc3NQcm9iZSI6eyJodHRwR2V0Ijp7InBhdGgiOiIvbWV0cmljcyIsInBvcnQiOjQxOTF9LCJpbml0aWFsRGVsYXlTZWNvbmRzIjoxMH0sInRlcm1pbmF0aW9uTWVzc2FnZVBvbGljeSI6IkZhbGxiYWNrVG9Mb2dzT25FcnJvciIsImltYWdlUHVsbFBvbGljeSI6IklmTm90UHJlc2VudCIsInNlY3VyaXR5Q29udGV4dCI6eyJydW5Bc1VzZXIiOjIxMDJ9fX0seyJvcCI6ImFkZCIsInBhdGgiOiIvc3BlYy90ZW1wbGF0ZS9zcGVjL2luaXRDb250YWluZXJzIiwidmFsdWUiOltdfSx7Im9wIjoiYWRkIiwicGF0aCI6Ii9zcGVjL3RlbXBsYXRlL3NwZWMvaW5pdENvbnRhaW5lcnMvLSIsInZhbHVlIjp7Im5hbWUiOiJsaW5rZXJkLWluaXQiLCJpbWFnZSI6Imdjci5pby9saW5rZXJkLWlvL3Byb3h5LWluaXQ6djE4LjguNCIsImFyZ3MiOlsiLS1pbmNvbWluZy1wcm94eS1wb3J0IiwiNDE0MyIsIi0tb3V0Z29pbmctcHJveHktcG9ydCIsIjQxNDAiLCItLXByb3h5LXVpZCIsIjIxMDIiLCItLWluYm91bmQtcG9ydHMtdG8taWdub3JlIiwiNDE5MCw0MTkxIl0sInJlc291cmNlcyI6e30sInRlcm1pbmF0aW9uTWVzc2FnZVBvbGljeSI6IkZhbGxiYWNrVG9Mb2dzT25FcnJvciIsImltYWdlUHVsbFBvbGljeSI6IklmTm90UHJlc2VudCIsInNlY3VyaXR5Q29udGV4dCI6eyJjYXBhYmlsaXRpZXMiOnsiYWRkIjpbIk5FVF9BRE1JTiJdfSwicHJpdmlsZWdlZCI6ZmFsc2V9fX0seyJvcCI6ImFkZCIsInBhdGgiOiIvc3BlYy90ZW1wbGF0ZS9zcGVjL3ZvbHVtZXMiLCJ2YWx1ZSI6W119LHsib3AiOiJhZGQiLCJwYXRoIjoiL3NwZWMvdGVtcGxhdGUvc3BlYy92b2x1bWVzLy0iLCJ2YWx1ZSI6eyJuYW1lIjoibGlua2VyZC10cnVzdC1hbmNob3JzIiwiY29uZmlnTWFwIjp7Im5hbWUiOiJsaW5rZXJkLWNhLWJ1bmRsZSIsIm9wdGlvbmFsIjp0cnVlfX19LHsib3AiOiJhZGQiLCJwYXRoIjoiL3NwZWMvdGVtcGxhdGUvc3BlYy92b2x1bWVzLy0iLCJ2YWx1ZSI6eyJuYW1lIjoibGlua2VyZC1zZWNyZXRzIiwic2VjcmV0Ijp7InNlY3JldE5hbWUiOiJuZ2lueC1kZXBsb3ltZW50LXRscy1saW5rZXJkLWlvIiwib3B0aW9uYWwiOnRydWV9fX0seyJvcCI6ImFkZCIsInBhdGgiOiIvc3BlYy90ZW1wbGF0ZS9tZXRhZGF0YS9sYWJlbHMiLCJ2YWx1ZSI6eyJhcHAiOiJuZ2lueCIsImxpbmtlcmQuaW8vYXV0by1pbmplY3QiOiJlbmFibGVkIiwibGlua2VyZC5pby9jb250cm9sLXBsYW5lLW5zIjoibGlua2VyZCIsImxpbmtlcmQuaW8vcHJveHktZGVwbG95bWVudCI6Im5naW54In19LHsib3AiOiJhZGQiLCJwYXRoIjoiL21ldGFkYXRhL2xhYmVscyIsInZhbHVlIjp7ImFwcCI6Im5naW54IiwibGlua2VyZC5pby9jb250cm9sLXBsYW5lLW5zIjoibGlua2VyZCIsImxpbmtlcmQuaW8vcHJveHktZGVwbG95bWVudCI6Im5naW54In19LHsib3AiOiJhZGQiLCJwYXRoIjoiL3NwZWMvdGVtcGxhdGUvbWV0YWRhdGEvYW5ub3RhdGlvbnMiLCJ2YWx1ZSI6eyJjcmVhdGVkLWJ5IjoiaXNpbSIsImxpbmtlcmQuaW8vY3JlYXRlZC1ieSI6ImxpbmtlcmQvcHJveHktaW5qZWN0b3IgdjE4LjguNCIsImxpbmtlcmQuaW8vcHJveHktdmVyc2lvbiI6InYxOC44LjQifX1d
patch: W3sib3AiOiJhZGQiLCJwYXRoIjoiL3NwZWMvdGVtcGxhdGUvc3BlYy9jb250YWluZXJzLy0iLCJ2YWx1ZSI6eyJuYW1lIjoibGlua2VyZC1wcm94eSIsImltYWdlIjoiZ2NyLmlvL2xpbmtlcmQtaW8vcHJveHk6djE4LjguNCIsInBvcnRzIjpbeyJuYW1lIjoibGlua2VyZC1wcm94eSIsImNvbnRhaW5lclBvcnQiOjQxNDN9LHsibmFtZSI6ImxpbmtlcmQtbWV0cmljcyIsImNvbnRhaW5lclBvcnQiOjQxOTF9XSwiZW52IjpbeyJuYW1lIjoiTElOS0VSRDJfUFJPWFlfTE9HIiwidmFsdWUiOiJ3YXJuLGxpbmtlcmQyX3Byb3h5PWluZm8ifSx7Im5hbWUiOiJMSU5LRVJEMl9QUk9YWV9CSU5EX1RJTUVPVVQiLCJ2YWx1ZSI6IjEwcyJ9LHsibmFtZSI6IkxJTktFUkQyX1BST1hZX0NPTlRST0xfVVJMIiwidmFsdWUiOiJ0Y3A6Ly9saW5rZXJkLXByb3h5LWFwaS5saW5rZXJkLnN2Yy5jbHVzdGVyLmxvY2FsOjgwODYifSx7Im5hbWUiOiJMSU5LRVJEMl9QUk9YWV9DT05UUk9MX0xJU1RFTkVSIiwidmFsdWUiOiJ0Y3A6Ly8wLjAuMC4wOjQxOTAifSx7Im5hbWUiOiJMSU5LRVJEMl9QUk9YWV9NRVRSSUNTX0xJU1RFTkVSIiwidmFsdWUiOiJ0Y3A6Ly8wLjAuMC4wOjQxOTEifSx7Im5hbWUiOiJMSU5LRVJEMl9QUk9YWV9PVVRCT1VORF9MSVNURU5FUiIsInZhbHVlIjoidGNwOi8vMTI3LjAuMC4xOjQxNDAifSx7Im5hbWUiOiJMSU5LRVJEMl9QUk9YWV9JTkJPVU5EX0xJU1RFTkVSIiwidmFsdWUiOiJ0Y3A6Ly8wLjAuMC4wOjQxNDMifSx7Im5hbWUiOiJMSU5LRVJEMl9QUk9YWV9QT0RfTkFNRVNQQUNFIiwidmFsdWVGcm9tIjp7ImZpZWxkUmVmIjp7ImZpZWxkUGF0aCI6Im1ldGFkYXRhLm5hbWVzcGFjZSJ9fX0seyJuYW1lIjoiTElOS0VSRDJfUFJPWFlfVExTX1RSVVNUX0FOQ0hPUlMiLCJ2YWx1ZSI6Ii92YXIvbGlua2VyZC1pby90cnVzdC1hbmNob3JzL3RydXN0LWFuY2hvcnMucGVtIn0seyJuYW1lIjoiTElOS0VSRDJfUFJPWFlfVExTX0NFUlQiLCJ2YWx1ZSI6Ii92YXIvbGlua2VyZC1pby9pZGVudGl0eS9jZXJ0aWZpY2F0ZS5jcnQifSx7Im5hbWUiOiJMSU5LRVJEMl9QUk9YWV9UTFNfUFJJVkFURV9LRVkiLCJ2YWx1ZSI6Ii92YXIvbGlua2VyZC1pby9pZGVudGl0eS9wcml2YXRlLWtleS5wOCJ9LHsibmFtZSI6IkxJTktFUkQyX1BST1hZX1RMU19QT0RfSURFTlRJVFkiLCJ2YWx1ZSI6Im5naW54LmRlcGxveW1lbnQua3ViZS1wdWJsaWMubGlua2VyZC1tYW5hZ2VkLmxpbmtlcmQuc3ZjLmNsdXN0ZXIubG9jYWwifSx7Im5hbWUiOiJMSU5LRVJEMl9QUk9YWV9DT05UUk9MTEVSX05BTUVTUEFDRSIsInZhbHVlIjoibGlua2VyZCJ9LHsibmFtZSI6IkxJTktFUkQyX1BST1hZX1RMU19DT05UUk9MTEVSX0lERU5USVRZIiwidmFsdWUiOiJjb250cm9sbGVyLmRlcGxveW1lbnQubGlua2VyZC5saW5rZXJkLW1hbmFnZWQubGlua2VyZC5zdmMuY2x1c3Rlci5sb2NhbCJ9XSwicmVzb3VyY2VzIjp7fSwidm9sdW1lTW91bnRzIjpbeyJuYW1lIjoibGlua2VyZC10cnVzdC1hbmNob3JzIiwicmVhZE9ubHkiOnRydWUsIm1vdW50UGF0aCI6Ii92YXIvbGlua2VyZC1pby90cnVzdC1hbmNob3JzIn0seyJuYW1lIjoibGlua2VyZC1zZWNyZXRzIiwicmVhZE9ubHkiOnRydWUsIm1vdW50UGF0aCI6Ii92YXIvbGlua2VyZC1pby9pZGVudGl0eSJ9XSwibGl2ZW5lc3NQcm9iZSI6eyJodHRwR2V0Ijp7InBhdGgiOiIvbWV0cmljcyIsInBvcnQiOjQxOTF9LCJpbml0aWFsRGVsYXlTZWNvbmRzIjoxMH0sInJlYWRpbmVzc1Byb2JlIjp7Imh0dHBHZXQiOnsicGF0aCI6Ii9tZXRyaWNzIiwicG9ydCI6NDE5MX0sImluaXRpYWxEZWxheVNlY29uZHMiOjEwfSwidGVybWluYXRpb25NZXNzYWdlUG9saWN5IjoiRmFsbGJhY2tUb0xvZ3NPbkVycm9yIiwiaW1hZ2VQdWxsUG9saWN5IjoiSWZOb3RQcmVzZW50Iiwic2VjdXJpdHlDb250ZXh0Ijp7InJ1bkFzVXNlciI6MjEwMn19fSx7Im9wIjoiYWRkIiwicGF0aCI6Ii9zcGVjL3RlbXBsYXRlL3NwZWMvaW5pdENvbnRhaW5lcnMiLCJ2YWx1ZSI6W119LHsib3AiOiJhZGQiLCJwYXRoIjoiL3NwZWMvdGVtcGxhdGUvc3BlYy9pbml0Q29udGFpbmVycy8tIiwidmFsdWUiOnsibmFtZSI6ImxpbmtlcmQtaW5pdCIsImltYWdlIjoiZ2NyLmlvL2xpbmtlcmQtaW8vcHJveHktaW5pdDp2MTguOC40IiwiYXJncyI6WyItLWluY29taW5nLXByb3h5LXBvcnQiLCI0MTQzIiwiLS1vdXRnb2luZy1wcm94eS1wb3J0IiwiNDE0MCIsIi0tcHJveHktdWlkIiwiMjEwMiIsIi0taW5ib3VuZC1wb3J0cy10by1pZ25vcmUiLCI0MTkwLDQxOTEiXSwicmVzb3VyY2VzIjp7fSwidGVybWluYXRpb25NZXNzYWdlUG9saWN5IjoiRmFsbGJhY2tUb0xvZ3NPbkVycm9yIiwiaW1hZ2VQdWxsUG9saWN5IjoiSWZOb3RQcmVzZW50Iiwic2VjdXJpdHlDb250ZXh0Ijp7ImNhcGFiaWxpdGllcyI6eyJhZGQiOlsiTkVUX0FETUlOIl19LCJwcml2aWxlZ2VkIjpmYWxzZX19fSx7Im9wIjoiYWRkIiwicGF0aCI6Ii9zcGVjL3RlbXBsYXRlL3NwZWMvdm9sdW1lcyIsInZhbHVlIjpbXX0seyJvcCI6ImFkZCIsInBhdGgiOiIvc3BlYy90ZW1wbGF0ZS9zcGVjL3ZvbHVtZXMvLSIsInZhbHVlIjp7Im5hbWUiOiJsaW5rZXJkLXRydXN0LWFuY2hvcnMiLCJjb25maWdNYXAiOnsibmFtZSI6ImxpbmtlcmQtY2EtYnVuZGxlIiwib3B0aW9uYWwiOnRydWV9fX0seyJvcCI6ImFkZCIsInBhdGgiOiIvc3BlYy90ZW1wbGF0ZS9zcGVjL3ZvbHVtZXMvLSIsInZhbHVlIjp7Im5hbWUiOiJsaW5rZXJkLXNlY3JldHMiLCJzZWNyZXQiOnsic2VjcmV0TmFtZSI6Im5naW54LWRlcGxveW1lbnQtdGxzLWxpbmtlcmQtaW8iLCJvcHRpb25hbCI6dHJ1ZX19fSx7Im9wIjoiYWRkIiwicGF0aCI6Ii9zcGVjL3RlbXBsYXRlL21ldGFkYXRhL2xhYmVscyIsInZhbHVlIjp7ImFwcCI6Im5naW54IiwibGlua2VyZC5pby9hdXRvLWluamVjdCI6ImVuYWJsZWQiLCJsaW5rZXJkLmlvL2NvbnRyb2wtcGxhbmUtbnMiOiJsaW5rZXJkIiwibGlua2VyZC5pby9wcm94eS1kZXBsb3ltZW50IjoibmdpbngifX0seyJvcCI6ImFkZCIsInBhdGgiOiIvbWV0YWRhdGEvbGFiZWxzIiwidmFsdWUiOnsiYXBwIjoibmdpbngiLCJsaW5rZXJkLmlvL2NvbnRyb2wtcGxhbmUtbnMiOiJsaW5rZXJkIiwibGlua2VyZC5pby9wcm94eS1kZXBsb3ltZW50IjoibmdpbngifX0seyJvcCI6ImFkZCIsInBhdGgiOiIvc3BlYy90ZW1wbGF0ZS9tZXRhZGF0YS9hbm5vdGF0aW9ucyIsInZhbHVlIjp7ImNyZWF0ZWQtYnkiOiJpc2ltIiwibGlua2VyZC5pby9jcmVhdGVkLWJ5IjoibGlua2VyZC9wcm94eS1pbmplY3RvciB2MTguOC40IiwibGlua2VyZC5pby9wcm94eS12ZXJzaW9uIjoidjE4LjguNCJ9fV0=
patchType: JSONPatch
uid: 3c3c45ff-bee9-11e8-9c41-b4d755961931

2
controller/proxy-injector/fake/data/inject-no-labels-response.yaml
View File

@ -65,6 +65,6 @@ request:
username: minikube-user
response:
allowed: true
patch: W3sib3AiOiJhZGQiLCJwYXRoIjoiL3NwZWMvdGVtcGxhdGUvc3BlYy9jb250YWluZXJzLy0iLCJ2YWx1ZSI6eyJuYW1lIjoibGlua2VyZC1wcm94eSIsImltYWdlIjoiZ2NyLmlvL2xpbmtlcmQtaW8vcHJveHk6djE4LjguNCIsInBvcnRzIjpbeyJuYW1lIjoibGlua2VyZC1wcm94eSIsImNvbnRhaW5lclBvcnQiOjQxNDN9LHsibmFtZSI6ImxpbmtlcmQtbWV0cmljcyIsImNvbnRhaW5lclBvcnQiOjQxOTF9XSwiZW52IjpbeyJuYW1lIjoiTElOS0VSRDJfUFJPWFlfTE9HIiwidmFsdWUiOiJ3YXJuLGxpbmtlcmQyX3Byb3h5PWluZm8ifSx7Im5hbWUiOiJMSU5LRVJEMl9QUk9YWV9CSU5EX1RJTUVPVVQiLCJ2YWx1ZSI6IjEwcyJ9LHsibmFtZSI6IkxJTktFUkQyX1BST1hZX0NPTlRST0xfVVJMIiwidmFsdWUiOiJ0Y3A6Ly9wcm94eS1hcGkubGlua2VyZC5zdmMuY2x1c3Rlci5sb2NhbDo4MDg2In0seyJuYW1lIjoiTElOS0VSRDJfUFJPWFlfQ09OVFJPTF9MSVNURU5FUiIsInZhbHVlIjoidGNwOi8vMC4wLjAuMDo0MTkwIn0seyJuYW1lIjoiTElOS0VSRDJfUFJPWFlfTUVUUklDU19MSVNURU5FUiIsInZhbHVlIjoidGNwOi8vMC4wLjAuMDo0MTkxIn0seyJuYW1lIjoiTElOS0VSRDJfUFJPWFlfT1VUQk9VTkRfTElTVEVORVIiLCJ2YWx1ZSI6InRjcDovLzEyNy4wLjAuMTo0MTQwIn0seyJuYW1lIjoiTElOS0VSRDJfUFJPWFlfSU5CT1VORF9MSVNURU5FUiIsInZhbHVlIjoidGNwOi8vMC4wLjAuMDo0MTQzIn0seyJuYW1lIjoiTElOS0VSRDJfUFJPWFlfUE9EX05BTUVTUEFDRSIsInZhbHVlRnJvbSI6eyJmaWVsZFJlZiI6eyJmaWVsZFBhdGgiOiJtZXRhZGF0YS5uYW1lc3BhY2UifX19LHsibmFtZSI6IkxJTktFUkQyX1BST1hZX1RMU19UUlVTVF9BTkNIT1JTIiwidmFsdWUiOiIvdmFyL2xpbmtlcmQtaW8vdHJ1c3QtYW5jaG9ycy90cnVzdC1hbmNob3JzLnBlbSJ9LHsibmFtZSI6IkxJTktFUkQyX1BST1hZX1RMU19DRVJUIiwidmFsdWUiOiIvdmFyL2xpbmtlcmQtaW8vaWRlbnRpdHkvY2VydGlmaWNhdGUuY3J0In0seyJuYW1lIjoiTElOS0VSRDJfUFJPWFlfVExTX1BSSVZBVEVfS0VZIiwidmFsdWUiOiIvdmFyL2xpbmtlcmQtaW8vaWRlbnRpdHkvcHJpdmF0ZS1rZXkucDgifSx7Im5hbWUiOiJMSU5LRVJEMl9QUk9YWV9UTFNfUE9EX0lERU5USVRZIiwidmFsdWUiOiJuZ2lueC5kZXBsb3ltZW50Lmt1YmUtcHVibGljLmxpbmtlcmQtbWFuYWdlZC5saW5rZXJkLnN2Yy5jbHVzdGVyLmxvY2FsIn0seyJuYW1lIjoiTElOS0VSRDJfUFJPWFlfQ09OVFJPTExFUl9OQU1FU1BBQ0UiLCJ2YWx1ZSI6ImxpbmtlcmQifSx7Im5hbWUiOiJMSU5LRVJEMl9QUk9YWV9UTFNfQ09OVFJPTExFUl9JREVOVElUWSIsInZhbHVlIjoiY29udHJvbGxlci5kZXBsb3ltZW50LmxpbmtlcmQubGlua2VyZC1tYW5hZ2VkLmxpbmtlcmQuc3ZjLmNsdXN0ZXIubG9jYWwifV0sInJlc291cmNlcyI6e30sInZvbHVtZU1vdW50cyI6W3sibmFtZSI6ImxpbmtlcmQtdHJ1c3QtYW5jaG9ycyIsInJlYWRPbmx5Ijp0cnVlLCJtb3VudFBhdGgiOiIvdmFyL2xpbmtlcmQtaW8vdHJ1c3QtYW5jaG9ycyJ9LHsibmFtZSI6ImxpbmtlcmQtc2VjcmV0cyIsInJlYWRPbmx5Ijp0cnVlLCJtb3VudFBhdGgiOiIvdmFyL2xpbmtlcmQtaW8vaWRlbnRpdHkifV0sImxpdmVuZXNzUHJvYmUiOnsiaHR0cEdldCI6eyJwYXRoIjoiL21ldHJpY3MiLCJwb3J0Ijo0MTkxfSwiaW5pdGlhbERlbGF5U2Vjb25kcyI6MTB9LCJyZWFkaW5lc3NQcm9iZSI6eyJodHRwR2V0Ijp7InBhdGgiOiIvbWV0cmljcyIsInBvcnQiOjQxOTF9LCJpbml0aWFsRGVsYXlTZWNvbmRzIjoxMH0sInRlcm1pbmF0aW9uTWVzc2FnZVBvbGljeSI6IkZhbGxiYWNrVG9Mb2dzT25FcnJvciIsImltYWdlUHVsbFBvbGljeSI6IklmTm90UHJlc2VudCIsInNlY3VyaXR5Q29udGV4dCI6eyJydW5Bc1VzZXIiOjIxMDJ9fX0seyJvcCI6ImFkZCIsInBhdGgiOiIvc3BlYy90ZW1wbGF0ZS9zcGVjL2luaXRDb250YWluZXJzIiwidmFsdWUiOltdfSx7Im9wIjoiYWRkIiwicGF0aCI6Ii9zcGVjL3RlbXBsYXRlL3NwZWMvaW5pdENvbnRhaW5lcnMvLSIsInZhbHVlIjp7Im5hbWUiOiJsaW5rZXJkLWluaXQiLCJpbWFnZSI6Imdjci5pby9saW5rZXJkLWlvL3Byb3h5LWluaXQ6djE4LjguNCIsImFyZ3MiOlsiLS1pbmNvbWluZy1wcm94eS1wb3J0IiwiNDE0MyIsIi0tb3V0Z29pbmctcHJveHktcG9ydCIsIjQxNDAiLCItLXByb3h5LXVpZCIsIjIxMDIiLCItLWluYm91bmQtcG9ydHMtdG8taWdub3JlIiwiNDE5MCw0MTkxIl0sInJlc291cmNlcyI6e30sInRlcm1pbmF0aW9uTWVzc2FnZVBvbGljeSI6IkZhbGxiYWNrVG9Mb2dzT25FcnJvciIsImltYWdlUHVsbFBvbGljeSI6IklmTm90UHJlc2VudCIsInNlY3VyaXR5Q29udGV4dCI6eyJjYXBhYmlsaXRpZXMiOnsiYWRkIjpbIk5FVF9BRE1JTiJdfSwicHJpdmlsZWdlZCI6ZmFsc2V9fX0seyJvcCI6ImFkZCIsInBhdGgiOiIvc3BlYy90ZW1wbGF0ZS9zcGVjL3ZvbHVtZXMiLCJ2YWx1ZSI6W119LHsib3AiOiJhZGQiLCJwYXRoIjoiL3NwZWMvdGVtcGxhdGUvc3BlYy92b2x1bWVzLy0iLCJ2YWx1ZSI6eyJuYW1lIjoibGlua2VyZC10cnVzdC1hbmNob3JzIiwiY29uZmlnTWFwIjp7Im5hbWUiOiJsaW5rZXJkLWNhLWJ1bmRsZSIsIm9wdGlvbmFsIjp0cnVlfX19LHsib3AiOiJhZGQiLCJwYXRoIjoiL3NwZWMvdGVtcGxhdGUvc3BlYy92b2x1bWVzLy0iLCJ2YWx1ZSI6eyJuYW1lIjoibGlua2VyZC1zZWNyZXRzIiwic2VjcmV0Ijp7InNlY3JldE5hbWUiOiJuZ2lueC1kZXBsb3ltZW50LXRscy1saW5rZXJkLWlvIiwib3B0aW9uYWwiOnRydWV9fX0seyJvcCI6ImFkZCIsInBhdGgiOiIvc3BlYy90ZW1wbGF0ZS9tZXRhZGF0YS9sYWJlbHMiLCJ2YWx1ZSI6eyJhcHAiOiJuZ2lueCIsImxpbmtlcmQuaW8vY29udHJvbC1wbGFuZS1ucyI6ImxpbmtlcmQiLCJsaW5rZXJkLmlvL3Byb3h5LWRlcGxveW1lbnQiOiJuZ2lueCJ9fSx7Im9wIjoiYWRkIiwicGF0aCI6Ii9tZXRhZGF0YS9sYWJlbHMiLCJ2YWx1ZSI6eyJsaW5rZXJkLmlvL2NvbnRyb2wtcGxhbmUtbnMiOiJsaW5rZXJkIiwibGlua2VyZC5pby9wcm94eS1kZXBsb3ltZW50IjoibmdpbngifX0seyJvcCI6ImFkZCIsInBhdGgiOiIvc3BlYy90ZW1wbGF0ZS9tZXRhZGF0YS9hbm5vdGF0aW9ucyIsInZhbHVlIjp7ImNyZWF0ZWQtYnkiOiJpc2ltIiwibGlua2VyZC5pby9jcmVhdGVkLWJ5IjoibGlua2VyZC9wcm94eS1pbmplY3RvciB2MTguOC40IiwibGlua2VyZC5pby9wcm94eS12ZXJzaW9uIjoidjE4LjguNCJ9fV0=
patch: W3sib3AiOiJhZGQiLCJwYXRoIjoiL3NwZWMvdGVtcGxhdGUvc3BlYy9jb250YWluZXJzLy0iLCJ2YWx1ZSI6eyJuYW1lIjoibGlua2VyZC1wcm94eSIsImltYWdlIjoiZ2NyLmlvL2xpbmtlcmQtaW8vcHJveHk6djE4LjguNCIsInBvcnRzIjpbeyJuYW1lIjoibGlua2VyZC1wcm94eSIsImNvbnRhaW5lclBvcnQiOjQxNDN9LHsibmFtZSI6ImxpbmtlcmQtbWV0cmljcyIsImNvbnRhaW5lclBvcnQiOjQxOTF9XSwiZW52IjpbeyJuYW1lIjoiTElOS0VSRDJfUFJPWFlfTE9HIiwidmFsdWUiOiJ3YXJuLGxpbmtlcmQyX3Byb3h5PWluZm8ifSx7Im5hbWUiOiJMSU5LRVJEMl9QUk9YWV9CSU5EX1RJTUVPVVQiLCJ2YWx1ZSI6IjEwcyJ9LHsibmFtZSI6IkxJTktFUkQyX1BST1hZX0NPTlRST0xfVVJMIiwidmFsdWUiOiJ0Y3A6Ly9saW5rZXJkLXByb3h5LWFwaS5saW5rZXJkLnN2Yy5jbHVzdGVyLmxvY2FsOjgwODYifSx7Im5hbWUiOiJMSU5LRVJEMl9QUk9YWV9DT05UUk9MX0xJU1RFTkVSIiwidmFsdWUiOiJ0Y3A6Ly8wLjAuMC4wOjQxOTAifSx7Im5hbWUiOiJMSU5LRVJEMl9QUk9YWV9NRVRSSUNTX0xJU1RFTkVSIiwidmFsdWUiOiJ0Y3A6Ly8wLjAuMC4wOjQxOTEifSx7Im5hbWUiOiJMSU5LRVJEMl9QUk9YWV9PVVRCT1VORF9MSVNURU5FUiIsInZhbHVlIjoidGNwOi8vMTI3LjAuMC4xOjQxNDAifSx7Im5hbWUiOiJMSU5LRVJEMl9QUk9YWV9JTkJPVU5EX0xJU1RFTkVSIiwidmFsdWUiOiJ0Y3A6Ly8wLjAuMC4wOjQxNDMifSx7Im5hbWUiOiJMSU5LRVJEMl9QUk9YWV9QT0RfTkFNRVNQQUNFIiwidmFsdWVGcm9tIjp7ImZpZWxkUmVmIjp7ImZpZWxkUGF0aCI6Im1ldGFkYXRhLm5hbWVzcGFjZSJ9fX0seyJuYW1lIjoiTElOS0VSRDJfUFJPWFlfVExTX1RSVVNUX0FOQ0hPUlMiLCJ2YWx1ZSI6Ii92YXIvbGlua2VyZC1pby90cnVzdC1hbmNob3JzL3RydXN0LWFuY2hvcnMucGVtIn0seyJuYW1lIjoiTElOS0VSRDJfUFJPWFlfVExTX0NFUlQiLCJ2YWx1ZSI6Ii92YXIvbGlua2VyZC1pby9pZGVudGl0eS9jZXJ0aWZpY2F0ZS5jcnQifSx7Im5hbWUiOiJMSU5LRVJEMl9QUk9YWV9UTFNfUFJJVkFURV9LRVkiLCJ2YWx1ZSI6Ii92YXIvbGlua2VyZC1pby9pZGVudGl0eS9wcml2YXRlLWtleS5wOCJ9LHsibmFtZSI6IkxJTktFUkQyX1BST1hZX1RMU19QT0RfSURFTlRJVFkiLCJ2YWx1ZSI6Im5naW54LmRlcGxveW1lbnQua3ViZS1wdWJsaWMubGlua2VyZC1tYW5hZ2VkLmxpbmtlcmQuc3ZjLmNsdXN0ZXIubG9jYWwifSx7Im5hbWUiOiJMSU5LRVJEMl9QUk9YWV9DT05UUk9MTEVSX05BTUVTUEFDRSIsInZhbHVlIjoibGlua2VyZCJ9LHsibmFtZSI6IkxJTktFUkQyX1BST1hZX1RMU19DT05UUk9MTEVSX0lERU5USVRZIiwidmFsdWUiOiJjb250cm9sbGVyLmRlcGxveW1lbnQubGlua2VyZC5saW5rZXJkLW1hbmFnZWQubGlua2VyZC5zdmMuY2x1c3Rlci5sb2NhbCJ9XSwicmVzb3VyY2VzIjp7fSwidm9sdW1lTW91bnRzIjpbeyJuYW1lIjoibGlua2VyZC10cnVzdC1hbmNob3JzIiwicmVhZE9ubHkiOnRydWUsIm1vdW50UGF0aCI6Ii92YXIvbGlua2VyZC1pby90cnVzdC1hbmNob3JzIn0seyJuYW1lIjoibGlua2VyZC1zZWNyZXRzIiwicmVhZE9ubHkiOnRydWUsIm1vdW50UGF0aCI6Ii92YXIvbGlua2VyZC1pby9pZGVudGl0eSJ9XSwibGl2ZW5lc3NQcm9iZSI6eyJodHRwR2V0Ijp7InBhdGgiOiIvbWV0cmljcyIsInBvcnQiOjQxOTF9LCJpbml0aWFsRGVsYXlTZWNvbmRzIjoxMH0sInJlYWRpbmVzc1Byb2JlIjp7Imh0dHBHZXQiOnsicGF0aCI6Ii9tZXRyaWNzIiwicG9ydCI6NDE5MX0sImluaXRpYWxEZWxheVNlY29uZHMiOjEwfSwidGVybWluYXRpb25NZXNzYWdlUG9saWN5IjoiRmFsbGJhY2tUb0xvZ3NPbkVycm9yIiwiaW1hZ2VQdWxsUG9saWN5IjoiSWZOb3RQcmVzZW50Iiwic2VjdXJpdHlDb250ZXh0Ijp7InJ1bkFzVXNlciI6MjEwMn19fSx7Im9wIjoiYWRkIiwicGF0aCI6Ii9zcGVjL3RlbXBsYXRlL3NwZWMvaW5pdENvbnRhaW5lcnMiLCJ2YWx1ZSI6W119LHsib3AiOiJhZGQiLCJwYXRoIjoiL3NwZWMvdGVtcGxhdGUvc3BlYy9pbml0Q29udGFpbmVycy8tIiwidmFsdWUiOnsibmFtZSI6ImxpbmtlcmQtaW5pdCIsImltYWdlIjoiZ2NyLmlvL2xpbmtlcmQtaW8vcHJveHktaW5pdDp2MTguOC40IiwiYXJncyI6WyItLWluY29taW5nLXByb3h5LXBvcnQiLCI0MTQzIiwiLS1vdXRnb2luZy1wcm94eS1wb3J0IiwiNDE0MCIsIi0tcHJveHktdWlkIiwiMjEwMiIsIi0taW5ib3VuZC1wb3J0cy10by1pZ25vcmUiLCI0MTkwLDQxOTEiXSwicmVzb3VyY2VzIjp7fSwidGVybWluYXRpb25NZXNzYWdlUG9saWN5IjoiRmFsbGJhY2tUb0xvZ3NPbkVycm9yIiwiaW1hZ2VQdWxsUG9saWN5IjoiSWZOb3RQcmVzZW50Iiwic2VjdXJpdHlDb250ZXh0Ijp7ImNhcGFiaWxpdGllcyI6eyJhZGQiOlsiTkVUX0FETUlOIl19LCJwcml2aWxlZ2VkIjpmYWxzZX19fSx7Im9wIjoiYWRkIiwicGF0aCI6Ii9zcGVjL3RlbXBsYXRlL3NwZWMvdm9sdW1lcyIsInZhbHVlIjpbXX0seyJvcCI6ImFkZCIsInBhdGgiOiIvc3BlYy90ZW1wbGF0ZS9zcGVjL3ZvbHVtZXMvLSIsInZhbHVlIjp7Im5hbWUiOiJsaW5rZXJkLXRydXN0LWFuY2hvcnMiLCJjb25maWdNYXAiOnsibmFtZSI6ImxpbmtlcmQtY2EtYnVuZGxlIiwib3B0aW9uYWwiOnRydWV9fX0seyJvcCI6ImFkZCIsInBhdGgiOiIvc3BlYy90ZW1wbGF0ZS9zcGVjL3ZvbHVtZXMvLSIsInZhbHVlIjp7Im5hbWUiOiJsaW5rZXJkLXNlY3JldHMiLCJzZWNyZXQiOnsic2VjcmV0TmFtZSI6Im5naW54LWRlcGxveW1lbnQtdGxzLWxpbmtlcmQtaW8iLCJvcHRpb25hbCI6dHJ1ZX19fSx7Im9wIjoiYWRkIiwicGF0aCI6Ii9zcGVjL3RlbXBsYXRlL21ldGFkYXRhL2xhYmVscyIsInZhbHVlIjp7ImFwcCI6Im5naW54IiwibGlua2VyZC5pby9jb250cm9sLXBsYW5lLW5zIjoibGlua2VyZCIsImxpbmtlcmQuaW8vcHJveHktZGVwbG95bWVudCI6Im5naW54In19LHsib3AiOiJhZGQiLCJwYXRoIjoiL21ldGFkYXRhL2xhYmVscyIsInZhbHVlIjp7ImxpbmtlcmQuaW8vY29udHJvbC1wbGFuZS1ucyI6ImxpbmtlcmQiLCJsaW5rZXJkLmlvL3Byb3h5LWRlcGxveW1lbnQiOiJuZ2lueCJ9fSx7Im9wIjoiYWRkIiwicGF0aCI6Ii9zcGVjL3RlbXBsYXRlL21ldGFkYXRhL2Fubm90YXRpb25zIiwidmFsdWUiOnsiY3JlYXRlZC1ieSI6ImlzaW0iLCJsaW5rZXJkLmlvL2NyZWF0ZWQtYnkiOiJsaW5rZXJkL3Byb3h5LWluamVjdG9yIHYxOC44LjQiLCJsaW5rZXJkLmlvL3Byb3h5LXZlcnNpb24iOiJ2MTguOC40In19XQ==
patchType: JSONPatch
uid: 3c3c45ff-bee9-11e8-9c41-b4d755961931

2
controller/proxy-injector/fake/data/inject-sidecar-container-spec.yaml
View File

@ -4,7 +4,7 @@ env:
- name: LINKERD2_PROXY_BIND_TIMEOUT
value: 10s
- name: LINKERD2_PROXY_CONTROL_URL
value: tcp://proxy-api.linkerd.svc.cluster.local:8086
value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
- name: LINKERD2_PROXY_CONTROL_LISTENER
value: tcp://0.0.0.0:4190
- name: LINKERD2_PROXY_METRICS_LISTENER

2
controller/proxy-injector/tmpl/mutating_webhook_configuration.go
View File

@ -9,7 +9,7 @@ webhooks:
- name: {{ .WebhookServiceName }}
clientConfig:
service:
name: proxy-injector
name: linkerd-proxy-injector
namespace: {{ .ControllerNamespace }}
path: "/"
caBundle: {{ .CABundle }}

2
grafana/dashboards/authority.json
View File

@ -1129,7 +1129,7 @@
}
},
{
"content": "<div>\n <div style=\"position: absolute; top: 0, left: 0\">\n <a href=\"https://linkerd.io\" target=\"_blank\"><img src=\"https://linkerd.io/images/identity/svg/linkerd_primary_color_white.svg\" style=\"height: 30px;\"></a>\n </div>\n <div id=\"version\" style=\"position: absolute; top: 0; right: 0; font-size: 15px\">\n </div>\n</div>\n<script type=\"text/javascript\">\nvar localReqURL =\n window.location.href.substring(\n 0,\n window.location.href.indexOf(\n \"/services/grafana:http/proxy/\"\n )\n )+'/services/web:http/proxy/overview';\n\nfetch(localReqURL, {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"text/html; charset=utf-8\",\n },\n})\n.then(response => response.text())\n.then(text => (new window.DOMParser()).parseFromString(text, \"text/html\"))\n.then(html => {\n var main = html.getElementById('main');\n var localVersion = main.getAttribute(\"data-release-version\");\n var versionElem = document.getElementById('version');\n\n var channel;\n var parts = localVersion.split(\"-\", 2);\n if (parts.length === 2) {\n channel = parts[0];\n versionElem.innerHTML += 'Running Linkerd ' + parts[1] + ' (' + parts[0] + ')' + '.<br>';\n } else {\n versionElem.innerHTML += 'Running Linkerd ' + localVersion + '.<br>';\n }\n var uuid = main.getAttribute(\"data-uuid\");\n\n fetch('https://versioncheck.linkerd.io/version.json?version='+localVersion+'&uuid='+uuid+'&source=grafana', {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"application/json; charset=utf-8\",\n },\n })\n .then(response => response.json())\n .then(json => {\n if (!channel || !json[channel]) {\n versionElem.innerHTML += 'Version check failed.'\n } else if (json[channel] === localVersion) {\n versionElem.innerHTML += 'Linkerd is up to date.';\n } else {\n parts = json[channel].split(\"-\", 2);\n if (parts.length === 2) {\n versionElem.innerHTML += \"A new \"+parts[0]+\" version (\"+parts[1]+\") is available.\"\n } else {\n versionElem.innerHTML += \"A new version (\"+json[channel]+\") is available.\"\n }\n versionElem.innerHTML += \" <a href='https://versioncheck.linkerd.io/update' target='_blank'>Update now</a>.\";\n }\n });\n});\n</script>",
"content": "<div>\n <div style=\"position: absolute; top: 0, left: 0\">\n <a href=\"https://linkerd.io\" target=\"_blank\"><img src=\"https://linkerd.io/images/identity/svg/linkerd_primary_color_white.svg\" style=\"height: 30px;\"></a>\n </div>\n <div id=\"version\" style=\"position: absolute; top: 0; right: 0; font-size: 15px\">\n </div>\n</div>\n<script type=\"text/javascript\">\nvar localReqURL =\n window.location.href.substring(\n 0,\n window.location.href.indexOf(\n \"/services/linkerd-grafana:http/proxy/\"\n )\n )+'/services/linkerd-web:http/proxy/overview';\n\nfetch(localReqURL, {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"text/html; charset=utf-8\",\n },\n})\n.then(response => response.text())\n.then(text => (new window.DOMParser()).parseFromString(text, \"text/html\"))\n.then(html => {\n var main = html.getElementById('main');\n var localVersion = main.getAttribute(\"data-release-version\");\n var versionElem = document.getElementById('version');\n\n var channel;\n var parts = localVersion.split(\"-\", 2);\n if (parts.length === 2) {\n channel = parts[0];\n versionElem.innerHTML += 'Running Linkerd ' + parts[1] + ' (' + parts[0] + ')' + '.<br>';\n } else {\n versionElem.innerHTML += 'Running Linkerd ' + localVersion + '.<br>';\n }\n var uuid = main.getAttribute(\"data-uuid\");\n\n fetch('https://versioncheck.linkerd.io/version.json?version='+localVersion+'&uuid='+uuid+'&source=grafana', {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"application/json; charset=utf-8\",\n },\n })\n .then(response => response.json())\n .then(json => {\n if (!channel || !json[channel]) {\n versionElem.innerHTML += 'Version check failed.'\n } else if (json[channel] === localVersion) {\n versionElem.innerHTML += 'Linkerd is up to date.';\n } else {\n parts = json[channel].split(\"-\", 2);\n if (parts.length === 2) {\n versionElem.innerHTML += \"A new \"+parts[0]+\" version (\"+parts[1]+\") is available.\"\n } else {\n versionElem.innerHTML += \"A new version (\"+json[channel]+\") is available.\"\n }\n versionElem.innerHTML += \" <a href='https://versioncheck.linkerd.io/update' target='_blank'>Update now</a>.\";\n }\n });\n});\n</script>",
"gridPos": {
"h": 3,
"w": 24,

2
grafana/dashboards/deployment.json
View File

@ -2099,7 +2099,7 @@
"type": "row"
},
{
"content": "<div>\n <div style=\"position: absolute; top: 0, left: 0\">\n <a href=\"https://linkerd.io\" target=\"_blank\"><img src=\"https://linkerd.io/images/identity/svg/linkerd_primary_color_white.svg\" style=\"height: 30px;\"></a>\n </div>\n <div id=\"version\" style=\"position: absolute; top: 0; right: 0; font-size: 15px\">\n </div>\n</div>\n<script type=\"text/javascript\">\nvar localReqURL =\n window.location.href.substring(\n 0,\n window.location.href.indexOf(\n \"/services/grafana:http/proxy/\"\n )\n )+'/services/web:http/proxy/overview';\n\nfetch(localReqURL, {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"text/html; charset=utf-8\",\n },\n})\n.then(response => response.text())\n.then(text => (new window.DOMParser()).parseFromString(text, \"text/html\"))\n.then(html => {\n var main = html.getElementById('main');\n var localVersion = main.getAttribute(\"data-release-version\");\n var versionElem = document.getElementById('version');\n\n var channel;\n var parts = localVersion.split(\"-\", 2);\n if (parts.length === 2) {\n channel = parts[0];\n versionElem.innerHTML += 'Running Linkerd ' + parts[1] + ' (' + parts[0] + ')' + '.<br>';\n } else {\n versionElem.innerHTML += 'Running Linkerd ' + localVersion + '.<br>';\n }\n var uuid = main.getAttribute(\"data-uuid\");\n\n fetch('https://versioncheck.linkerd.io/version.json?version='+localVersion+'&uuid='+uuid+'&source=grafana', {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"application/json; charset=utf-8\",\n },\n })\n .then(response => response.json())\n .then(json => {\n if (!channel || !json[channel]) {\n versionElem.innerHTML += 'Version check failed.'\n } else if (json[channel] === localVersion) {\n versionElem.innerHTML += 'Linkerd is up to date.';\n } else {\n parts = json[channel].split(\"-\", 2);\n if (parts.length === 2) {\n versionElem.innerHTML += \"A new \"+parts[0]+\" version (\"+parts[1]+\") is available.\"\n } else {\n versionElem.innerHTML += \"A new version (\"+json[channel]+\") is available.\"\n }\n versionElem.innerHTML += \" <a href='https://versioncheck.linkerd.io/update' target='_blank'>Update now</a>.\";\n }\n });\n});\n</script>",
"content": "<div>\n <div style=\"position: absolute; top: 0, left: 0\">\n <a href=\"https://linkerd.io\" target=\"_blank\"><img src=\"https://linkerd.io/images/identity/svg/linkerd_primary_color_white.svg\" style=\"height: 30px;\"></a>\n </div>\n <div id=\"version\" style=\"position: absolute; top: 0; right: 0; font-size: 15px\">\n </div>\n</div>\n<script type=\"text/javascript\">\nvar localReqURL =\n window.location.href.substring(\n 0,\n window.location.href.indexOf(\n \"/services/linkerd-grafana:http/proxy/\"\n )\n )+'/services/linkerd-web:http/proxy/overview';\n\nfetch(localReqURL, {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"text/html; charset=utf-8\",\n },\n})\n.then(response => response.text())\n.then(text => (new window.DOMParser()).parseFromString(text, \"text/html\"))\n.then(html => {\n var main = html.getElementById('main');\n var localVersion = main.getAttribute(\"data-release-version\");\n var versionElem = document.getElementById('version');\n\n var channel;\n var parts = localVersion.split(\"-\", 2);\n if (parts.length === 2) {\n channel = parts[0];\n versionElem.innerHTML += 'Running Linkerd ' + parts[1] + ' (' + parts[0] + ')' + '.<br>';\n } else {\n versionElem.innerHTML += 'Running Linkerd ' + localVersion + '.<br>';\n }\n var uuid = main.getAttribute(\"data-uuid\");\n\n fetch('https://versioncheck.linkerd.io/version.json?version='+localVersion+'&uuid='+uuid+'&source=grafana', {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"application/json; charset=utf-8\",\n },\n })\n .then(response => response.json())\n .then(json => {\n if (!channel || !json[channel]) {\n versionElem.innerHTML += 'Version check failed.'\n } else if (json[channel] === localVersion) {\n versionElem.innerHTML += 'Linkerd is up to date.';\n } else {\n parts = json[channel].split(\"-\", 2);\n if (parts.length === 2) {\n versionElem.innerHTML += \"A new \"+parts[0]+\" version (\"+parts[1]+\") is available.\"\n } else {\n versionElem.innerHTML += \"A new version (\"+json[channel]+\") is available.\"\n }\n versionElem.innerHTML += \" <a href='https://versioncheck.linkerd.io/update' target='_blank'>Update now</a>.\";\n }\n });\n});\n</script>",
"gridPos": {
"h": 3,
"w": 24,

2
grafana/dashboards/grafana.json
View File

@ -1002,7 +1002,7 @@
}
},
{
"content": "<div>\n <div style=\"position: absolute; top: 0, left: 0\">\n <a href=\"https://linkerd.io\" target=\"_blank\"><img src=\"https://linkerd.io/images/identity/svg/linkerd_primary_color_white.svg\" style=\"height: 30px;\"></a>\n </div>\n <div id=\"version\" style=\"position: absolute; top: 0; right: 0; font-size: 15px\">\n </div>\n</div>\n<script type=\"text/javascript\">\nvar localReqURL =\n window.location.href.substring(\n 0,\n window.location.href.indexOf(\n \"/services/grafana:http/proxy/\"\n )\n )+'/services/web:http/proxy/overview';\n\nfetch(localReqURL, {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"text/html; charset=utf-8\",\n },\n})\n.then(response => response.text())\n.then(text => (new window.DOMParser()).parseFromString(text, \"text/html\"))\n.then(html => {\n var main = html.getElementById('main');\n var localVersion = main.getAttribute(\"data-release-version\");\n var versionElem = document.getElementById('version');\n\n var channel;\n var parts = localVersion.split(\"-\", 2);\n if (parts.length === 2) {\n channel = parts[0];\n versionElem.innerHTML += 'Running Linkerd ' + parts[1] + ' (' + parts[0] + ')' + '.<br>';\n } else {\n versionElem.innerHTML += 'Running Linkerd ' + localVersion + '.<br>';\n }\n var uuid = main.getAttribute(\"data-uuid\");\n\n fetch('https://versioncheck.linkerd.io/version.json?version='+localVersion+'&uuid='+uuid+'&source=grafana', {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"application/json; charset=utf-8\",\n },\n })\n .then(response => response.json())\n .then(json => {\n if (!channel || !json[channel]) {\n versionElem.innerHTML += 'Version check failed.'\n } else if (json[channel] === localVersion) {\n versionElem.innerHTML += 'Linkerd is up to date.';\n } else {\n parts = json[channel].split(\"-\", 2);\n if (parts.length === 2) {\n versionElem.innerHTML += \"A new \"+parts[0]+\" version (\"+parts[1]+\") is available.\"\n } else {\n versionElem.innerHTML += \"A new version (\"+json[channel]+\") is available.\"\n }\n versionElem.innerHTML += \" <a href='https://versioncheck.linkerd.io/update' target='_blank'>Update now</a>.\";\n }\n });\n});\n</script>",
"content": "<div>\n <div style=\"position: absolute; top: 0, left: 0\">\n <a href=\"https://linkerd.io\" target=\"_blank\"><img src=\"https://linkerd.io/images/identity/svg/linkerd_primary_color_white.svg\" style=\"height: 30px;\"></a>\n </div>\n <div id=\"version\" style=\"position: absolute; top: 0; right: 0; font-size: 15px\">\n </div>\n</div>\n<script type=\"text/javascript\">\nvar localReqURL =\n window.location.href.substring(\n 0,\n window.location.href.indexOf(\n \"/services/linkerd-grafana:http/proxy/\"\n )\n )+'/services/linkerd-web:http/proxy/overview';\n\nfetch(localReqURL, {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"text/html; charset=utf-8\",\n },\n})\n.then(response => response.text())\n.then(text => (new window.DOMParser()).parseFromString(text, \"text/html\"))\n.then(html => {\n var main = html.getElementById('main');\n var localVersion = main.getAttribute(\"data-release-version\");\n var versionElem = document.getElementById('version');\n\n var channel;\n var parts = localVersion.split(\"-\", 2);\n if (parts.length === 2) {\n channel = parts[0];\n versionElem.innerHTML += 'Running Linkerd ' + parts[1] + ' (' + parts[0] + ')' + '.<br>';\n } else {\n versionElem.innerHTML += 'Running Linkerd ' + localVersion + '.<br>';\n }\n var uuid = main.getAttribute(\"data-uuid\");\n\n fetch('https://versioncheck.linkerd.io/version.json?version='+localVersion+'&uuid='+uuid+'&source=grafana', {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"application/json; charset=utf-8\",\n },\n })\n .then(response => response.json())\n .then(json => {\n if (!channel || !json[channel]) {\n versionElem.innerHTML += 'Version check failed.'\n } else if (json[channel] === localVersion) {\n versionElem.innerHTML += 'Linkerd is up to date.';\n } else {\n parts = json[channel].split(\"-\", 2);\n if (parts.length === 2) {\n versionElem.innerHTML += \"A new \"+parts[0]+\" version (\"+parts[1]+\") is available.\"\n } else {\n versionElem.innerHTML += \"A new version (\"+json[channel]+\") is available.\"\n }\n versionElem.innerHTML += \" <a href='https://versioncheck.linkerd.io/update' target='_blank'>Update now</a>.\";\n }\n });\n});\n</script>",
"gridPos": {
"h": 3,
"w": 24,

2
grafana/dashboards/health.json
View File

@ -1695,7 +1695,7 @@
"type": "row"
},
{
"content": "<div>\n <div style=\"position: absolute; top: 0, left: 0\">\n <a href=\"https://linkerd.io\" target=\"_blank\"><img src=\"https://linkerd.io/images/identity/svg/linkerd_primary_color_white.svg\" style=\"height: 30px;\"></a>\n </div>\n <div id=\"version\" style=\"position: absolute; top: 0; right: 0; font-size: 15px\">\n </div>\n</div>\n<script type=\"text/javascript\">\nvar localReqURL =\n window.location.href.substring(\n 0,\n window.location.href.indexOf(\n \"/services/grafana:http/proxy/\"\n )\n )+'/services/web:http/proxy/overview';\n\nfetch(localReqURL, {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"text/html; charset=utf-8\",\n },\n})\n.then(response => response.text())\n.then(text => (new window.DOMParser()).parseFromString(text, \"text/html\"))\n.then(html => {\n var main = html.getElementById('main');\n var localVersion = main.getAttribute(\"data-release-version\");\n var versionElem = document.getElementById('version');\n\n var channel;\n var parts = localVersion.split(\"-\", 2);\n if (parts.length === 2) {\n channel = parts[0];\n versionElem.innerHTML += 'Running Linkerd ' + parts[1] + ' (' + parts[0] + ')' + '.<br>';\n } else {\n versionElem.innerHTML += 'Running Linkerd ' + localVersion + '.<br>';\n }\n var uuid = main.getAttribute(\"data-uuid\");\n\n fetch('https://versioncheck.linkerd.io/version.json?version='+localVersion+'&uuid='+uuid+'&source=grafana', {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"application/json; charset=utf-8\",\n },\n })\n .then(response => response.json())\n .then(json => {\n if (!channel || !json[channel]) {\n versionElem.innerHTML += 'Version check failed.'\n } else if (json[channel] === localVersion) {\n versionElem.innerHTML += 'Linkerd is up to date.';\n } else {\n parts = json[channel].split(\"-\", 2);\n if (parts.length === 2) {\n versionElem.innerHTML += \"A new \"+parts[0]+\" version (\"+parts[1]+\") is available.\"\n } else {\n versionElem.innerHTML += \"A new version (\"+json[channel]+\") is available.\"\n }\n versionElem.innerHTML += \" <a href='https://versioncheck.linkerd.io/update' target='_blank'>Update now</a>.\";\n }\n });\n});\n</script>",
"content": "<div>\n <div style=\"position: absolute; top: 0, left: 0\">\n <a href=\"https://linkerd.io\" target=\"_blank\"><img src=\"https://linkerd.io/images/identity/svg/linkerd_primary_color_white.svg\" style=\"height: 30px;\"></a>\n </div>\n <div id=\"version\" style=\"position: absolute; top: 0; right: 0; font-size: 15px\">\n </div>\n</div>\n<script type=\"text/javascript\">\nvar localReqURL =\n window.location.href.substring(\n 0,\n window.location.href.indexOf(\n \"/services/linkerd-grafana:http/proxy/\"\n )\n )+'/services/linkerd-web:http/proxy/overview';\n\nfetch(localReqURL, {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"text/html; charset=utf-8\",\n },\n})\n.then(response => response.text())\n.then(text => (new window.DOMParser()).parseFromString(text, \"text/html\"))\n.then(html => {\n var main = html.getElementById('main');\n var localVersion = main.getAttribute(\"data-release-version\");\n var versionElem = document.getElementById('version');\n\n var channel;\n var parts = localVersion.split(\"-\", 2);\n if (parts.length === 2) {\n channel = parts[0];\n versionElem.innerHTML += 'Running Linkerd ' + parts[1] + ' (' + parts[0] + ')' + '.<br>';\n } else {\n versionElem.innerHTML += 'Running Linkerd ' + localVersion + '.<br>';\n }\n var uuid = main.getAttribute(\"data-uuid\");\n\n fetch('https://versioncheck.linkerd.io/version.json?version='+localVersion+'&uuid='+uuid+'&source=grafana', {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"application/json; charset=utf-8\",\n },\n })\n .then(response => response.json())\n .then(json => {\n if (!channel || !json[channel]) {\n versionElem.innerHTML += 'Version check failed.'\n } else if (json[channel] === localVersion) {\n versionElem.innerHTML += 'Linkerd is up to date.';\n } else {\n parts = json[channel].split(\"-\", 2);\n if (parts.length === 2) {\n versionElem.innerHTML += \"A new \"+parts[0]+\" version (\"+parts[1]+\") is available.\"\n } else {\n versionElem.innerHTML += \"A new version (\"+json[channel]+\") is available.\"\n }\n versionElem.innerHTML += \" <a href='https://versioncheck.linkerd.io/update' target='_blank'>Update now</a>.\";\n }\n });\n});\n</script>",
"gridPos": {
"h": 3,
"w": 24,

2
grafana/dashboards/pod.json
View File

@ -1540,7 +1540,7 @@
}
},
{
"content": "<div>\n <div style=\"position: absolute; top: 0, left: 0\">\n <a href=\"https://linkerd.io\" target=\"_blank\"><img src=\"https://linkerd.io/images/identity/svg/linkerd_primary_color_white.svg\" style=\"height: 30px;\"></a>\n </div>\n <div id=\"version\" style=\"position: absolute; top: 0; right: 0; font-size: 15px\">\n </div>\n</div>\n<script type=\"text/javascript\">\nvar localReqURL =\n window.location.href.substring(\n 0,\n window.location.href.indexOf(\n \"/services/grafana:http/proxy/\"\n )\n )+'/services/web:http/proxy/overview';\n\nfetch(localReqURL, {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"text/html; charset=utf-8\",\n },\n})\n.then(response => response.text())\n.then(text => (new window.DOMParser()).parseFromString(text, \"text/html\"))\n.then(html => {\n var main = html.getElementById('main');\n var localVersion = main.getAttribute(\"data-release-version\");\n var versionElem = document.getElementById('version');\n\n var channel;\n var parts = localVersion.split(\"-\", 2);\n if (parts.length === 2) {\n channel = parts[0];\n versionElem.innerHTML += 'Running Linkerd ' + parts[1] + ' (' + parts[0] + ')' + '.<br>';\n } else {\n versionElem.innerHTML += 'Running Linkerd ' + localVersion + '.<br>';\n }\n var uuid = main.getAttribute(\"data-uuid\");\n\n fetch('https://versioncheck.linkerd.io/version.json?version='+localVersion+'&uuid='+uuid+'&source=grafana', {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"application/json; charset=utf-8\",\n },\n })\n .then(response => response.json())\n .then(json => {\n if (!channel || !json[channel]) {\n versionElem.innerHTML += 'Version check failed.'\n } else if (json[channel] === localVersion) {\n versionElem.innerHTML += 'Linkerd is up to date.';\n } else {\n parts = json[channel].split(\"-\", 2);\n if (parts.length === 2) {\n versionElem.innerHTML += \"A new \"+parts[0]+\" version (\"+parts[1]+\") is available.\"\n } else {\n versionElem.innerHTML += \"A new version (\"+json[channel]+\") is available.\"\n }\n versionElem.innerHTML += \" <a href='https://versioncheck.linkerd.io/update' target='_blank'>Update now</a>.\";\n }\n });\n});\n</script>",
"content": "<div>\n <div style=\"position: absolute; top: 0, left: 0\">\n <a href=\"https://linkerd.io\" target=\"_blank\"><img src=\"https://linkerd.io/images/identity/svg/linkerd_primary_color_white.svg\" style=\"height: 30px;\"></a>\n </div>\n <div id=\"version\" style=\"position: absolute; top: 0; right: 0; font-size: 15px\">\n </div>\n</div>\n<script type=\"text/javascript\">\nvar localReqURL =\n window.location.href.substring(\n 0,\n window.location.href.indexOf(\n \"/services/linkerd-grafana:http/proxy/\"\n )\n )+'/services/linkerd-web:http/proxy/overview';\n\nfetch(localReqURL, {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"text/html; charset=utf-8\",\n },\n})\n.then(response => response.text())\n.then(text => (new window.DOMParser()).parseFromString(text, \"text/html\"))\n.then(html => {\n var main = html.getElementById('main');\n var localVersion = main.getAttribute(\"data-release-version\");\n var versionElem = document.getElementById('version');\n\n var channel;\n var parts = localVersion.split(\"-\", 2);\n if (parts.length === 2) {\n channel = parts[0];\n versionElem.innerHTML += 'Running Linkerd ' + parts[1] + ' (' + parts[0] + ')' + '.<br>';\n } else {\n versionElem.innerHTML += 'Running Linkerd ' + localVersion + '.<br>';\n }\n var uuid = main.getAttribute(\"data-uuid\");\n\n fetch('https://versioncheck.linkerd.io/version.json?version='+localVersion+'&uuid='+uuid+'&source=grafana', {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"application/json; charset=utf-8\",\n },\n })\n .then(response => response.json())\n .then(json => {\n if (!channel || !json[channel]) {\n versionElem.innerHTML += 'Version check failed.'\n } else if (json[channel] === localVersion) {\n versionElem.innerHTML += 'Linkerd is up to date.';\n } else {\n parts = json[channel].split(\"-\", 2);\n if (parts.length === 2) {\n versionElem.innerHTML += \"A new \"+parts[0]+\" version (\"+parts[1]+\") is available.\"\n } else {\n versionElem.innerHTML += \"A new version (\"+json[channel]+\") is available.\"\n }\n versionElem.innerHTML += \" <a href='https://versioncheck.linkerd.io/update' target='_blank'>Update now</a>.\";\n }\n });\n});\n</script>",
"gridPos": {
"h": 3,
"w": 24,

2
grafana/dashboards/prometheus-benchmark.json
View File

@ -2689,7 +2689,7 @@
}
},
{
"content": "<div>\n <div style=\"position: absolute; top: 0, left: 0\">\n <a href=\"https://linkerd.io\" target=\"_blank\"><img src=\"https://linkerd.io/images/identity/svg/linkerd_primary_color_white.svg\" style=\"height: 30px;\"></a>\n </div>\n <div id=\"version\" style=\"position: absolute; top: 0; right: 0; font-size: 15px\">\n </div>\n</div>\n<script type=\"text/javascript\">\nvar localReqURL =\n window.location.href.substring(\n 0,\n window.location.href.indexOf(\n \"/services/grafana:http/proxy/\"\n )\n )+'/services/web:http/proxy/overview';\n\nfetch(localReqURL, {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"text/html; charset=utf-8\",\n },\n})\n.then(response => response.text())\n.then(text => (new window.DOMParser()).parseFromString(text, \"text/html\"))\n.then(html => {\n var main = html.getElementById('main');\n var localVersion = main.getAttribute(\"data-release-version\");\n var versionElem = document.getElementById('version');\n\n var channel;\n var parts = localVersion.split(\"-\", 2);\n if (parts.length === 2) {\n channel = parts[0];\n versionElem.innerHTML += 'Running Linkerd ' + parts[1] + ' (' + parts[0] + ')' + '.<br>';\n } else {\n versionElem.innerHTML += 'Running Linkerd ' + localVersion + '.<br>';\n }\n var uuid = main.getAttribute(\"data-uuid\");\n\n fetch('https://versioncheck.linkerd.io/version.json?version='+localVersion+'&uuid='+uuid+'&source=grafana', {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"application/json; charset=utf-8\",\n },\n })\n .then(response => response.json())\n .then(json => {\n if (!channel || !json[channel]) {\n versionElem.innerHTML += 'Version check failed.'\n } else if (json[channel] === localVersion) {\n versionElem.innerHTML += 'Linkerd is up to date.';\n } else {\n parts = json[channel].split(\"-\", 2);\n if (parts.length === 2) {\n versionElem.innerHTML += \"A new \"+parts[0]+\" version (\"+parts[1]+\") is available.\"\n } else {\n versionElem.innerHTML += \"A new version (\"+json[channel]+\") is available.\"\n }\n versionElem.innerHTML += \" <a href='https://versioncheck.linkerd.io/update' target='_blank'>Update now</a>.\";\n }\n });\n});\n</script>",
"content": "<div>\n <div style=\"position: absolute; top: 0, left: 0\">\n <a href=\"https://linkerd.io\" target=\"_blank\"><img src=\"https://linkerd.io/images/identity/svg/linkerd_primary_color_white.svg\" style=\"height: 30px;\"></a>\n </div>\n <div id=\"version\" style=\"position: absolute; top: 0; right: 0; font-size: 15px\">\n </div>\n</div>\n<script type=\"text/javascript\">\nvar localReqURL =\n window.location.href.substring(\n 0,\n window.location.href.indexOf(\n \"/services/linkerd-grafana:http/proxy/\"\n )\n )+'/services/linkerd-web:http/proxy/overview';\n\nfetch(localReqURL, {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"text/html; charset=utf-8\",\n },\n})\n.then(response => response.text())\n.then(text => (new window.DOMParser()).parseFromString(text, \"text/html\"))\n.then(html => {\n var main = html.getElementById('main');\n var localVersion = main.getAttribute(\"data-release-version\");\n var versionElem = document.getElementById('version');\n\n var channel;\n var parts = localVersion.split(\"-\", 2);\n if (parts.length === 2) {\n channel = parts[0];\n versionElem.innerHTML += 'Running Linkerd ' + parts[1] + ' (' + parts[0] + ')' + '.<br>';\n } else {\n versionElem.innerHTML += 'Running Linkerd ' + localVersion + '.<br>';\n }\n var uuid = main.getAttribute(\"data-uuid\");\n\n fetch('https://versioncheck.linkerd.io/version.json?version='+localVersion+'&uuid='+uuid+'&source=grafana', {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"application/json; charset=utf-8\",\n },\n })\n .then(response => response.json())\n .then(json => {\n if (!channel || !json[channel]) {\n versionElem.innerHTML += 'Version check failed.'\n } else if (json[channel] === localVersion) {\n versionElem.innerHTML += 'Linkerd is up to date.';\n } else {\n parts = json[channel].split(\"-\", 2);\n if (parts.length === 2) {\n versionElem.innerHTML += \"A new \"+parts[0]+\" version (\"+parts[1]+\") is available.\"\n } else {\n versionElem.innerHTML += \"A new version (\"+json[channel]+\") is available.\"\n }\n versionElem.innerHTML += \" <a href='https://versioncheck.linkerd.io/update' target='_blank'>Update now</a>.\";\n }\n });\n});\n</script>",
"gridPos": {
"h": 3,
"w": 24,

2
grafana/dashboards/prometheus.json
View File

@ -1249,7 +1249,7 @@
}
},
{
"content": "<div>\n <div style=\"position: absolute; top: 0, left: 0\">\n <a href=\"https://linkerd.io\" target=\"_blank\"><img src=\"https://linkerd.io/images/identity/svg/linkerd_primary_color_white.svg\" style=\"height: 30px;\"></a>\n </div>\n <div id=\"version\" style=\"position: absolute; top: 0; right: 0; font-size: 15px\">\n </div>\n</div>\n<script type=\"text/javascript\">\nvar localReqURL =\n window.location.href.substring(\n 0,\n window.location.href.indexOf(\n \"/services/grafana:http/proxy/\"\n )\n )+'/services/web:http/proxy/overview';\n\nfetch(localReqURL, {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"text/html; charset=utf-8\",\n },\n})\n.then(response => response.text())\n.then(text => (new window.DOMParser()).parseFromString(text, \"text/html\"))\n.then(html => {\n var main = html.getElementById('main');\n var localVersion = main.getAttribute(\"data-release-version\");\n var versionElem = document.getElementById('version');\n\n var channel;\n var parts = localVersion.split(\"-\", 2);\n if (parts.length === 2) {\n channel = parts[0];\n versionElem.innerHTML += 'Running Linkerd ' + parts[1] + ' (' + parts[0] + ')' + '.<br>';\n } else {\n versionElem.innerHTML += 'Running Linkerd ' + localVersion + '.<br>';\n }\n var uuid = main.getAttribute(\"data-uuid\");\n\n fetch('https://versioncheck.linkerd.io/version.json?version='+localVersion+'&uuid='+uuid+'&source=grafana', {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"application/json; charset=utf-8\",\n },\n })\n .then(response => response.json())\n .then(json => {\n if (!channel || !json[channel]) {\n versionElem.innerHTML += 'Version check failed.'\n } else if (json[channel] === localVersion) {\n versionElem.innerHTML += 'Linkerd is up to date.';\n } else {\n parts = json[channel].split(\"-\", 2);\n if (parts.length === 2) {\n versionElem.innerHTML += \"A new \"+parts[0]+\" version (\"+parts[1]+\") is available.\"\n } else {\n versionElem.innerHTML += \"A new version (\"+json[channel]+\") is available.\"\n }\n versionElem.innerHTML += \" <a href='https://versioncheck.linkerd.io/update' target='_blank'>Update now</a>.\";\n }\n });\n});\n</script>",
"content": "<div>\n <div style=\"position: absolute; top: 0, left: 0\">\n <a href=\"https://linkerd.io\" target=\"_blank\"><img src=\"https://linkerd.io/images/identity/svg/linkerd_primary_color_white.svg\" style=\"height: 30px;\"></a>\n </div>\n <div id=\"version\" style=\"position: absolute; top: 0; right: 0; font-size: 15px\">\n </div>\n</div>\n<script type=\"text/javascript\">\nvar localReqURL =\n window.location.href.substring(\n 0,\n window.location.href.indexOf(\n \"/services/linkerd-grafana:http/proxy/\"\n )\n )+'/services/linkerd-web:http/proxy/overview';\n\nfetch(localReqURL, {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"text/html; charset=utf-8\",\n },\n})\n.then(response => response.text())\n.then(text => (new window.DOMParser()).parseFromString(text, \"text/html\"))\n.then(html => {\n var main = html.getElementById('main');\n var localVersion = main.getAttribute(\"data-release-version\");\n var versionElem = document.getElementById('version');\n\n var channel;\n var parts = localVersion.split(\"-\", 2);\n if (parts.length === 2) {\n channel = parts[0];\n versionElem.innerHTML += 'Running Linkerd ' + parts[1] + ' (' + parts[0] + ')' + '.<br>';\n } else {\n versionElem.innerHTML += 'Running Linkerd ' + localVersion + '.<br>';\n }\n var uuid = main.getAttribute(\"data-uuid\");\n\n fetch('https://versioncheck.linkerd.io/version.json?version='+localVersion+'&uuid='+uuid+'&source=grafana', {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"application/json; charset=utf-8\",\n },\n })\n .then(response => response.json())\n .then(json => {\n if (!channel || !json[channel]) {\n versionElem.innerHTML += 'Version check failed.'\n } else if (json[channel] === localVersion) {\n versionElem.innerHTML += 'Linkerd is up to date.';\n } else {\n parts = json[channel].split(\"-\", 2);\n if (parts.length === 2) {\n versionElem.innerHTML += \"A new \"+parts[0]+\" version (\"+parts[1]+\") is available.\"\n } else {\n versionElem.innerHTML += \"A new version (\"+json[channel]+\") is available.\"\n }\n versionElem.innerHTML += \" <a href='https://versioncheck.linkerd.io/update' target='_blank'>Update now</a>.\";\n }\n });\n});\n</script>",
"gridPos": {
"h": 3,
"w": 24,

2
grafana/dashboards/replicationcontroller.json
View File

@ -1589,7 +1589,7 @@
"type": "row"
},
{
"content": "<div>\n <div style=\"position: absolute; top: 0, left: 0\">\n <a href=\"https://linkerd.io\" target=\"_blank\"><img src=\"https://linkerd.io/images/identity/svg/linkerd_primary_color_white.svg\" style=\"height: 30px;\"></a>\n </div>\n <div id=\"version\" style=\"position: absolute; top: 0; right: 0; font-size: 15px\">\n </div>\n</div>\n<script type=\"text/javascript\">\nvar localReqURL =\n window.location.href.substring(\n 0,\n window.location.href.indexOf(\n \"/services/grafana:http/proxy/\"\n )\n )+'/services/web:http/proxy/overview';\n\nfetch(localReqURL, {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"text/html; charset=utf-8\",\n },\n})\n.then(response => response.text())\n.then(text => (new window.DOMParser()).parseFromString(text, \"text/html\"))\n.then(html => {\n var main = html.getElementById('main');\n var localVersion = main.getAttribute(\"data-release-version\");\n var versionElem = document.getElementById('version');\n\n var channel;\n var parts = localVersion.split(\"-\", 2);\n if (parts.length === 2) {\n channel = parts[0];\n versionElem.innerHTML += 'Running Linkerd ' + parts[1] + ' (' + parts[0] + ')' + '.<br>';\n } else {\n versionElem.innerHTML += 'Running Linkerd ' + localVersion + '.<br>';\n }\n var uuid = main.getAttribute(\"data-uuid\");\n\n fetch('https://versioncheck.linkerd.io/version.json?version='+localVersion+'&uuid='+uuid+'&source=grafana', {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"application/json; charset=utf-8\",\n },\n })\n .then(response => response.json())\n .then(json => {\n if (!channel || !json[channel]) {\n versionElem.innerHTML += 'Version check failed.'\n } else if (json[channel] === localVersion) {\n versionElem.innerHTML += 'Linkerd is up to date.';\n } else {\n parts = json[channel].split(\"-\", 2);\n if (parts.length === 2) {\n versionElem.innerHTML += \"A new \"+parts[0]+\" version (\"+parts[1]+\") is available.\"\n } else {\n versionElem.innerHTML += \"A new version (\"+json[channel]+\") is available.\"\n }\n versionElem.innerHTML += \" <a href='https://versioncheck.linkerd.io/update' target='_blank'>Update now</a>.\";\n }\n });\n});\n</script>",
"content": "<div>\n <div style=\"position: absolute; top: 0, left: 0\">\n <a href=\"https://linkerd.io\" target=\"_blank\"><img src=\"https://linkerd.io/images/identity/svg/linkerd_primary_color_white.svg\" style=\"height: 30px;\"></a>\n </div>\n <div id=\"version\" style=\"position: absolute; top: 0; right: 0; font-size: 15px\">\n </div>\n</div>\n<script type=\"text/javascript\">\nvar localReqURL =\n window.location.href.substring(\n 0,\n window.location.href.indexOf(\n \"/services/linkerd-grafana:http/proxy/\"\n )\n )+'/services/linkerd-web:http/proxy/overview';\n\nfetch(localReqURL, {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"text/html; charset=utf-8\",\n },\n})\n.then(response => response.text())\n.then(text => (new window.DOMParser()).parseFromString(text, \"text/html\"))\n.then(html => {\n var main = html.getElementById('main');\n var localVersion = main.getAttribute(\"data-release-version\");\n var versionElem = document.getElementById('version');\n\n var channel;\n var parts = localVersion.split(\"-\", 2);\n if (parts.length === 2) {\n channel = parts[0];\n versionElem.innerHTML += 'Running Linkerd ' + parts[1] + ' (' + parts[0] + ')' + '.<br>';\n } else {\n versionElem.innerHTML += 'Running Linkerd ' + localVersion + '.<br>';\n }\n var uuid = main.getAttribute(\"data-uuid\");\n\n fetch('https://versioncheck.linkerd.io/version.json?version='+localVersion+'&uuid='+uuid+'&source=grafana', {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"application/json; charset=utf-8\",\n },\n })\n .then(response => response.json())\n .then(json => {\n if (!channel || !json[channel]) {\n versionElem.innerHTML += 'Version check failed.'\n } else if (json[channel] === localVersion) {\n versionElem.innerHTML += 'Linkerd is up to date.';\n } else {\n parts = json[channel].split(\"-\", 2);\n if (parts.length === 2) {\n versionElem.innerHTML += \"A new \"+parts[0]+\" version (\"+parts[1]+\") is available.\"\n } else {\n versionElem.innerHTML += \"A new version (\"+json[channel]+\") is available.\"\n }\n versionElem.innerHTML += \" <a href='https://versioncheck.linkerd.io/update' target='_blank'>Update now</a>.\";\n }\n });\n});\n</script>",
"gridPos": {
"h": 3,
"w": 24,

2
grafana/dashboards/service.json
View File

@ -1129,7 +1129,7 @@
}
},
{
"content": "<div>\n <div style=\"position: absolute; top: 0, left: 0\">\n <a href=\"https://linkerd.io\" target=\"_blank\"><img src=\"https://linkerd.io/images/identity/svg/linkerd_primary_color_white.svg\" style=\"height: 30px;\"></a>\n </div>\n <div id=\"version\" style=\"position: absolute; top: 0; right: 0; font-size: 15px\">\n </div>\n</div>\n<script type=\"text/javascript\">\nvar localReqURL =\n window.location.href.substring(\n 0,\n window.location.href.indexOf(\n \"/services/grafana:http/proxy/\"\n )\n )+'/services/web:http/proxy/overview';\n\nfetch(localReqURL, {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"text/html; charset=utf-8\",\n },\n})\n.then(response => response.text())\n.then(text => (new window.DOMParser()).parseFromString(text, \"text/html\"))\n.then(html => {\n var main = html.getElementById('main');\n var localVersion = main.getAttribute(\"data-release-version\");\n var versionElem = document.getElementById('version');\n\n var channel;\n var parts = localVersion.split(\"-\", 2);\n if (parts.length === 2) {\n channel = parts[0];\n versionElem.innerHTML += 'Running Linkerd ' + parts[1] + ' (' + parts[0] + ')' + '.<br>';\n } else {\n versionElem.innerHTML += 'Running Linkerd ' + localVersion + '.<br>';\n }\n var uuid = main.getAttribute(\"data-uuid\");\n\n fetch('https://versioncheck.linkerd.io/version.json?version='+localVersion+'&uuid='+uuid+'&source=grafana', {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"application/json; charset=utf-8\",\n },\n })\n .then(response => response.json())\n .then(json => {\n if (!channel || !json[channel]) {\n versionElem.innerHTML += 'Version check failed.'\n } else if (json[channel] === localVersion) {\n versionElem.innerHTML += 'Linkerd is up to date.';\n } else {\n parts = json[channel].split(\"-\", 2);\n if (parts.length === 2) {\n versionElem.innerHTML += \"A new \"+parts[0]+\" version (\"+parts[1]+\") is available.\"\n } else {\n versionElem.innerHTML += \"A new version (\"+json[channel]+\") is available.\"\n }\n versionElem.innerHTML += \" <a href='https://versioncheck.linkerd.io/update' target='_blank'>Update now</a>.\";\n }\n });\n});\n</script>",
"content": "<div>\n <div style=\"position: absolute; top: 0, left: 0\">\n <a href=\"https://linkerd.io\" target=\"_blank\"><img src=\"https://linkerd.io/images/identity/svg/linkerd_primary_color_white.svg\" style=\"height: 30px;\"></a>\n </div>\n <div id=\"version\" style=\"position: absolute; top: 0; right: 0; font-size: 15px\">\n </div>\n</div>\n<script type=\"text/javascript\">\nvar localReqURL =\n window.location.href.substring(\n 0,\n window.location.href.indexOf(\n \"/services/linkerd-grafana:http/proxy/\"\n )\n )+'/services/linkerd-web:http/proxy/overview';\n\nfetch(localReqURL, {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"text/html; charset=utf-8\",\n },\n})\n.then(response => response.text())\n.then(text => (new window.DOMParser()).parseFromString(text, \"text/html\"))\n.then(html => {\n var main = html.getElementById('main');\n var localVersion = main.getAttribute(\"data-release-version\");\n var versionElem = document.getElementById('version');\n\n var channel;\n var parts = localVersion.split(\"-\", 2);\n if (parts.length === 2) {\n channel = parts[0];\n versionElem.innerHTML += 'Running Linkerd ' + parts[1] + ' (' + parts[0] + ')' + '.<br>';\n } else {\n versionElem.innerHTML += 'Running Linkerd ' + localVersion + '.<br>';\n }\n var uuid = main.getAttribute(\"data-uuid\");\n\n fetch('https://versioncheck.linkerd.io/version.json?version='+localVersion+'&uuid='+uuid+'&source=grafana', {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"application/json; charset=utf-8\",\n },\n })\n .then(response => response.json())\n .then(json => {\n if (!channel || !json[channel]) {\n versionElem.innerHTML += 'Version check failed.'\n } else if (json[channel] === localVersion) {\n versionElem.innerHTML += 'Linkerd is up to date.';\n } else {\n parts = json[channel].split(\"-\", 2);\n if (parts.length === 2) {\n versionElem.innerHTML += \"A new \"+parts[0]+\" version (\"+parts[1]+\") is available.\"\n } else {\n versionElem.innerHTML += \"A new version (\"+json[channel]+\") is available.\"\n }\n versionElem.innerHTML += \" <a href='https://versioncheck.linkerd.io/update' target='_blank'>Update now</a>.\";\n }\n });\n});\n</script>",
"gridPos": {
"h": 3,
"w": 24,

2
grafana/dashboards/top-line.json
View File

@ -20,7 +20,7 @@
"links": [],
"panels": [
{
"content": "<div>\n <div style=\"position: absolute; top: 0, left: 0\">\n <a href=\"https://linkerd.io\" target=\"_blank\"><img src=\"https://linkerd.io/images/identity/svg/linkerd_primary_color_white.svg\" style=\"height: 30px;\"></a>\n </div>\n <div id=\"version\" style=\"position: absolute; top: 0; right: 0; font-size: 15px\">\n </div>\n</div>\n<script type=\"text/javascript\">\nvar localReqURL =\n window.location.href.substring(\n 0,\n window.location.href.indexOf(\n \"/services/grafana:http/proxy/\"\n )\n )+'/services/web:http/proxy/overview';\n\nfetch(localReqURL, {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"text/html; charset=utf-8\",\n },\n})\n.then(response => response.text())\n.then(text => (new window.DOMParser()).parseFromString(text, \"text/html\"))\n.then(html => {\n var main = html.getElementById('main');\n var localVersion = main.getAttribute(\"data-release-version\");\n var versionElem = document.getElementById('version');\n\n var channel;\n var parts = localVersion.split(\"-\", 2);\n if (parts.length === 2) {\n channel = parts[0];\n versionElem.innerHTML += 'Running Linkerd ' + parts[1] + ' (' + parts[0] + ')' + '.<br>';\n } else {\n versionElem.innerHTML += 'Running Linkerd ' + localVersion + '.<br>';\n }\n var uuid = main.getAttribute(\"data-uuid\");\n\n fetch('https://versioncheck.linkerd.io/version.json?version='+localVersion+'&uuid='+uuid+'&source=grafana', {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"application/json; charset=utf-8\",\n },\n })\n .then(response => response.json())\n .then(json => {\n if (!channel || !json[channel]) {\n versionElem.innerHTML += 'Version check failed.'\n } else if (json[channel] === localVersion) {\n versionElem.innerHTML += 'Linkerd is up to date.';\n } else {\n parts = json[channel].split(\"-\", 2);\n if (parts.length === 2) {\n versionElem.innerHTML += \"A new \"+parts[0]+\" version (\"+parts[1]+\") is available.\"\n } else {\n versionElem.innerHTML += \"A new version (\"+json[channel]+\") is available.\"\n }\n versionElem.innerHTML += \" <a href='https://versioncheck.linkerd.io/update' target='_blank'>Update now</a>.\";\n }\n });\n});\n</script>",
"content": "<div>\n <div style=\"position: absolute; top: 0, left: 0\">\n <a href=\"https://linkerd.io\" target=\"_blank\"><img src=\"https://linkerd.io/images/identity/svg/linkerd_primary_color_white.svg\" style=\"height: 30px;\"></a>\n </div>\n <div id=\"version\" style=\"position: absolute; top: 0; right: 0; font-size: 15px\">\n </div>\n</div>\n<script type=\"text/javascript\">\nvar localReqURL =\n window.location.href.substring(\n 0,\n window.location.href.indexOf(\n \"/services/linkerd-grafana:http/proxy/\"\n )\n )+'/services/linkerd-web:http/proxy/overview';\n\nfetch(localReqURL, {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"text/html; charset=utf-8\",\n },\n})\n.then(response => response.text())\n.then(text => (new window.DOMParser()).parseFromString(text, \"text/html\"))\n.then(html => {\n var main = html.getElementById('main');\n var localVersion = main.getAttribute(\"data-release-version\");\n var versionElem = document.getElementById('version');\n\n var channel;\n var parts = localVersion.split(\"-\", 2);\n if (parts.length === 2) {\n channel = parts[0];\n versionElem.innerHTML += 'Running Linkerd ' + parts[1] + ' (' + parts[0] + ')' + '.<br>';\n } else {\n versionElem.innerHTML += 'Running Linkerd ' + localVersion + '.<br>';\n }\n var uuid = main.getAttribute(\"data-uuid\");\n\n fetch('https://versioncheck.linkerd.io/version.json?version='+localVersion+'&uuid='+uuid+'&source=grafana', {\n credentials: 'include',\n headers: {\n \"Content-Type\": \"application/json; charset=utf-8\",\n },\n })\n .then(response => response.json())\n .then(json => {\n if (!channel || !json[channel]) {\n versionElem.innerHTML += 'Version check failed.'\n } else if (json[channel] === localVersion) {\n versionElem.innerHTML += 'Linkerd is up to date.';\n } else {\n parts = json[channel].split(\"-\", 2);\n if (parts.length === 2) {\n versionElem.innerHTML += \"A new \"+parts[0]+\" version (\"+parts[1]+\") is available.\"\n } else {\n versionElem.innerHTML += \"A new version (\"+json[channel]+\") is available.\"\n }\n versionElem.innerHTML += \" <a href='https://versioncheck.linkerd.io/update' target='_blank'>Update now</a>.\";\n }\n });\n});\n</script>",
"gridPos": {
"h": 3,
"w": 24,

10
pkg/healthcheck/healthcheck.go
View File

@ -707,7 +707,8 @@ func validateControlPlanePods(pods []v1.Pod) error {
for _, pod := range pods {
if pod.Status.Phase == v1.PodRunning {
name := strings.Split(pod.Name, "-")[0]
parts := strings.Split(pod.Name, "-")
name := strings.Join(parts[1:len(parts)-2], "-")
if _, found := statuses[name]; !found {
statuses[name] = make([]v1.ContainerStatus, 0)
}
@ -719,15 +720,18 @@ func validateControlPlanePods(pods []v1.Pod) error {
if _, found := statuses["ca"]; found {
names = append(names, "ca")
}
if _, found := statuses["proxy-injector"]; found {
names = append(names, "proxy-injector")
}
for _, name := range names {
containers, found := statuses[name]
if !found {
return fmt.Errorf("No running pods for \"%s\"", name)
return fmt.Errorf("No running pods for \"linkerd-%s\"", name)
}
for _, container := range containers {
if !container.Ready {
return fmt.Errorf("The \"%s\" pod's \"%s\" container is not ready", name,
return fmt.Errorf("The \"linkerd-%s\" pod's \"%s\" container is not ready", name,
container.Name)
}
}

30
pkg/healthcheck/healthcheck_test.go
View File

@ -270,7 +270,7 @@ func TestValidateControlPlanePods(t *testing.T) {
Phase: phase,
ContainerStatuses: []v1.ContainerStatus{
v1.ContainerStatus{
Name: strings.Split(name, "-")[0],
Name: strings.Split(name, "-")[1],
Ready: ready,
},
},
@ -280,44 +280,44 @@ func TestValidateControlPlanePods(t *testing.T) {
t.Run("Returns an error if not all pods are running", func(t *testing.T) {
pods := []v1.Pod{
pod("controller-6f78cbd47-bc557", v1.PodRunning, true),
pod("grafana-5b7d796646-hh46d", v1.PodRunning, true),
pod("prometheus-74d6879cd6-bbdk6", v1.PodFailed, false),
pod("web-98c9ddbcd-7b5lh", v1.PodRunning, true),
pod("linkerd-controller-6f78cbd47-bc557", v1.PodRunning, true),
pod("linkerd-grafana-5b7d796646-hh46d", v1.PodRunning, true),
pod("linkerd-prometheus-74d6879cd6-bbdk6", v1.PodFailed, false),
pod("linkerd-web-98c9ddbcd-7b5lh", v1.PodRunning, true),
}
err := validateControlPlanePods(pods)
if err == nil {
t.Fatal("Expected error, got nothing")
}
if err.Error() != "No running pods for \"prometheus\"" {
if err.Error() != "No running pods for \"linkerd-prometheus\"" {
t.Fatalf("Unexpected error message: %s", err.Error())
}
})
t.Run("Returns an error if not all containers are ready", func(t *testing.T) {
pods := []v1.Pod{
pod("controller-6f78cbd47-bc557", v1.PodRunning, true),
pod("grafana-5b7d796646-hh46d", v1.PodRunning, false),
pod("prometheus-74d6879cd6-bbdk6", v1.PodRunning, true),
pod("web-98c9ddbcd-7b5lh", v1.PodRunning, true),
pod("linkerd-controller-6f78cbd47-bc557", v1.PodRunning, true),
pod("linkerd-grafana-5b7d796646-hh46d", v1.PodRunning, false),
pod("linkerd-prometheus-74d6879cd6-bbdk6", v1.PodRunning, true),
pod("linkerd-web-98c9ddbcd-7b5lh", v1.PodRunning, true),
}
err := validateControlPlanePods(pods)
if err == nil {
t.Fatal("Expected error, got nothing")
}
if err.Error() != "The \"grafana\" pod's \"grafana\" container is not ready" {
if err.Error() != "The \"linkerd-grafana\" pod's \"grafana\" container is not ready" {
t.Fatalf("Unexpected error message: %s", err.Error())
}
})
t.Run("Returns nil if all pods are running and all containers are ready", func(t *testing.T) {
pods := []v1.Pod{
pod("controller-6f78cbd47-bc557", v1.PodRunning, true),
pod("grafana-5b7d796646-hh46d", v1.PodRunning, true),
pod("prometheus-74d6879cd6-bbdk6", v1.PodRunning, true),
pod("web-98c9ddbcd-7b5lh", v1.PodRunning, true),
pod("linkerd-controller-6f78cbd47-bc557", v1.PodRunning, true),
pod("linkerd-grafana-5b7d796646-hh46d", v1.PodRunning, true),
pod("linkerd-prometheus-74d6879cd6-bbdk6", v1.PodRunning, true),
pod("linkerd-web-98c9ddbcd-7b5lh", v1.PodRunning, true),
}
err := validateControlPlanePods(pods)

7
pkg/k8s/labels.go
View File

@ -90,17 +90,12 @@ const (
// ProxyInjectorTLSSecret is the name assigned to the secret containing the
// TLS cert and key used by the proxy-injector webhook.
ProxyInjectorTLSSecret = "proxy-injector-service-tls-linkerd-io"
ProxyInjectorTLSSecret = "linkerd-proxy-injector-service-tls-linkerd-io"
// ProxyInjectorWebhookConfig is the name of the mutating webhook
// configuration resource of the proxy-injector webhook.
ProxyInjectorWebhookConfig = "linkerd-proxy-injector-webhook-config"
// ProxyInjectorSidecarConfig is the name of the config map resource that
// contains the specs of the proxy init container and sidecar container to be
// injected into a pod.
ProxyInjectorSidecarConfig = "proxy-injector-sidecar-config"
// ProxySpecFileName is the name (key) within the proxy-injector ConfigMap
// that contains the proxy container spec.
ProxySpecFileName = "proxy.yaml"

8
test/get/get_test.go
View File

@ -33,10 +33,10 @@ var (
}
linkerdPods = map[string]int{
"grafana": 1,
"web": 1,
"prometheus": 1,
"controller": 1,
"linkerd-grafana": 1,
"linkerd-web": 1,
"linkerd-prometheus": 1,
"linkerd-controller": 1,
}
)

22
test/install_test.go
View File

@ -24,18 +24,18 @@ func TestMain(m *testing.M) {
var (
linkerdSvcs = []string{
"api",
"grafana",
"prometheus",
"proxy-api",
"web",
"linkerd-controller-api",
"linkerd-grafana",
"linkerd-prometheus",
"linkerd-proxy-api",
"linkerd-web",
}
linkerdDeployReplicas = map[string]int{
"controller": 1,
"grafana": 1,
"prometheus": 1,
"web": 1,
"linkerd-controller": 1,
"linkerd-grafana": 1,
"linkerd-prometheus": 1,
"linkerd-web": 1,
}
)
@ -73,7 +73,7 @@ func TestInstall(t *testing.T) {
}
if TestHelper.TLS() {
cmd = append(cmd, []string{"--tls", "optional"}...)
linkerdDeployReplicas["ca"] = 1
linkerdDeployReplicas["linkerd-ca"] = 1
}
out, _, err := TestHelper.LinkerdRun(cmd...)
@ -138,7 +138,7 @@ func TestCheckPostInstall(t *testing.T) {
func TestDashboard(t *testing.T) {
dashboardPort := 52237
dashboardURL := fmt.Sprintf(
"http://127.0.0.1:%d/api/v1/namespaces/%s/services/web:http/proxy",
"http://127.0.0.1:%d/api/v1/namespaces/%s/services/linkerd-web:http/proxy",
dashboardPort, TestHelper.GetLinkerdNamespace(),
)

26
test/stat/stat_test.go
View File

@ -44,7 +44,7 @@ type rowStat struct {
// requesting, and the test will pass.
func TestCliStatForLinkerdNamespace(t *testing.T) {
pods, err := TestHelper.GetPodsForDeployment(TestHelper.GetLinkerdNamespace(), "prometheus")
pods, err := TestHelper.GetPodsForDeployment(TestHelper.GetLinkerdNamespace(), "linkerd-prometheus")
if err != nil {
t.Fatalf("Failed to get pods for prometheus: %s", err)
}
@ -53,7 +53,7 @@ func TestCliStatForLinkerdNamespace(t *testing.T) {
}
prometheusPod := pods[0]
pods, err = TestHelper.GetPodsForDeployment(TestHelper.GetLinkerdNamespace(), "controller")
pods, err = TestHelper.GetPodsForDeployment(TestHelper.GetLinkerdNamespace(), "linkerd-controller")
if err != nil {
t.Fatalf("Failed to get pods for controller: %s", err)
}
@ -62,7 +62,7 @@ func TestCliStatForLinkerdNamespace(t *testing.T) {
}
controllerPod := pods[0]
prometheusAuthority := "prometheus." + TestHelper.GetLinkerdNamespace() + ".svc.cluster.local:9090"
prometheusAuthority := "linkerd-prometheus." + TestHelper.GetLinkerdNamespace() + ".svc.cluster.local:9090"
for _, tt := range []struct {
args []string
@ -71,14 +71,14 @@ func TestCliStatForLinkerdNamespace(t *testing.T) {
{
args: []string{"stat", "deploy", "-n", TestHelper.GetLinkerdNamespace()},
expectedRows: map[string]string{
"controller": "1/1",
"grafana": "1/1",
"prometheus": "1/1",
"web": "1/1",
"linkerd-controller": "1/1",
"linkerd-grafana": "1/1",
"linkerd-prometheus": "1/1",
"linkerd-web": "1/1",
},
},
{
args: []string{"stat", "po", "-n", TestHelper.GetLinkerdNamespace(), "--from", "deploy/controller"},
args: []string{"stat", "po", "-n", TestHelper.GetLinkerdNamespace(), "--from", "deploy/linkerd-controller"},
expectedRows: map[string]string{
prometheusPod: "1/1",
},
@ -86,19 +86,19 @@ func TestCliStatForLinkerdNamespace(t *testing.T) {
{
args: []string{"stat", "deploy", "-n", TestHelper.GetLinkerdNamespace(), "--to", "po/" + prometheusPod},
expectedRows: map[string]string{
"controller": "1/1",
"linkerd-controller": "1/1",
},
},
{
args: []string{"stat", "svc", "-n", TestHelper.GetLinkerdNamespace(), "--from", "deploy/controller"},
args: []string{"stat", "svc", "-n", TestHelper.GetLinkerdNamespace(), "--from", "deploy/linkerd-controller"},
expectedRows: map[string]string{
"prometheus": "1/1",
"linkerd-prometheus": "1/1",
},
},
{
args: []string{"stat", "deploy", "-n", TestHelper.GetLinkerdNamespace(), "--to", "svc/prometheus"},
args: []string{"stat", "deploy", "-n", TestHelper.GetLinkerdNamespace(), "--to", "svc/linkerd-prometheus"},
expectedRows: map[string]string{
"controller": "1/1",
"linkerd-controller": "1/1",
},
},
{

2
web/app/js/components/GrafanaLink.jsx
View File

@ -6,7 +6,7 @@ const GrafanaLink = ({PrefixedLink, name, namespace, resource}) => {
return (
<PrefixedLink
to={`/dashboard/db/linkerd-${resource}?var-namespace=${namespace}&var-${resource}=${name}`}
deployment="grafana"
deployment="linkerd-grafana"
targetBlank={true}>
&nbsp;&nbsp;
{grafanaIcon}

2
web/app/js/components/util/ApiHelpers.jsx
View File

@ -156,7 +156,7 @@ const ApiHelpers = (pathPrefix, defaultMetricsWindow = '1m') => {
const prefixLink = (to, controllerDeployment) => {
let prefix = pathPrefix;
if (!_.isEmpty(controllerDeployment)) { // add field for grafana deployment
prefix = prefix.replace("/web:", "/" + controllerDeployment + ":");
prefix = prefix.replace("/linkerd-web:", "/" + controllerDeployment + ":");
}
return `${prefix}${to}`;

6
web/app/js/components/util/ApiHelpers.test.jsx
View File

@ -58,12 +58,12 @@ describe('ApiHelpers', () => {
describe('PrefixedLink', () => {
it('respects default values', () => {
api = ApiHelpers('/my/path/prefix/web:/foo');
api = ApiHelpers('/my/path/prefix/linkerd-web:/foo');
let linkProps = { to: "/myrelpath", children: ["Informative Link Title"] };
let prefixedLink = mount(routerWrap(api.PrefixedLink, linkProps));
expect(prefixedLink.find("Link")).toHaveLength(1);
expect(prefixedLink.find('a')).toHaveProp('href', '/my/path/prefix/web:/foo/myrelpath');
expect(prefixedLink.find('a')).toHaveProp('href', '/my/path/prefix/linkerd-web:/foo/myrelpath');
expect(prefixedLink.find('a')).not.toHaveProp('target', '_blank');
expect(prefixedLink).toIncludeText(linkProps.children[0]);
});
@ -89,7 +89,7 @@ describe('ApiHelpers', () => {
});
it('replaces the deployment in a pathPrefix', () => {
api = ApiHelpers('/my/path/prefix/web:/foo');
api = ApiHelpers('/my/path/prefix/linkerd-web:/foo');
let linkProps = { deployment: "mydeployment", to: "/myrelpath", children: ["Informative Link Title"] };
let prefixedLink = mount(routerWrap(api.PrefixedLink, linkProps));