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

remove grafana.image.version field (#4571) 

Signed-off-by: Tarun Pothulapati <tarunpothulapati@outlook.com>
This commit is contained in:
Tarun Pothulapati 2020-06-08 22:15:30 +00:00 committed by GitHub
parent ebb9cfe492
commit 4aa3ca7f87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
36 changed files with 7 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/add-ons/grafana/templates/grafana.yaml
View File

@ -121,7 +121,7 @@ spec:
- env:
- name: GF_PATHS_DATA
value: /data
image: {{.Values.image.name}}:{{default .Values.global.controllerImageVersion .Values.image.version}}
image: {{.Values.image.name}}:{{default .Values.global.linkerdVersion .Values.global.controllerImageVersion}}
imagePullPolicy: {{.Values.global.imagePullPolicy}}
livenessProbe:
httpGet:

1
charts/linkerd2/values.yaml
View File

@ -217,7 +217,6 @@ grafana:
name: linkerd-grafana
image:
name: gcr.io/linkerd-io/grafana
version: *linkerd_version
# resources:
tracing:

1
cli/cmd/install.go
View File

@ -763,7 +763,6 @@ func (options *installOptions) buildValuesWithoutIdentity(configs *pb.All) (*l5d
installValues.Global.HighAvailability = options.highAvailability
installValues.Global.ImagePullPolicy = options.imagePullPolicy
installValues.Grafana["image"].(map[string]interface{})["name"] = fmt.Sprintf("%s/grafana", options.dockerRegistry)
installValues.Grafana["image"].(map[string]interface{})["version"] = options.controlPlaneVersion
if options.prometheusImage != "" {
installValues.PrometheusImage = options.prometheusImage
}

1
cli/cmd/testdata/install_addon_control-plane.golden vendored
View File

@ -2015,7 +2015,6 @@ data:
enabled: true
image:
name: gcr.io/linkerd-io/grafana
version: install-control-plane-version
name: linkerd-grafana
tracing:
collector:

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

@ -2014,7 +2014,6 @@ data:
enabled: true
image:
name: gcr.io/linkerd-io/grafana
version: install-control-plane-version
name: linkerd-grafana
tracing:
enabled: false

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

@ -2958,7 +2958,6 @@ data:
enabled: true
image:
name: gcr.io/linkerd-io/grafana
version: install-control-plane-version
name: linkerd-grafana
tracing:
enabled: false

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

@ -2841,7 +2841,6 @@ data:
enabled: true
image:
name: my.custom.registry/linkerd-io/grafana
version: install-control-plane-version
name: linkerd-grafana
tracing:
enabled: false

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

@ -2841,7 +2841,6 @@ data:
enabled: true
image:
name: gcr.io/linkerd-io/grafana
version: install-control-plane-version
name: linkerd-grafana
tracing:
enabled: false

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

@ -3090,7 +3090,6 @@ data:
enabled: true
image:
name: gcr.io/linkerd-io/grafana
version: install-control-plane-version
name: linkerd-grafana
resources:
cpu:

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

@ -3090,7 +3090,6 @@ data:
enabled: true
image:
name: gcr.io/linkerd-io/grafana
version: install-control-plane-version
name: linkerd-grafana
resources:
cpu:

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

@ -2752,7 +2752,6 @@ data:
enabled: true
image:
name: gcr.io/linkerd-io/grafana
version: install-control-plane-version
name: linkerd-grafana
tracing:
enabled: false

3
cli/cmd/testdata/install_helm_output.golden vendored
View File

@ -2882,7 +2882,6 @@ data:
enabled: true
image:
name: gcr.io/linkerd-io/grafana
version: linkerdVersionValue
name: linkerd-grafana
tracing:
enabled: false
@ -3025,7 +3024,7 @@ spec:
- env:
- name: GF_PATHS_DATA
value: /data
image: gcr.io/linkerd-io/grafana:linkerdVersionValue
image: gcr.io/linkerd-io/grafana:linkerd-version
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:

3
cli/cmd/testdata/install_helm_output_addons.golden vendored
View File

@ -2883,7 +2883,6 @@ data:
enabled: true
image:
name: gcr.io/linkerd-io/grafana
version: linkerdVersionValue
name: linkerd-grafana
tracing:
collector:
@ -3495,7 +3494,7 @@ spec:
- env:
- name: GF_PATHS_DATA
value: /data
image: gcr.io/linkerd-io/grafana:linkerdVersionValue
image: gcr.io/linkerd-io/grafana:linkerd-version
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:

3
cli/cmd/testdata/install_helm_output_ha.golden vendored
View File

@ -3131,7 +3131,6 @@ data:
enabled: true
image:
name: gcr.io/linkerd-io/grafana
version: linkerdVersionValue
name: linkerd-grafana
resources:
cpu:
@ -3281,7 +3280,7 @@ spec:
- env:
- name: GF_PATHS_DATA
value: /data
image: gcr.io/linkerd-io/grafana:linkerdVersionValue
image: gcr.io/linkerd-io/grafana:linkerd-version
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:

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

@ -2574,7 +2574,6 @@ data:
enabled: true
image:
name: gcr.io/linkerd-io/grafana
version: install-control-plane-version
name: linkerd-grafana
tracing:
enabled: false

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

@ -2833,7 +2833,6 @@ data:
enabled: true
image:
name: gcr.io/linkerd-io/grafana
version: install-control-plane-version
name: linkerd-grafana
tracing:
enabled: false
@ -2972,7 +2971,7 @@ spec:
- env:
- name: GF_PATHS_DATA
value: /data
image: gcr.io/linkerd-io/grafana:install-control-plane-version
image: gcr.io/linkerd-io/grafana:ControllerImageVersion
imagePullPolicy: ImagePullPolicy
livenessProbe:
httpGet:

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

@ -2841,7 +2841,6 @@ data:
enabled: true
image:
name: gcr.io/linkerd-io/grafana
version: install-control-plane-version
name: linkerd-grafana
tracing:
enabled: false

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

@ -2776,7 +2776,6 @@ data:
enabled: true
image:
name: gcr.io/linkerd-io/grafana
version: install-control-plane-version
name: linkerd-grafana
tracing:
enabled: false

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

@ -2842,7 +2842,6 @@ data:
enabled: true
image:
name: gcr.io/linkerd-io/grafana
version: install-control-plane-version
name: linkerd-grafana
tracing:
collector:

1
cli/cmd/testdata/install_tracing_overwrite.golden vendored
View File

@ -2842,7 +2842,6 @@ data:
enabled: true
image:
name: gcr.io/linkerd-io/grafana
version: install-control-plane-version
name: linkerd-grafana
tracing:
collector:

1
cli/cmd/testdata/upgrade_add-on_controlplane.golden vendored
View File

@ -2031,7 +2031,6 @@ data:
enabled: true
image:
name: gcr.io/linkerd-io/grafana
version: UPGRADE-CONTROL-PLANE-VERSION
name: linkerd-grafana
tracing:
collector:

1
cli/cmd/testdata/upgrade_add-on_overwrite.golden vendored
View File

@ -2858,7 +2858,6 @@ data:
enabled: true
image:
name: gcr.io/linkerd-io/grafana
version: UPGRADE-CONTROL-PLANE-VERSION
name: linkerd-grafana
tracing:
collector:

1
cli/cmd/testdata/upgrade_add_add-on.golden vendored
View File

@ -2858,7 +2858,6 @@ data:
enabled: true
image:
name: gcr.io/linkerd-io/grafana
version: UPGRADE-CONTROL-PLANE-VERSION
name: linkerd-grafana
tracing:
collector:

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

@ -2857,7 +2857,6 @@ data:
enabled: true
image:
name: gcr.io/linkerd-io/grafana
version: UPGRADE-CONTROL-PLANE-VERSION
name: linkerd-grafana
tracing:
enabled: false

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

@ -2843,7 +2843,6 @@ data:
enabled: true
image:
name: gcr.io/linkerd-io/grafana
version: UPGRADE-CONTROL-PLANE-VERSION
name: linkerd-grafana
tracing:
enabled: false

1
cli/cmd/testdata/upgrade_grafana_addon_overwrite.yaml vendored
View File

@ -2857,7 +2857,6 @@ data:
enabled: true
image:
name: gcr.io/linkerd-io/grafana
version: UPGRADE-CONTROL-PLANE-VERSION
name: linkerd-grafana
tracing:
enabled: false

1
cli/cmd/testdata/upgrade_grafana_enabled.yaml vendored
View File

@ -2857,7 +2857,6 @@ data:
enabled: true
image:
name: gcr.io/linkerd-io/grafana
version: UPGRADE-CONTROL-PLANE-VERSION
name: linkerd-grafana
tracing:
enabled: false

1
cli/cmd/testdata/upgrade_grafana_overwrite.yaml vendored
View File

@ -2857,7 +2857,6 @@ data:
enabled: true
image:
name: linkerd-image-overwrite
version: UPGRADE-CONTROL-PLANE-VERSION
name: linkerd-grafana-overwrite
tracing:
enabled: false

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

@ -3106,7 +3106,6 @@ data:
enabled: true
image:
name: gcr.io/linkerd-io/grafana
version: UPGRADE-CONTROL-PLANE-VERSION
name: linkerd-grafana
resources:
cpu:

1
cli/cmd/testdata/upgrade_keep_webhook_cabundle.golden vendored
View File

@ -2857,7 +2857,6 @@ data:
enabled: true
image:
name: gcr.io/linkerd-io/grafana
version: UPGRADE-CONTROL-PLANE-VERSION
name: linkerd-grafana
tracing:
enabled: false

1
cli/cmd/testdata/upgrade_nothing_addon.yaml vendored
View File

@ -2857,7 +2857,6 @@ data:
enabled: true
image:
name: gcr.io/linkerd-io/grafana
version: UPGRADE-CONTROL-PLANE-VERSION
name: linkerd-grafana
tracing:
enabled: false

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

@ -2841,7 +2841,6 @@ data:
enabled: true
image:
name: gcr.io/linkerd-io/grafana
version: UPGRADE-CONTROL-PLANE-VERSION
name: linkerd-grafana
tracing:
enabled: false

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

@ -2827,7 +2827,6 @@ data:
enabled: true
image:
name: gcr.io/linkerd-io/grafana
version: UPGRADE-CONTROL-PLANE-VERSION
name: linkerd-grafana
tracing:
enabled: false

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

@ -2841,7 +2841,6 @@ data:
enabled: true
image:
name: gcr.io/linkerd-io/grafana
version: UPGRADE-CONTROL-PLANE-VERSION
name: linkerd-grafana
tracing:
enabled: false

1
cli/cmd/testdata/upgrade_two_level_webhook_cert.golden vendored
View File

@ -2857,7 +2857,6 @@ data:
enabled: true
image:
name: gcr.io/linkerd-io/grafana
version: UPGRADE-CONTROL-PLANE-VERSION
name: linkerd-grafana
tracing:
enabled: false

8
pkg/charts/linkerd2/values_test.go
View File

@ -135,8 +135,7 @@ func TestNewValues(t *testing.T) {
"enabled": true,
"name": "linkerd-grafana",
"image": map[string]interface{}{
"name": "gcr.io/linkerd-io/grafana",
"version": testVersion,
"name": "gcr.io/linkerd-io/grafana",
},
},
}
@ -148,7 +147,6 @@ func TestNewValues(t *testing.T) {
actual.Global.Proxy.Image.Version = testVersion
actual.Global.ProxyInit.Image.Version = testVersion
actual.DebugContainer.Image.Version = testVersion
actual.Grafana["image"].(map[string]interface{})["version"] = testVersion
// Make Add-On Values nil to not have to check for their defaults
actual.Tracing = nil
@ -195,8 +193,7 @@ func TestNewValues(t *testing.T) {
"enabled": true,
"name": "linkerd-grafana",
"image": map[string]interface{}{
"name": "gcr.io/linkerd-io/grafana",
"version": testVersion,
"name": "gcr.io/linkerd-io/grafana",
},
"resources": map[string]interface{}{
"cpu": map[string]interface{}{
@ -250,7 +247,6 @@ func TestNewValues(t *testing.T) {
actual.Global.Proxy.Image.Version = testVersion
actual.Global.ProxyInit.Image.Version = testVersion
actual.DebugContainer.Image.Version = testVersion
actual.Grafana["image"].(map[string]interface{})["version"] = testVersion
// Make Add-On Values nil to not have to check for their defaults
actual.Tracing = nil