Skip to content

Commit c5c0018

Browse files
authored
add defaultTagPrefix per service (#295)
* add defautlTagPrefix per service * add unit test and changelog entry * fix test * fix test
1 parent 8f71143 commit c5c0018

File tree

3 files changed

+30
-1
lines changed

3 files changed

+30
-1
lines changed

charts/sourcegraph/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Use `**BREAKING**:` to denote a breaking change
99

1010
## Unreleased
1111

12+
- Add defaultTagPrefix per service
13+
1214
## 5.0.5
1315

1416
- Add support for PodDisruptionBudget in frontend

charts/sourcegraph/templates/_helpers.tpl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,10 @@ useGlobalTagAsDefault configuration
100100
{{- $service := index . 1 }}
101101
{{- $imageName := (index $top.Values $service "image" "name")}}
102102
{{- $defaultTag := (index $top.Values $service "image" "defaultTag")}}
103+
{{- $defaultTagPrefix := (index $top.Values $service "image" "defaultTagPrefix")}}
103104
{{- if $top.Values.sourcegraph.image.useGlobalTagAsDefault }}{{ $defaultTag = (tpl $top.Values.sourcegraph.image.defaultTag $top) }}{{ end }}
104105

105-
{{- $top.Values.sourcegraph.image.repository }}/{{ $imageName }}:{{ default $defaultTag (index $top.Values $service "image" "tag") }}
106+
{{- $top.Values.sourcegraph.image.repository }}/{{ $imageName }}:{{ $defaultTagPrefix }}{{ default $defaultTag (index $top.Values $service "image" "tag") }}
106107
{{- end }}
107108

108109
{{- define "sourcegraph.nodeSelector" -}}
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
suite: defaultTagPrefix
2+
release:
3+
name: sourcegraph
4+
namespace: sourcegraph
5+
tests:
6+
- it: should not add defaultTagPrefix
7+
template: frontend/sourcegraph-frontend.Deployment.yaml
8+
set:
9+
frontend:
10+
image:
11+
defaultTag: test
12+
asserts:
13+
- equal:
14+
path: spec.template.spec.containers[0].image
15+
value: "index.docker.io/sourcegraph/frontend:test"
16+
- it: should add defaultTagPrefix
17+
template: frontend/sourcegraph-frontend.Deployment.yaml
18+
set:
19+
frontend:
20+
image:
21+
defaultTag: test
22+
defaultTagPrefix: "prefix-"
23+
asserts:
24+
- equal:
25+
path: spec.template.spec.containers[0].image
26+
value: "index.docker.io/sourcegraph/frontend:prefix-test"

0 commit comments

Comments
 (0)