Skip to content

Commit 19a424c

Browse files
committed
chore(imagebuilder): canonical charts naming
1 parent 6b61956 commit 19a424c

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

.drone/drone.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ steps:
114114
- name: generate chart
115115
commands:
116116
- IMAGE_TAG=$([ ! -z $DRONE_TAG ] && echo ${DRONE_TAG:1} || echo \"canary\")
117-
- sed -i "s/image_tag:\ \"canary\"/image_tag:\ $IMAGE_TAG/g" charts/imagebuilder/values.yaml
117+
- sed -i "s/imageTag:\ \"canary\"/imageTag:\ $IMAGE_TAG/g" charts/imagebuilder/values.yaml
118118
- helm package charts/imagebuilder --version ${DRONE_TAG:-v1.0.0}
119119
- curl -u $CHARTMUSEUM_USERNAME:$CHARTMUSEUM_PASSWORD -F chart=@imagebuilder-${DRONE_TAG:-v1.0.0}.tgz "$CHARTMUSEUM_API/api/$([ -z $DRONE_TAG ] && echo testing || echo stable)/charts"
120120
environment:

charts/imagebuilder/templates/imagebuilder-configmap.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ data:
99
[
1010
{
1111
"name": "container",
12-
"image": "{{.Values.image_registry}}/{{.Values.image_org}}/imagebuilder:{{.Values.image_tag}}"
12+
"image": "{{.Values.imageRegistry}}/{{.Values.imageOrg}}/imagebuilder:{{.Values.imageTag}}"
1313
},
1414
{
1515
"name": "buildpack",
16-
"image": "{{.Values.image_registry}}/{{.Values.image_org}}/imagebuilder:{{.Values.image_tag}}"
16+
"image": "{{.Values.imageRegistry}}/{{.Values.imageOrg}}/imagebuilder:{{.Values.imageTag}}"
1717
}
1818
]
1919
registries.conf: |
20-
{{- .Values.container_registries | nindent 4 }}
21-
image_pull_policy: {{ .Values.image_pull_policy }}
20+
{{- .Values.containerRegistries | nindent 4 }}
21+
imagePullPolicy: {{ .Values.imagePullPolicy }}

charts/imagebuilder/values.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
image_org: "drycc"
2-
image_pull_policy: "Always"
3-
image_tag: "canary"
4-
image_registry: "docker.io"
5-
container_registries: |
1+
imageOrg: "drycc"
2+
imagePullPolicy: "Always"
3+
imageTag: "canary"
4+
imageRegistry: "docker.io"
5+
containerRegistries: |
66
unqualified-search-registries = ["docker.io"]
77
short-name-mode="permissive"

0 commit comments

Comments
 (0)