Skip to content

Commit

Permalink
Merge pull request #16 from dasmeta/DMVP-435-additions
Browse files Browse the repository at this point in the history
Added new configs to deployment.yaml template.
  • Loading branch information
mrdntgrn authored Feb 14, 2022
2 parents 3d10b67 + 7982c56 commit 0075d5a
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 8 deletions.
4 changes: 2 additions & 2 deletions charts/base/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.18
version: 0.1.19

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "0.1.18"
appVersion: "0.1.19"
12 changes: 6 additions & 6 deletions charts/base/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
```
dependencies:
- name: base
version: 0.1.18
version: 0.1.19
repository: https://dasmeta.github.io/helm
```

Expand Down Expand Up @@ -94,9 +94,9 @@ Here are 2 examples about this:
**Alias is not specified, name, version and appVersion are not overridden by parent chart**
In this case, labels will be like this:**

- `helm.sh/chart: base-0.1.18`
- `helm.sh/chart: base-0.1.19`
- `app.kubernetes.io/name: base`
- `app.kubernetes.io/version: 0.1.18`
- `app.kubernetes.io/version: 0.1.19`

Chart.yaml
```
Expand All @@ -109,7 +109,7 @@ appVersion: "0.1.0"
dependencies:
- name: base
version: 0.1.18
version: 0.1.19
repository: https://dasmeta.github.io/helm
```

Expand Down Expand Up @@ -145,7 +145,7 @@ appVersion: "0.1.0"
dependencies:
- name: base
version: 0.1.18
version: 0.1.19
repository: https://dasmeta.github.io/helm
alias: my-app-base
```
Expand Down Expand Up @@ -173,7 +173,7 @@ appVersion: "0.1.0"
dependencies:
- name: base
version: 0.1.18
version: 0.1.19
repository: https://dasmeta.github.io/helm
```

Expand Down
10 changes: 10 additions & 0 deletions charts/base/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,22 @@ metadata:
labels:
{{- include "base.labels" . | nindent 4 }}
spec:
{{- if .Values.deployment.minReadySeconds}}
minReadySeconds: {{ .Values.deployment.minReadySeconds }}
{{- end }}
{{- if .Values.deployment.revisionHistoryLimit}}
revisionHistoryLimit: {{ .Values.deployment.revisionHistoryLimit }}
{{- end }}
{{- if not .Values.autoscaling.enabled }}
replicas: {{ .Values.replicaCount }}
{{- end }}
selector:
matchLabels:
{{- include "base.selectorLabels" . | nindent 6 }}
{{- if .Values.deployment.strategy }}
strategy:
{{- toYaml .Values.strategy | nindent 12 }}
{{- end }}
template:
metadata:
annotations:
Expand Down

0 comments on commit 0075d5a

Please sign in to comment.