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

Bump proxy-init to v1.3.2 (#4170) 

* Bump proxy-init to v1.3.2

Bumped `proxy-init` version to v1.3.2, fixing an issue with `go.mod`
(linkerd/linkerd2-proxy-init#9).
This is a non-user-facing fix.
This commit is contained in:
Alejandro Pedraza 2020-03-17 14:49:25 -05:00 committed by GitHub
parent 10db65bcb3
commit 8f79e07ee2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
55 changed files with 229 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile-proxy
View File

@ -9,7 +9,7 @@ RUN (proxy=$(bin/fetch-proxy $(cat proxy-version)) && \
mv "$proxy" linkerd2-proxy)
## compile proxy-identity agent
FROM gcr.io/linkerd-io/go-deps:d0918050 as golang
FROM gcr.io/linkerd-io/go-deps:6b9a8ea4 as golang
WORKDIR /linkerd-build
COPY pkg/flags pkg/flags
COPY pkg/tls pkg/tls

2
charts/linkerd2/values.yaml
View File

@ -56,7 +56,7 @@ global:
image:
name: gcr.io/linkerd-io/proxy-init
pullPolicy: *image_pull_policy
version: v1.3.1
version: v1.3.2
resources:
cpu:
limit: 100m

2
cli/Dockerfile-bin
View File

@ -1,5 +1,5 @@
## compile binaries
FROM gcr.io/linkerd-io/go-deps:d0918050 as golang
FROM gcr.io/linkerd-io/go-deps:6b9a8ea4 as golang
WORKDIR /linkerd-build
COPY cli cli
COPY charts charts

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

@ -120,7 +120,7 @@ spec:
- "2102"
- --inbound-ports-to-ignore
- 4190,4191
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -120,7 +120,7 @@ spec:
- "2102"
- --inbound-ports-to-ignore
- 4190,4191
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -268,7 +268,7 @@ spec:
- "2102"
- --inbound-ports-to-ignore
- 4190,4191
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -120,7 +120,7 @@ spec:
- "2102"
- --inbound-ports-to-ignore
- 4190,4191
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -160,7 +160,7 @@ spec:
- "2102"
- --inbound-ports-to-ignore
- 4190,4191
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

8
cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml vendored
View File

@ -131,7 +131,7 @@ spec:
- "2102"
- --inbound-ports-to-ignore
- 4190,4191
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -290,7 +290,7 @@ spec:
- "2102"
- --inbound-ports-to-ignore
- 4190,4191
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -449,7 +449,7 @@ spec:
- "2102"
- --inbound-ports-to-ignore
- 4190,4191
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -608,7 +608,7 @@ spec:
- "2102"
- --inbound-ports-to-ignore
- 4190,4191
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -131,7 +131,7 @@ spec:
- "2102"
- --inbound-ports-to-ignore
- 4190,4191
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -144,7 +144,7 @@ spec:
- "2102"
- --inbound-ports-to-ignore
- 4190,4191
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -149,7 +149,7 @@ spec:
- 4190,9998,7777,8888
- --outbound-ports-to-ignore
- "9999"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -131,7 +131,7 @@ spec:
- "2102"
- --inbound-ports-to-ignore
- 4190,4191
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -290,7 +290,7 @@ spec:
- "2102"
- --inbound-ports-to-ignore
- 4190,4191
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -136,7 +136,7 @@ spec:
- "2102"
- --inbound-ports-to-ignore
- 4190,4191
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -131,7 +131,7 @@ spec:
- "2102"
- --inbound-ports-to-ignore
- 4190,4191
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -131,7 +131,7 @@ spec:
- "2102"
- --inbound-ports-to-ignore
- 4190,4191
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -131,7 +131,7 @@ spec:
- "2102"
- --inbound-ports-to-ignore
- 4190,4191
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -132,7 +132,7 @@ spec:
- "2102"
- --inbound-ports-to-ignore
- 4190,4191
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -132,7 +132,7 @@ spec:
- "2102"
- --inbound-ports-to-ignore
- 4190,1234
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -133,7 +133,7 @@ spec:
- 4190,4191,22,8100-8102
- --outbound-ports-to-ignore
- "5432"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -133,7 +133,7 @@ spec:
- "2102"
- --inbound-ports-to-ignore
- 4190,4191
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -133,7 +133,7 @@ items:
- "2102"
- --inbound-ports-to-ignore
- 4190,4191
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -286,7 +286,7 @@ items:
- "2102"
- --inbound-ports-to-ignore
- 4190,4191
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -133,7 +133,7 @@ items:
- "2102"
- --inbound-ports-to-ignore
- 4190,4191
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -286,7 +286,7 @@ items:
- "2102"
- --inbound-ports-to-ignore
- 4190,4191
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -116,7 +116,7 @@ spec:
- "2102"
- --inbound-ports-to-ignore
- 4190,4191
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -118,7 +118,7 @@ spec:
- 4190,4191,22,8100-8102
- --outbound-ports-to-ignore
- "5432"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -123,7 +123,7 @@ spec:
- "2102"
- --inbound-ports-to-ignore
- 4190,4191
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -132,7 +132,7 @@ spec:
- "2102"
- --inbound-ports-to-ignore
- 4190,4191
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -133,7 +133,7 @@ spec:
- "2102"
- --inbound-ports-to-ignore
- 4190,4191
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -294,7 +294,7 @@ spec:
- "2102"
- --inbound-ports-to-ignore
- 4190,4191
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

2
cli/cmd/testdata/inject_tap_deployment.input.yml vendored
View File

@ -203,7 +203,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -187,7 +187,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

22
cli/cmd/testdata/install_control-plane.golden vendored
View File

@ -13,7 +13,7 @@ data:
global: |
{"linkerdNamespace":"linkerd","cniEnabled":false,"version":"install-control-plane-version","identityContext":{"trustDomain":"cluster.local","trustAnchorsPem":"-----BEGIN CERTIFICATE-----\nMIIBYDCCAQegAwIBAgIBATAKBggqhkjOPQQDAjAYMRYwFAYDVQQDEw1jbHVzdGVy\nLmxvY2FsMB4XDTE5MDMwMzAxNTk1MloXDTI5MDIyODAyMDM1MlowGDEWMBQGA1UE\nAxMNY2x1c3Rlci5sb2NhbDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABAChpAt0\nxtgO9qbVtEtDK80N6iCL2Htyf2kIv2m5QkJ1y0TFQi5hTVe3wtspJ8YpZF0pl364\n6TiYeXB8tOOhIACjQjBAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHSUEFjAUBggrBgEF\nBQcDAQYIKwYBBQUHAwIwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAgNHADBE\nAiBQ/AAwF8kG8VOmRSUTPakSSa/N4mqK2HsZuhQXCmiZHwIgZEzI5DCkpU7w3SIv\nOLO4Zsk1XrGZHGsmyiEyvYF9lpY=\n-----END CERTIFICATE-----\n","issuanceLifetime":"86400s","clockSkewAllowance":"20s","scheme":"linkerd.io/tls"},"autoInjectContext":null,"omitWebhookSideEffects":false,"clusterDomain":"cluster.local"}
proxy: |
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxyInitImageVersion":"v1.3.1","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxyInitImageVersion":"v1.3.2","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
install: |
{"cliVersion":"dev-undefined","flags":[]}
---
@ -217,7 +217,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -436,7 +436,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -652,7 +652,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -916,7 +916,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1266,7 +1266,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1541,7 +1541,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1745,7 +1745,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1979,7 +1979,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2201,7 +2201,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2574,7 +2574,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

22
cli/cmd/testdata/install_controlplane_tracing_output.golden vendored
View File

@ -915,7 +915,7 @@ data:
global: |
{"linkerdNamespace":"linkerd","cniEnabled":false,"version":"install-control-plane-version","identityContext":{"trustDomain":"cluster.local","trustAnchorsPem":"-----BEGIN CERTIFICATE-----\nMIIBYDCCAQegAwIBAgIBATAKBggqhkjOPQQDAjAYMRYwFAYDVQQDEw1jbHVzdGVy\nLmxvY2FsMB4XDTE5MDMwMzAxNTk1MloXDTI5MDIyODAyMDM1MlowGDEWMBQGA1UE\nAxMNY2x1c3Rlci5sb2NhbDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABAChpAt0\nxtgO9qbVtEtDK80N6iCL2Htyf2kIv2m5QkJ1y0TFQi5hTVe3wtspJ8YpZF0pl364\n6TiYeXB8tOOhIACjQjBAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHSUEFjAUBggrBgEF\nBQcDAQYIKwYBBQUHAwIwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAgNHADBE\nAiBQ/AAwF8kG8VOmRSUTPakSSa/N4mqK2HsZuhQXCmiZHwIgZEzI5DCkpU7w3SIv\nOLO4Zsk1XrGZHGsmyiEyvYF9lpY=\n-----END CERTIFICATE-----\n","issuanceLifetime":"86400s","clockSkewAllowance":"20s","scheme":"linkerd.io/tls"},"autoInjectContext":null,"omitWebhookSideEffects":false,"clusterDomain":"cluster.local"}
proxy: |
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxyInitImageVersion":"v1.3.1","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxyInitImageVersion":"v1.3.2","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
install: |
{"cliVersion":"dev-undefined","flags":[]}
---
@ -1124,7 +1124,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1348,7 +1348,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1569,7 +1569,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1838,7 +1838,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2192,7 +2192,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2471,7 +2471,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2679,7 +2679,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2917,7 +2917,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3144,7 +3144,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3521,7 +3521,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

22
cli/cmd/testdata/install_custom_registry.golden vendored
View File

@ -915,7 +915,7 @@ data:
global: |
{"linkerdNamespace":"linkerd","cniEnabled":false,"version":"install-control-plane-version","identityContext":{"trustDomain":"cluster.local","trustAnchorsPem":"-----BEGIN CERTIFICATE-----\nMIIBYDCCAQegAwIBAgIBATAKBggqhkjOPQQDAjAYMRYwFAYDVQQDEw1jbHVzdGVy\nLmxvY2FsMB4XDTE5MDMwMzAxNTk1MloXDTI5MDIyODAyMDM1MlowGDEWMBQGA1UE\nAxMNY2x1c3Rlci5sb2NhbDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABAChpAt0\nxtgO9qbVtEtDK80N6iCL2Htyf2kIv2m5QkJ1y0TFQi5hTVe3wtspJ8YpZF0pl364\n6TiYeXB8tOOhIACjQjBAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHSUEFjAUBggrBgEF\nBQcDAQYIKwYBBQUHAwIwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAgNHADBE\nAiBQ/AAwF8kG8VOmRSUTPakSSa/N4mqK2HsZuhQXCmiZHwIgZEzI5DCkpU7w3SIv\nOLO4Zsk1XrGZHGsmyiEyvYF9lpY=\n-----END CERTIFICATE-----\n","issuanceLifetime":"86400s","clockSkewAllowance":"20s","scheme":"linkerd.io/tls"},"autoInjectContext":null,"omitWebhookSideEffects":false,"clusterDomain":"cluster.local"}
proxy: |
{"proxyImage":{"imageName":"my.custom.registry/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"my.custom.registry/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxyInitImageVersion":"v1.3.1","debugImage":{"imageName":"my.custom.registry/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
{"proxyImage":{"imageName":"my.custom.registry/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"my.custom.registry/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxyInitImageVersion":"v1.3.2","debugImage":{"imageName":"my.custom.registry/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
install: |
{"cliVersion":"dev-undefined","flags":[{"name":"registry","value":"my.custom.registry/linkerd-io"}]}
---
@ -1119,7 +1119,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: my.custom.registry/linkerd-io/proxy-init:v1.3.1
image: my.custom.registry/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1338,7 +1338,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: my.custom.registry/linkerd-io/proxy-init:v1.3.1
image: my.custom.registry/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1554,7 +1554,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: my.custom.registry/linkerd-io/proxy-init:v1.3.1
image: my.custom.registry/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1818,7 +1818,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: my.custom.registry/linkerd-io/proxy-init:v1.3.1
image: my.custom.registry/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2168,7 +2168,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: my.custom.registry/linkerd-io/proxy-init:v1.3.1
image: my.custom.registry/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2443,7 +2443,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: my.custom.registry/linkerd-io/proxy-init:v1.3.1
image: my.custom.registry/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2647,7 +2647,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: my.custom.registry/linkerd-io/proxy-init:v1.3.1
image: my.custom.registry/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2881,7 +2881,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: my.custom.registry/linkerd-io/proxy-init:v1.3.1
image: my.custom.registry/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3103,7 +3103,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: my.custom.registry/linkerd-io/proxy-init:v1.3.1
image: my.custom.registry/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3476,7 +3476,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: my.custom.registry/linkerd-io/proxy-init:v1.3.1
image: my.custom.registry/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -915,7 +915,7 @@ data:
global: |
{"linkerdNamespace":"linkerd","cniEnabled":false,"version":"install-control-plane-version","identityContext":{"trustDomain":"cluster.local","trustAnchorsPem":"-----BEGIN CERTIFICATE-----\nMIIBYDCCAQegAwIBAgIBATAKBggqhkjOPQQDAjAYMRYwFAYDVQQDEw1jbHVzdGVy\nLmxvY2FsMB4XDTE5MDMwMzAxNTk1MloXDTI5MDIyODAyMDM1MlowGDEWMBQGA1UE\nAxMNY2x1c3Rlci5sb2NhbDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABAChpAt0\nxtgO9qbVtEtDK80N6iCL2Htyf2kIv2m5QkJ1y0TFQi5hTVe3wtspJ8YpZF0pl364\n6TiYeXB8tOOhIACjQjBAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHSUEFjAUBggrBgEF\nBQcDAQYIKwYBBQUHAwIwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAgNHADBE\nAiBQ/AAwF8kG8VOmRSUTPakSSa/N4mqK2HsZuhQXCmiZHwIgZEzI5DCkpU7w3SIv\nOLO4Zsk1XrGZHGsmyiEyvYF9lpY=\n-----END CERTIFICATE-----\n","issuanceLifetime":"86400s","clockSkewAllowance":"20s","scheme":"linkerd.io/tls"},"autoInjectContext":null,"omitWebhookSideEffects":false,"clusterDomain":"cluster.local"}
proxy: |
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxyInitImageVersion":"v1.3.1","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxyInitImageVersion":"v1.3.2","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
install: |
{"cliVersion":"dev-undefined","flags":[]}
---
@ -1119,7 +1119,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1338,7 +1338,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1554,7 +1554,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1818,7 +1818,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2168,7 +2168,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2443,7 +2443,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2647,7 +2647,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2881,7 +2881,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3103,7 +3103,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3476,7 +3476,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -915,7 +915,7 @@ data:
global: |
{"linkerdNamespace":"linkerd","cniEnabled":false,"version":"install-control-plane-version","identityContext":{"trustDomain":"cluster.local","trustAnchorsPem":"-----BEGIN CERTIFICATE-----\nMIIBYDCCAQegAwIBAgIBATAKBggqhkjOPQQDAjAYMRYwFAYDVQQDEw1jbHVzdGVy\nLmxvY2FsMB4XDTE5MDMwMzAxNTk1MloXDTI5MDIyODAyMDM1MlowGDEWMBQGA1UE\nAxMNY2x1c3Rlci5sb2NhbDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABAChpAt0\nxtgO9qbVtEtDK80N6iCL2Htyf2kIv2m5QkJ1y0TFQi5hTVe3wtspJ8YpZF0pl364\n6TiYeXB8tOOhIACjQjBAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHSUEFjAUBggrBgEF\nBQcDAQYIKwYBBQUHAwIwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAgNHADBE\nAiBQ/AAwF8kG8VOmRSUTPakSSa/N4mqK2HsZuhQXCmiZHwIgZEzI5DCkpU7w3SIv\nOLO4Zsk1XrGZHGsmyiEyvYF9lpY=\n-----END CERTIFICATE-----\n","issuanceLifetime":"86400s","clockSkewAllowance":"20s","scheme":"linkerd.io/tls"},"autoInjectContext":null,"omitWebhookSideEffects":false,"clusterDomain":"cluster.local"}
proxy: |
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"100m","requestMemory":"20Mi","limitCpu":"1","limitMemory":"250Mi"},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxyInitImageVersion":"v1.3.1","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"100m","requestMemory":"20Mi","limitCpu":"1","limitMemory":"250Mi"},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxyInitImageVersion":"v1.3.2","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
install: |
{"cliVersion":"dev-undefined","flags":[{"name":"ha","value":"true"}]}
---
@ -1152,7 +1152,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1404,7 +1404,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1653,7 +1653,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1937,7 +1937,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2300,7 +2300,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2588,7 +2588,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2825,7 +2825,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3092,7 +3092,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3347,7 +3347,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3746,7 +3746,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -915,7 +915,7 @@ data:
global: |
{"linkerdNamespace":"linkerd","cniEnabled":false,"version":"install-control-plane-version","identityContext":{"trustDomain":"cluster.local","trustAnchorsPem":"-----BEGIN CERTIFICATE-----\nMIIBYDCCAQegAwIBAgIBATAKBggqhkjOPQQDAjAYMRYwFAYDVQQDEw1jbHVzdGVy\nLmxvY2FsMB4XDTE5MDMwMzAxNTk1MloXDTI5MDIyODAyMDM1MlowGDEWMBQGA1UE\nAxMNY2x1c3Rlci5sb2NhbDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABAChpAt0\nxtgO9qbVtEtDK80N6iCL2Htyf2kIv2m5QkJ1y0TFQi5hTVe3wtspJ8YpZF0pl364\n6TiYeXB8tOOhIACjQjBAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHSUEFjAUBggrBgEF\nBQcDAQYIKwYBBQUHAwIwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAgNHADBE\nAiBQ/AAwF8kG8VOmRSUTPakSSa/N4mqK2HsZuhQXCmiZHwIgZEzI5DCkpU7w3SIv\nOLO4Zsk1XrGZHGsmyiEyvYF9lpY=\n-----END CERTIFICATE-----\n","issuanceLifetime":"86400s","clockSkewAllowance":"20s","scheme":"linkerd.io/tls"},"autoInjectContext":null,"omitWebhookSideEffects":false,"clusterDomain":"cluster.local"}
proxy: |
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"400m","requestMemory":"300Mi","limitCpu":"1","limitMemory":"250Mi"},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxyInitImageVersion":"v1.3.1","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"400m","requestMemory":"300Mi","limitCpu":"1","limitMemory":"250Mi"},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxyInitImageVersion":"v1.3.2","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
install: |
{"cliVersion":"dev-undefined","flags":[{"name":"ha","value":"true"},{"name":"controller-replicas","value":"2"},{"name":"proxy-cpu-request","value":"400m"},{"name":"proxy-memory-request","value":"300Mi"}]}
---
@ -1152,7 +1152,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1404,7 +1404,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1653,7 +1653,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1937,7 +1937,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2300,7 +2300,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2588,7 +2588,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2825,7 +2825,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3092,7 +3092,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3347,7 +3347,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3746,7 +3746,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

22
cli/cmd/testdata/install_heartbeat_disabled_output.golden vendored
View File

@ -871,7 +871,7 @@ data:
global: |
{"linkerdNamespace":"linkerd","cniEnabled":false,"version":"install-control-plane-version","identityContext":{"trustDomain":"cluster.local","trustAnchorsPem":"-----BEGIN CERTIFICATE-----\nMIIBYDCCAQegAwIBAgIBATAKBggqhkjOPQQDAjAYMRYwFAYDVQQDEw1jbHVzdGVy\nLmxvY2FsMB4XDTE5MDMwMzAxNTk1MloXDTI5MDIyODAyMDM1MlowGDEWMBQGA1UE\nAxMNY2x1c3Rlci5sb2NhbDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABAChpAt0\nxtgO9qbVtEtDK80N6iCL2Htyf2kIv2m5QkJ1y0TFQi5hTVe3wtspJ8YpZF0pl364\n6TiYeXB8tOOhIACjQjBAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHSUEFjAUBggrBgEF\nBQcDAQYIKwYBBQUHAwIwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAgNHADBE\nAiBQ/AAwF8kG8VOmRSUTPakSSa/N4mqK2HsZuhQXCmiZHwIgZEzI5DCkpU7w3SIv\nOLO4Zsk1XrGZHGsmyiEyvYF9lpY=\n-----END CERTIFICATE-----\n","issuanceLifetime":"86400s","clockSkewAllowance":"20s","scheme":"linkerd.io/tls"},"autoInjectContext":null,"omitWebhookSideEffects":false,"clusterDomain":"cluster.local"}
proxy: |
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxyInitImageVersion":"v1.3.1","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxyInitImageVersion":"v1.3.2","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
install: |
{"cliVersion":"dev-undefined","flags":[]}
---
@ -1075,7 +1075,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1294,7 +1294,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1510,7 +1510,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1730,7 +1730,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2080,7 +2080,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2355,7 +2355,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2559,7 +2559,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2793,7 +2793,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3015,7 +3015,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3388,7 +3388,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

2
cli/cmd/testdata/install_no_init_container.golden vendored
View File

@ -912,7 +912,7 @@ data:
global: |
{"linkerdNamespace":"linkerd","cniEnabled":true,"version":"install-control-plane-version","identityContext":{"trustDomain":"cluster.local","trustAnchorsPem":"-----BEGIN CERTIFICATE-----\nMIIBYDCCAQegAwIBAgIBATAKBggqhkjOPQQDAjAYMRYwFAYDVQQDEw1jbHVzdGVy\nLmxvY2FsMB4XDTE5MDMwMzAxNTk1MloXDTI5MDIyODAyMDM1MlowGDEWMBQGA1UE\nAxMNY2x1c3Rlci5sb2NhbDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABAChpAt0\nxtgO9qbVtEtDK80N6iCL2Htyf2kIv2m5QkJ1y0TFQi5hTVe3wtspJ8YpZF0pl364\n6TiYeXB8tOOhIACjQjBAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHSUEFjAUBggrBgEF\nBQcDAQYIKwYBBQUHAwIwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAgNHADBE\nAiBQ/AAwF8kG8VOmRSUTPakSSa/N4mqK2HsZuhQXCmiZHwIgZEzI5DCkpU7w3SIv\nOLO4Zsk1XrGZHGsmyiEyvYF9lpY=\n-----END CERTIFICATE-----\n","issuanceLifetime":"86400s","clockSkewAllowance":"20s","scheme":"linkerd.io/tls"},"autoInjectContext":null,"omitWebhookSideEffects":false,"clusterDomain":"cluster.local"}
proxy: |
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxyInitImageVersion":"v1.3.1","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxyInitImageVersion":"v1.3.2","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
install: |
{"cliVersion":"dev-undefined","flags":[{"name":"linkerd-cni-enabled","value":"true"}]}
---

22
cli/cmd/testdata/install_proxy_ignores.golden vendored
View File

@ -915,7 +915,7 @@ data:
global: |
{"linkerdNamespace":"linkerd","cniEnabled":false,"version":"install-control-plane-version","identityContext":{"trustDomain":"cluster.local","trustAnchorsPem":"-----BEGIN CERTIFICATE-----\nMIIBYDCCAQegAwIBAgIBATAKBggqhkjOPQQDAjAYMRYwFAYDVQQDEw1jbHVzdGVy\nLmxvY2FsMB4XDTE5MDMwMzAxNTk1MloXDTI5MDIyODAyMDM1MlowGDEWMBQGA1UE\nAxMNY2x1c3Rlci5sb2NhbDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABAChpAt0\nxtgO9qbVtEtDK80N6iCL2Htyf2kIv2m5QkJ1y0TFQi5hTVe3wtspJ8YpZF0pl364\n6TiYeXB8tOOhIACjQjBAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHSUEFjAUBggrBgEF\nBQcDAQYIKwYBBQUHAwIwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAgNHADBE\nAiBQ/AAwF8kG8VOmRSUTPakSSa/N4mqK2HsZuhQXCmiZHwIgZEzI5DCkpU7w3SIv\nOLO4Zsk1XrGZHGsmyiEyvYF9lpY=\n-----END CERTIFICATE-----\n","issuanceLifetime":"86400s","clockSkewAllowance":"20s","scheme":"linkerd.io/tls"},"autoInjectContext":null,"omitWebhookSideEffects":false,"clusterDomain":"cluster.local"}
proxy: |
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[{"portRange":"22"},{"portRange":"8100-8102"}],"ignoreOutboundPorts":[{"portRange":"5432"}],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxyInitImageVersion":"v1.3.1","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[{"portRange":"22"},{"portRange":"8100-8102"}],"ignoreOutboundPorts":[{"portRange":"5432"}],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxyInitImageVersion":"v1.3.2","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
install: |
{"cliVersion":"dev-undefined","flags":[]}
---
@ -1119,7 +1119,7 @@ spec:
- 4190,4191,22,8100-8102
- --outbound-ports-to-ignore
- 443,5432
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1338,7 +1338,7 @@ spec:
- 4190,4191,22,8100-8102
- --outbound-ports-to-ignore
- 443,5432
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1554,7 +1554,7 @@ spec:
- 4190,4191,22,8100-8102
- --outbound-ports-to-ignore
- 443,5432
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1818,7 +1818,7 @@ spec:
- 4190,4191,22,8100-8102
- --outbound-ports-to-ignore
- 443,5432
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2168,7 +2168,7 @@ spec:
- 4190,4191,22,8100-8102
- --outbound-ports-to-ignore
- 443,5432
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2443,7 +2443,7 @@ spec:
- 4190,4191,22,8100-8102
- --outbound-ports-to-ignore
- 443,5432
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2647,7 +2647,7 @@ spec:
- 4190,4191,22,8100-8102
- --outbound-ports-to-ignore
- 443,5432
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2881,7 +2881,7 @@ spec:
- 4190,4191,22,8100-8102
- --outbound-ports-to-ignore
- 443,5432
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3103,7 +3103,7 @@ spec:
- 4190,4191,22,8100-8102
- --outbound-ports-to-ignore
- 443,5432
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3476,7 +3476,7 @@ spec:
- 4190,4191,22,8100-8102
- --outbound-ports-to-ignore
- 443,5432
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

22
cli/cmd/testdata/install_restricted_dashboard.golden vendored
View File

@ -850,7 +850,7 @@ data:
global: |
{"linkerdNamespace":"linkerd","cniEnabled":false,"version":"install-control-plane-version","identityContext":{"trustDomain":"cluster.local","trustAnchorsPem":"-----BEGIN CERTIFICATE-----\nMIIBYDCCAQegAwIBAgIBATAKBggqhkjOPQQDAjAYMRYwFAYDVQQDEw1jbHVzdGVy\nLmxvY2FsMB4XDTE5MDMwMzAxNTk1MloXDTI5MDIyODAyMDM1MlowGDEWMBQGA1UE\nAxMNY2x1c3Rlci5sb2NhbDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABAChpAt0\nxtgO9qbVtEtDK80N6iCL2Htyf2kIv2m5QkJ1y0TFQi5hTVe3wtspJ8YpZF0pl364\n6TiYeXB8tOOhIACjQjBAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHSUEFjAUBggrBgEF\nBQcDAQYIKwYBBQUHAwIwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAgNHADBE\nAiBQ/AAwF8kG8VOmRSUTPakSSa/N4mqK2HsZuhQXCmiZHwIgZEzI5DCkpU7w3SIv\nOLO4Zsk1XrGZHGsmyiEyvYF9lpY=\n-----END CERTIFICATE-----\n","issuanceLifetime":"86400s","clockSkewAllowance":"20s","scheme":"linkerd.io/tls"},"autoInjectContext":null,"omitWebhookSideEffects":false,"clusterDomain":"cluster.local"}
proxy: |
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxyInitImageVersion":"v1.3.1","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxyInitImageVersion":"v1.3.2","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
install: |
{"cliVersion":"dev-undefined","flags":[]}
---
@ -1054,7 +1054,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1273,7 +1273,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1489,7 +1489,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1753,7 +1753,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2103,7 +2103,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2378,7 +2378,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2582,7 +2582,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2816,7 +2816,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3038,7 +3038,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3411,7 +3411,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

26
cli/cmd/testdata/install_tracing.golden vendored
View File

@ -915,7 +915,7 @@ data:
global: |
{"linkerdNamespace":"linkerd","cniEnabled":false,"version":"install-control-plane-version","identityContext":{"trustDomain":"cluster.local","trustAnchorsPem":"-----BEGIN CERTIFICATE-----\nMIIBYDCCAQegAwIBAgIBATAKBggqhkjOPQQDAjAYMRYwFAYDVQQDEw1jbHVzdGVy\nLmxvY2FsMB4XDTE5MDMwMzAxNTk1MloXDTI5MDIyODAyMDM1MlowGDEWMBQGA1UE\nAxMNY2x1c3Rlci5sb2NhbDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABAChpAt0\nxtgO9qbVtEtDK80N6iCL2Htyf2kIv2m5QkJ1y0TFQi5hTVe3wtspJ8YpZF0pl364\n6TiYeXB8tOOhIACjQjBAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHSUEFjAUBggrBgEF\nBQcDAQYIKwYBBQUHAwIwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAgNHADBE\nAiBQ/AAwF8kG8VOmRSUTPakSSa/N4mqK2HsZuhQXCmiZHwIgZEzI5DCkpU7w3SIv\nOLO4Zsk1XrGZHGsmyiEyvYF9lpY=\n-----END CERTIFICATE-----\n","issuanceLifetime":"86400s","clockSkewAllowance":"20s","scheme":"linkerd.io/tls"},"autoInjectContext":null,"omitWebhookSideEffects":false,"clusterDomain":"cluster.local"}
proxy: |
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxyInitImageVersion":"v1.3.1","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxyInitImageVersion":"v1.3.2","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
install: |
{"cliVersion":"dev-undefined","flags":[]}
---
@ -1119,7 +1119,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1338,7 +1338,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1554,7 +1554,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1818,7 +1818,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2168,7 +2168,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2443,7 +2443,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2647,7 +2647,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2881,7 +2881,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3103,7 +3103,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3476,7 +3476,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3806,7 +3806,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -4006,7 +4006,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

22
cli/cmd/testdata/upgrade_default.golden vendored
View File

@ -915,7 +915,7 @@ data:
global: |
{"linkerdNamespace":"linkerd","cniEnabled":false,"version":"UPGRADE-CONTROL-PLANE-VERSION","identityContext":{"trustDomain":"cluster.local","trustAnchorsPem":"-----BEGIN CERTIFICATE-----\nMIIBgzCCASmgAwIBAgIBATAKBggqhkjOPQQDAjApMScwJQYDVQQDEx5pZGVudGl0\neS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMTkwNDA0MjM1MzM3WhcNMjAwNDAz\nMjM1MzU3WjApMScwJQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9j\nYWwwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT+Sb5X4wi4XP0X3rJwMp23VBdg\nEMMU8EU+KG8UI2LmC5Vjg5RWLOW6BJjBmjXViKM+b+1/oKAeOg6FrJk8qyFlo0Iw\nQDAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC\nMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwIDSAAwRQIhAKUFG3sYOS++bakW\nYmJZU45iCdTLtaelMDSFiHoC9eBKAiBDWzzo+/CYLLmn33bAEn8pQnogP4Fx06aj\n+U9K4WlbzA==\n-----END CERTIFICATE-----\n","issuanceLifetime":"86400s","clockSkewAllowance":"20s","scheme":"linkerd.io/tls"},"autoInjectContext":null,"omitWebhookSideEffects":false,"clusterDomain":"cluster.local"}
proxy: |
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"UPGRADE-PROXY-VERSION","proxyInitImageVersion":"v1.3.1","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"UPGRADE-DEBUG-VERSION"}
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"UPGRADE-PROXY-VERSION","proxyInitImageVersion":"v1.3.2","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"UPGRADE-DEBUG-VERSION"}
install: |
{"cliVersion":"dev-undefined","flags":[]}
---
@ -1120,7 +1120,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1340,7 +1340,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1557,7 +1557,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1822,7 +1822,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2173,7 +2173,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2449,7 +2449,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2654,7 +2654,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2889,7 +2889,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3112,7 +3112,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3486,7 +3486,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

22
cli/cmd/testdata/upgrade_external_issuer.golden vendored
View File

@ -915,7 +915,7 @@ data:
global: |
{"linkerdNamespace":"linkerd","cniEnabled":false,"version":"UPGRADE-CONTROL-PLANE-VERSION","identityContext":{"trustDomain":"cluster.local","trustAnchorsPem":"-----BEGIN CERTIFICATE-----\nMIIBgzCCASmgAwIBAgIBATAKBggqhkjOPQQDAjApMScwJQYDVQQDEx5pZGVudGl0\neS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMTkwNDA0MjM1MzM3WhcNMjAwNDAz\nMjM1MzU3WjApMScwJQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9j\nYWwwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT+Sb5X4wi4XP0X3rJwMp23VBdg\nEMMU8EU+KG8UI2LmC5Vjg5RWLOW6BJjBmjXViKM+b+1/oKAeOg6FrJk8qyFlo0Iw\nQDAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC\nMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwIDSAAwRQIhAKUFG3sYOS++bakW\nYmJZU45iCdTLtaelMDSFiHoC9eBKAiBDWzzo+/CYLLmn33bAEn8pQnogP4Fx06aj\n+U9K4WlbzA==\n-----END CERTIFICATE-----\n","issuanceLifetime":"86400s","clockSkewAllowance":"20s","scheme":"kubernetes.io/tls"},"autoInjectContext":null,"omitWebhookSideEffects":false,"clusterDomain":"cluster.local"}
proxy: |
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"UPGRADE-PROXY-VERSION","proxyInitImageVersion":"v1.3.1","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"UPGRADE-DEBUG-VERSION"}
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"UPGRADE-PROXY-VERSION","proxyInitImageVersion":"v1.3.2","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"UPGRADE-DEBUG-VERSION"}
install: |
{"cliVersion":"dev-undefined","flags":[]}
---
@ -1106,7 +1106,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1326,7 +1326,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1543,7 +1543,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1808,7 +1808,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2159,7 +2159,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2435,7 +2435,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2640,7 +2640,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2875,7 +2875,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3098,7 +3098,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3472,7 +3472,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

22
cli/cmd/testdata/upgrade_ha.golden vendored
View File

@ -915,7 +915,7 @@ data:
global: |
{"linkerdNamespace":"linkerd","cniEnabled":false,"version":"UPGRADE-CONTROL-PLANE-VERSION","identityContext":{"trustDomain":"cluster.local","trustAnchorsPem":"-----BEGIN CERTIFICATE-----\nMIIBgzCCASmgAwIBAgIBATAKBggqhkjOPQQDAjApMScwJQYDVQQDEx5pZGVudGl0\neS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMTkwNDA0MjM1MzM3WhcNMjAwNDAz\nMjM1MzU3WjApMScwJQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9j\nYWwwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT+Sb5X4wi4XP0X3rJwMp23VBdg\nEMMU8EU+KG8UI2LmC5Vjg5RWLOW6BJjBmjXViKM+b+1/oKAeOg6FrJk8qyFlo0Iw\nQDAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC\nMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwIDSAAwRQIhAKUFG3sYOS++bakW\nYmJZU45iCdTLtaelMDSFiHoC9eBKAiBDWzzo+/CYLLmn33bAEn8pQnogP4Fx06aj\n+U9K4WlbzA==\n-----END CERTIFICATE-----\n","issuanceLifetime":"86400s","clockSkewAllowance":"20s","scheme":"linkerd.io/tls"},"autoInjectContext":null,"omitWebhookSideEffects":false,"clusterDomain":"cluster.local"}
proxy: |
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"100m","requestMemory":"20Mi","limitCpu":"1","limitMemory":"250Mi"},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"UPGRADE-PROXY-VERSION","proxyInitImageVersion":"v1.3.1","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"UPGRADE-DEBUG-VERSION"}
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"100m","requestMemory":"20Mi","limitCpu":"1","limitMemory":"250Mi"},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"UPGRADE-PROXY-VERSION","proxyInitImageVersion":"v1.3.2","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"UPGRADE-DEBUG-VERSION"}
install: |
{"cliVersion":"dev-undefined","flags":[{"name":"ha","value":"true"}]}
---
@ -1153,7 +1153,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1406,7 +1406,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1656,7 +1656,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1941,7 +1941,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2305,7 +2305,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2594,7 +2594,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2832,7 +2832,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3100,7 +3100,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3356,7 +3356,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3756,7 +3756,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

22
cli/cmd/testdata/upgrade_overwrite_issuer.golden vendored
View File

@ -915,7 +915,7 @@ data:
global: |
{"linkerdNamespace":"linkerd","cniEnabled":false,"version":"UPGRADE-CONTROL-PLANE-VERSION","identityContext":{"trustDomain":"cluster.local","trustAnchorsPem":"-----BEGIN CERTIFICATE-----\nMIIBYDCCAQegAwIBAgIBATAKBggqhkjOPQQDAjAYMRYwFAYDVQQDEw1jbHVzdGVy\nLmxvY2FsMB4XDTE5MDMwMzAxNTk1MloXDTI5MDIyODAyMDM1MlowGDEWMBQGA1UE\nAxMNY2x1c3Rlci5sb2NhbDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABAChpAt0\nxtgO9qbVtEtDK80N6iCL2Htyf2kIv2m5QkJ1y0TFQi5hTVe3wtspJ8YpZF0pl364\n6TiYeXB8tOOhIACjQjBAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHSUEFjAUBggrBgEF\nBQcDAQYIKwYBBQUHAwIwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAgNHADBE\nAiBQ/AAwF8kG8VOmRSUTPakSSa/N4mqK2HsZuhQXCmiZHwIgZEzI5DCkpU7w3SIv\nOLO4Zsk1XrGZHGsmyiEyvYF9lpY=\n-----END CERTIFICATE-----\n","issuanceLifetime":"86400s","clockSkewAllowance":"20s","scheme":"linkerd.io/tls"},"autoInjectContext":null,"omitWebhookSideEffects":false,"clusterDomain":"cluster.local"}
proxy: |
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"UPGRADE-PROXY-VERSION","proxyInitImageVersion":"v1.3.1","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"UPGRADE-DEBUG-VERSION"}
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"UPGRADE-PROXY-VERSION","proxyInitImageVersion":"v1.3.2","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"UPGRADE-DEBUG-VERSION"}
install: |
{"cliVersion":"dev-undefined","flags":[]}
---
@ -1119,7 +1119,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1338,7 +1338,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1554,7 +1554,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1818,7 +1818,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2168,7 +2168,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2443,7 +2443,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2647,7 +2647,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2881,7 +2881,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3103,7 +3103,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3476,7 +3476,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

22
cli/cmd/testdata/upgrade_overwrite_trust_anchors-external-issuer.golden vendored
View File

@ -915,7 +915,7 @@ data:
global: |
{"linkerdNamespace":"linkerd","cniEnabled":false,"version":"UPGRADE-CONTROL-PLANE-VERSION","identityContext":{"trustDomain":"cluster.local","trustAnchorsPem":"-----BEGIN CERTIFICATE-----\nMIIBYDCCAQegAwIBAgIBATAKBggqhkjOPQQDAjAYMRYwFAYDVQQDEw1jbHVzdGVy\nLmxvY2FsMB4XDTE5MDMwMzAxNTk1MloXDTI5MDIyODAyMDM1MlowGDEWMBQGA1UE\nAxMNY2x1c3Rlci5sb2NhbDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABAChpAt0\nxtgO9qbVtEtDK80N6iCL2Htyf2kIv2m5QkJ1y0TFQi5hTVe3wtspJ8YpZF0pl364\n6TiYeXB8tOOhIACjQjBAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHSUEFjAUBggrBgEF\nBQcDAQYIKwYBBQUHAwIwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAgNHADBE\nAiBQ/AAwF8kG8VOmRSUTPakSSa/N4mqK2HsZuhQXCmiZHwIgZEzI5DCkpU7w3SIv\nOLO4Zsk1XrGZHGsmyiEyvYF9lpY=\n-----END CERTIFICATE-----\n","issuanceLifetime":"86400s","clockSkewAllowance":"20s","scheme":"kubernetes.io/tls"},"autoInjectContext":null,"omitWebhookSideEffects":false,"clusterDomain":"cluster.local"}
proxy: |
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"UPGRADE-PROXY-VERSION","proxyInitImageVersion":"v1.3.1","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"UPGRADE-DEBUG-VERSION"}
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"UPGRADE-PROXY-VERSION","proxyInitImageVersion":"v1.3.2","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"UPGRADE-DEBUG-VERSION"}
install: |
{"cliVersion":"dev-undefined","flags":[]}
---
@ -1105,7 +1105,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1324,7 +1324,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1540,7 +1540,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1804,7 +1804,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2154,7 +2154,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2429,7 +2429,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2633,7 +2633,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2867,7 +2867,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3089,7 +3089,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3462,7 +3462,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

22
cli/cmd/testdata/upgrade_overwrite_trust_anchors.golden vendored
View File

@ -915,7 +915,7 @@ data:
global: |
{"linkerdNamespace":"linkerd","cniEnabled":false,"version":"UPGRADE-CONTROL-PLANE-VERSION","identityContext":{"trustDomain":"cluster.local","trustAnchorsPem":"-----BEGIN CERTIFICATE-----\nMIIBYDCCAQegAwIBAgIBATAKBggqhkjOPQQDAjAYMRYwFAYDVQQDEw1jbHVzdGVy\nLmxvY2FsMB4XDTE5MDMwMzAxNTk1MloXDTI5MDIyODAyMDM1MlowGDEWMBQGA1UE\nAxMNY2x1c3Rlci5sb2NhbDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABAChpAt0\nxtgO9qbVtEtDK80N6iCL2Htyf2kIv2m5QkJ1y0TFQi5hTVe3wtspJ8YpZF0pl364\n6TiYeXB8tOOhIACjQjBAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHSUEFjAUBggrBgEF\nBQcDAQYIKwYBBQUHAwIwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAgNHADBE\nAiBQ/AAwF8kG8VOmRSUTPakSSa/N4mqK2HsZuhQXCmiZHwIgZEzI5DCkpU7w3SIv\nOLO4Zsk1XrGZHGsmyiEyvYF9lpY=\n-----END CERTIFICATE-----\n","issuanceLifetime":"86400s","clockSkewAllowance":"20s","scheme":"linkerd.io/tls"},"autoInjectContext":null,"omitWebhookSideEffects":false,"clusterDomain":"cluster.local"}
proxy: |
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"UPGRADE-PROXY-VERSION","proxyInitImageVersion":"v1.3.1","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"UPGRADE-DEBUG-VERSION"}
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"UPGRADE-PROXY-VERSION","proxyInitImageVersion":"v1.3.2","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"UPGRADE-DEBUG-VERSION"}
install: |
{"cliVersion":"dev-undefined","flags":[]}
---
@ -1119,7 +1119,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1338,7 +1338,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1554,7 +1554,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1818,7 +1818,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2168,7 +2168,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2443,7 +2443,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2647,7 +2647,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2881,7 +2881,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3103,7 +3103,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -3476,7 +3476,7 @@ spec:
- 4190,4191
- --outbound-ports-to-ignore
- "443"
image: gcr.io/linkerd-io/proxy-init:v1.3.1
image: gcr.io/linkerd-io/proxy-init:v1.3.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

2
cni-plugin/Dockerfile
View File

@ -1,5 +1,5 @@
## compile cni-plugin utility
FROM gcr.io/linkerd-io/go-deps:d0918050 as golang
FROM gcr.io/linkerd-io/go-deps:6b9a8ea4 as golang
WORKDIR /linkerd-build
COPY pkg pkg
COPY controller controller

2
controller/Dockerfile
View File

@ -1,5 +1,5 @@
## compile controller service
FROM gcr.io/linkerd-io/go-deps:d0918050 as golang
FROM gcr.io/linkerd-io/go-deps:6b9a8ea4 as golang
WORKDIR /linkerd-build
COPY controller/gen controller/gen
COPY pkg pkg

2
controller/proxy-injector/fake/data/pod-with-debug.patch.json
View File

@ -38,7 +38,7 @@
"--inbound-ports-to-ignore",
"4190,4191"
],
"image": "gcr.io/linkerd-io/proxy-init:v1.3.1",
"image": "gcr.io/linkerd-io/proxy-init:v1.3.2",
"imagePullPolicy": "IfNotPresent",
"name": "linkerd-init",
"resources": {

2
controller/proxy-injector/fake/data/pod.patch.json
View File

@ -38,7 +38,7 @@
"--inbound-ports-to-ignore",
"4190,4191"
],
"image": "gcr.io/linkerd-io/proxy-init:v1.3.1",
"image": "gcr.io/linkerd-io/proxy-init:v1.3.2",
"imagePullPolicy": "IfNotPresent",
"name": "linkerd-init",
"resources": {

2
go.mod
View File

@ -32,7 +32,7 @@ require (
github.com/imdario/mergo v0.3.7
github.com/julienschmidt/httprouter v1.2.0
github.com/linkerd/linkerd2-proxy-api v0.1.10
github.com/linkerd/linkerd2-proxy-init v1.3.1
github.com/linkerd/linkerd2-proxy-init v1.3.2
github.com/mattn/go-isatty v0.0.9
github.com/mattn/go-runewidth v0.0.2
github.com/nsf/termbox-go v0.0.0-20180613055208-5c94acc5e6eb

2
go.sum
View File

@ -213,6 +213,8 @@ github.com/linkerd/linkerd2-proxy-api v0.1.10 h1:zGwz2Fek7fdfCxyZW7jq8IE6sexeVFW
github.com/linkerd/linkerd2-proxy-api v0.1.10/go.mod h1:2WJHEYXoww5ALM6c1QspRFiROGZg08tGxCO1js0tTVA=
github.com/linkerd/linkerd2-proxy-init v1.3.1 h1:KTvUvPlSKUkpzZM0L/EIk+EJaKk7dwygu0CP95fOyGI=
github.com/linkerd/linkerd2-proxy-init v1.3.1/go.mod h1:lK/sORPZDP6aFhPZps+AHMKphX5v9bKVDNESllz18C0=
github.com/linkerd/linkerd2-proxy-init v1.3.2 h1:bl+gwdBtHI0cki/urTyicxxb/ekQtVWJ6NDWzMXAgVs=
github.com/linkerd/linkerd2-proxy-init v1.3.2/go.mod h1:M6iaaLLi06ofuIV6x74SDknSFi7VS/MFqa5m+CwHgLY=
github.com/linkerd/stern v0.0.0-20190907020106-201e8ccdff9c h1:v8RmXOGO65HHLqcDpVNGGe3krA8FptfxcYS3wSS8bJU=
github.com/linkerd/stern v0.0.0-20190907020106-201e8ccdff9c/go.mod h1:aaP5eLMmFcyJUsZB6FwAO+0eILWeBKvupuHeeEuY0qQ=
github.com/linkerd/stern v0.0.0-20200316183041-1ab5375fb7e9 h1:xSfvUw8PVp+a+PBE8AYXiFjNcpE1p/KSpkza7KTm0F4=

4
pkg/healthcheck/healthcheck_test.go
View File

@ -2337,7 +2337,7 @@ data:
global: |
{"linkerdNamespace":"linkerd","cniEnabled":false,"version":"install-control-plane-version","identityContext":{"trustDomain":"cluster.local","trustAnchorsPem":"fake-trust-anchors-pem","issuanceLifetime":"86400s","clockSkewAllowance":"20s"}}
proxy: |
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxy_init_image_version":"v1.3.1","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxy_init_image_version":"v1.3.2","debugImage":{"imageName":"gcr.io/linkerd-io/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
install: |
{"cliVersion":"dev-undefined","flags":[]}`,
},
@ -2383,7 +2383,7 @@ data:
},
DisableExternalProfiles: true,
ProxyVersion: "install-proxy-version",
ProxyInitImageVersion: "v1.3.1",
ProxyInitImageVersion: "v1.3.2",
DebugImage: &configPb.Image{
ImageName: "gcr.io/linkerd-io/debug",
PullPolicy: "IfNotPresent",

2
pkg/version/version.go
View File

@ -16,7 +16,7 @@ var Version = undefinedVersion
// https://github.com/linkerd/linkerd2-proxy-init
// This has to be kept in sync with the constraint version for
// github.com/linkerd/linkerd2-proxy-init in /go.mod
var ProxyInitVersion = "v1.3.1"
var ProxyInitVersion = "v1.3.2"
const (
// undefinedVersion should take the form `channel-version` to conform to

2
web/Dockerfile
View File

@ -21,7 +21,7 @@ COPY web/app ./web/app
RUN ./bin/web build
## compile go server
FROM gcr.io/linkerd-io/go-deps:d0918050 as golang
FROM gcr.io/linkerd-io/go-deps:6b9a8ea4 as golang
WORKDIR /linkerd-build
RUN mkdir -p web
COPY web/main.go web