Skip to content

Commit

Permalink
Merge branch 'main' into helm-templates
Browse files Browse the repository at this point in the history
# Conflicts:
#	.gitignore
  • Loading branch information
kalinon committed Jun 10, 2021
2 parents 2d5b160 + e178ff8 commit 3c2a58e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
.ci
**/charts/*.tgz
4 changes: 2 additions & 2 deletions ndustrial/common/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ sources:
- https://ndustrial.io/
type: library
# Please make sure that version and appVersion are always the same.
version: 0.1.1
appVersion: 0.1.1
version: 0.1.2
appVersion: 0.1.2
1 change: 0 additions & 1 deletion ndustrial/common/templates/_labels.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ helm.sh/chart: {{ include "common.names.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
ndustrial.io/app: {{ .Values.ndustrial.name }}
ndustrial.io/image.tag: {{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global) }}
ndustrial.io/organization.slug: {{ .Values.ndustrial.organization }}
ndustrial.io/owner: {{ .Values.ndustrial.owner }}
{{- if .Values.contxt.stackId -}}
Expand Down

0 comments on commit 3c2a58e

Please sign in to comment.