Skip to content

Make annotations on demo-apps configurable #467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
J12934 merged 1 commit into from
Jun 3, 2021
Merged

Make annotations on demo-apps configurable #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions demo-apps/bodgeit/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ BodgeIt Store is a serverside rendering based html website without any heavy jav
| Key | Type | Default | Description |
|-----|------|---------|-------------|
| affinity | object | `{}` | |
| annotations | object | `{}` | add annotations to the deployment, service and pods |
| fullnameOverride | string | `""` | |
| image.pullPolicy | string | `"IfNotPresent"` | |
| image.repository | string | `"docker.io/psiinon/bodgeit"` | Container Image containing the bodgeit |
Expand All @@ -36,6 +37,7 @@ BodgeIt Store is a serverside rendering based html website without any heavy jav
| ingress.hosts[0].host | string | `"chart-example.local"` | |
| ingress.hosts[0].paths | list | `[]` | |
| ingress.tls | list | `[]` | |
| labels | object | `{}` | add labels to the deployment, service and pods |
| nameOverride | string | `""` | |
| nodeSelector | object | `{}` | |
| podSecurityContext | object | `{}` | |
Expand Down
7 changes: 7 additions & 0 deletions demo-apps/bodgeit/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ helm.sh/chart: {{ include "bodgeit.chart" . }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- if .Values.labels }}
{{ .Values.labels | toYaml }}
{{- end }}
{{- end -}}

{{/*
Expand All @@ -66,3 +69,7 @@ Create the name of the service account to use
{{ default "default" .Values.serviceAccount.name }}
{{- end -}}
{{- end -}}

{{- define "bodgeit.annotations" -}}
{{ .Values.annotations | toYaml }}
{{- end -}}
4 changes: 4 additions & 0 deletions demo-apps/bodgeit/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ metadata:
name: {{ include "bodgeit.fullname" . }}
labels:
{{- include "bodgeit.labels" . | nindent 4 }}
annotations:
{{- include "bodgeit.annotations" . | nindent 4 }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
Expand All @@ -17,6 +19,8 @@ spec:
metadata:
labels:
{{- include "bodgeit.selectorLabels" . | nindent 8 }}
annotations:
{{- include "bodgeit.annotations" . | nindent 8 }}
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
Expand Down
2 changes: 2 additions & 0 deletions demo-apps/bodgeit/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ metadata:
name: {{ include "bodgeit.fullname" . }}
labels:
{{- include "bodgeit.labels" . | nindent 4 }}
annotations:
{{- include "bodgeit.annotations" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
ports:
Expand Down
6 changes: 6 additions & 0 deletions demo-apps/bodgeit/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""

# -- add labels to the deployment, service and pods
labels: {}

# -- add annotations to the deployment, service and pods
annotations: {}

podSecurityContext: {}
# fsGroup: 2000

Expand Down
2 changes: 2 additions & 0 deletions demo-apps/dummy-ssh/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ Port 22: Username root, Password: THEPASSWORDYOUCREATED
| Key | Type | Default | Description |
|-----|------|---------|-------------|
| affinity | object | `{}` | |
| annotations | object | `{}` | add annotations to the deployment, service and pods |
| fullnameOverride | string | `""` | |
| image.pullPolicy | string | `"IfNotPresent"` | |
| image.repository | string | `"docker.io/securecodebox/dummy-ssh"` | Container Image |
| image.tag | string | defaults to the appVersion | The image tag |
| imagePullSecrets | list | `[]` | |
| labels | object | `{}` | add labels to the deployment, service and pods |
| nameOverride | string | `""` | |
| nodeSelector | object | `{}` | |
| podSecurityContext | object | `{}` | |
Expand Down
7 changes: 7 additions & 0 deletions demo-apps/dummy-ssh/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ helm.sh/chart: {{ include "dummy-ssh.chart" . }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- if .Values.labels }}
{{ .Values.labels | toYaml }}
{{- end }}
{{- end -}}

{{/*
Expand All @@ -55,3 +58,7 @@ Selector labels
app.kubernetes.io/name: {{ include "dummy-ssh.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}}

{{- define "dummy-ssh.annotations" -}}
{{ .Values.annotations | toYaml }}
{{- end -}}
4 changes: 4 additions & 0 deletions demo-apps/dummy-ssh/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ metadata:
name: {{ include "dummy-ssh.fullname" . }}
labels:
{{- include "dummy-ssh.labels" . | nindent 4 }}
annotations:
{{- include "dummy-ssh.annotations" . | nindent 4 }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
Expand All @@ -17,6 +19,8 @@ spec:
metadata:
labels:
{{- include "dummy-ssh.selectorLabels" . | nindent 8 }}
annotations:
{{- include "dummy-ssh.annotations" . | nindent 8 }}
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
Expand Down
2 changes: 2 additions & 0 deletions demo-apps/dummy-ssh/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ metadata:
name: {{ include "dummy-ssh.fullname" . }}
labels:
{{- include "dummy-ssh.labels" . | nindent 4 }}
annotations:
{{- include "dummy-ssh.annotations" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
ports:
Expand Down
6 changes: 6 additions & 0 deletions demo-apps/dummy-ssh/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""

# -- add labels to the deployment, service and pods
labels: {}

# -- add annotations to the deployment, service and pods
annotations: {}

podSecurityContext: {}
# fsGroup: 2000

Expand Down
4 changes: 3 additions & 1 deletion demo-apps/http-webhook/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ A Dummy webserver to echo HTTP requests in log
| Key | Type | Default | Description |
|-----|------|---------|-------------|
| affinity | object | `{}` | |
| annotations | object | `{}` | add annotations to the deployment, service and pods |
| autoscaling.enabled | bool | `false` | |
| autoscaling.maxReplicas | int | `100` | |
| autoscaling.minReplicas | int | `1` | |
Expand All @@ -36,9 +37,10 @@ A Dummy webserver to echo HTTP requests in log
| ingress.hosts[0].host | string | `"chart-example.local"` | |
| ingress.hosts[0].paths | list | `[]` | |
| ingress.tls | list | `[]` | |
| labels | object | `{}` | add labels to the deployment, service and pods |
| nameOverride | string | `""` | |
| nodeSelector | object | `{}` | |
| podAnnotations | object | `{}` | |
| podAnnotations | object | `{}` | deprecated. use `labels` instead. Will be removed in v3. todo(@J12934) remove podAnnotations in v3 |
| podSecurityContext | object | `{}` | |
| replicaCount | int | `1` | |
| resources | object | `{}` | |
Expand Down
7 changes: 7 additions & 0 deletions demo-apps/http-webhook/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ helm.sh/chart: {{ include "http-webhook.chart" . }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- if .Values.labels }}
{{ .Values.labels | toYaml }}
{{- end }}
{{- end }}

{{/*
Expand All @@ -66,3 +69,7 @@ Create the name of the service account to use
{{- default "default" .Values.serviceAccount.name }}
{{- end }}
{{- end }}

{{- define "http-webhook.annotations" -}}
{{ .Values.annotations | toYaml }}
{{- end -}}
12 changes: 10 additions & 2 deletions demo-apps/http-webhook/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ metadata:
name: {{ include "http-webhook.fullname" . }}
labels:
{{- include "http-webhook.labels" . | nindent 4 }}
annotations:
{{- include "http-webhook.annotations" . | nindent 4 }}
spec:
{{- if not .Values.autoscaling.enabled }}
replicas: {{ .Values.replicaCount }}
Expand All @@ -17,12 +19,18 @@ spec:
{{- include "http-webhook.selectorLabels" . | nindent 6 }}
template:
metadata:
labels:
{{- include "http-webhook.selectorLabels" . | nindent 8 }}
{{/* todo(@J12934) remove podAnnotations in v3, and migrate this to look like the other demo app deployments */}}
{{- if .Values.annotations }}
annotations:
{{- include "http-webhook.annotations" . | nindent 8 }}
{{- else }}
{{- with .Values.podAnnotations }}
annotations:
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
{{- include "http-webhook.selectorLabels" . | nindent 8 }}
{{- end }}
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
Expand Down
2 changes: 2 additions & 0 deletions demo-apps/http-webhook/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ metadata:
name: {{ include "http-webhook.fullname" . }}
labels:
{{- include "http-webhook.labels" . | nindent 4 }}
annotations:
{{- include "http-webhook.annotations" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
ports:
Expand Down
7 changes: 7 additions & 0 deletions demo-apps/http-webhook/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""

# -- add labels to the deployment, service and pods
labels: {}

# -- add annotations to the deployment, service and pods
annotations: {}

serviceAccount:
# Specifies whether a service account should be created
create: true
Expand All @@ -29,6 +35,7 @@ serviceAccount:
# If not set and create is true, a name is generated using the fullname template
name: ""

# -- deprecated. use `labels` instead. Will be removed in v3. todo(@J12934) remove podAnnotations in v3
podAnnotations: {}

podSecurityContext: {}
Expand Down
2 changes: 2 additions & 0 deletions demo-apps/juice-shop/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ OWASP Juice Shop: Probably the most modern and sophisticated insecure web applic
| Key | Type | Default | Description |
|-----|------|---------|-------------|
| affinity | object | `{}` | |
| annotations | object | `{}` | add annotations to the deployment, service and pods |
| fullnameOverride | string | `""` | |
| image.pullPolicy | string | `"IfNotPresent"` | |
| image.repository | string | `"docker.io/bkimminich/juice-shop"` | Container Image containing the juice-shop |
Expand All @@ -32,6 +33,7 @@ OWASP Juice Shop: Probably the most modern and sophisticated insecure web applic
| ingress.hosts[0].host | string | `"chart-example.local"` | |
| ingress.hosts[0].paths | list | `[]` | |
| ingress.tls | list | `[]` | |
| labels | object | `{}` | add labels to the deployment, service and pods |
| nameOverride | string | `""` | |
| nodeSelector | object | `{}` | |
| podSecurityContext | object | `{}` | |
Expand Down
7 changes: 7 additions & 0 deletions demo-apps/juice-shop/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ helm.sh/chart: {{ include "juice-shop.chart" . }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- if .Values.labels }}
{{ .Values.labels | toYaml }}
{{- end }}
{{- end -}}

{{/*
Expand All @@ -55,3 +58,7 @@ Selector labels
app.kubernetes.io/name: {{ include "juice-shop.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}}

{{- define "juice-shop.annotations" -}}
{{ .Values.annotations | toYaml }}
{{- end -}}
4 changes: 4 additions & 0 deletions demo-apps/juice-shop/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ metadata:
name: {{ include "juice-shop.fullname" . }}
labels:
{{- include "juice-shop.labels" . | nindent 4 }}
annotations:
{{- include "juice-shop.annotations" . | nindent 4 }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
Expand All @@ -17,6 +19,8 @@ spec:
metadata:
labels:
{{- include "juice-shop.selectorLabels" . | nindent 8 }}
annotations:
{{- include "juice-shop.annotations" . | nindent 8 }}
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
Expand Down
2 changes: 2 additions & 0 deletions demo-apps/juice-shop/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ metadata:
name: {{ include "juice-shop.fullname" . }}
labels:
{{- include "juice-shop.labels" . | nindent 4 }}
annotations:
{{- include "juice-shop.annotations" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
ports:
Expand Down
6 changes: 6 additions & 0 deletions demo-apps/juice-shop/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""

# -- add labels to the deployment, service and pods
labels: {}

# -- add annotations to the deployment, service and pods
annotations: {}

podSecurityContext: {}
# fsGroup: 2000

Expand Down
2 changes: 2 additions & 0 deletions demo-apps/old-wordpress/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@ Insecure & Outdated WordPress Instance: Never expose it to the internet!
| Key | Type | Default | Description |
|-----|------|---------|-------------|
| affinity | object | `{}` | |
| annotations | object | `{}` | add annotations to the deployment, service and pods |
| fullnameOverride | string | `""` | |
| image.pullPolicy | string | `"IfNotPresent"` | |
| image.repository | string | `"docker.io/securecodebox/old-wordpress"` | Container Image |
| image.tag | string | defaults to the appVersion | The image tag |
| imagePullSecrets | list | `[]` | |
| labels | object | `{}` | add labels to the deployment, service and pods |
| nameOverride | string | `""` | |
| nodeSelector | object | `{}` | |
| podSecurityContext | object | `{}` | |
Expand Down
7 changes: 7 additions & 0 deletions demo-apps/old-wordpress/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ helm.sh/chart: {{ include "old-wordpress.chart" . }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- if .Values.labels }}
{{ .Values.labels | toYaml }}
{{- end }}
{{- end -}}

{{/*
Expand All @@ -55,3 +58,7 @@ Selector labels
app.kubernetes.io/name: {{ include "old-wordpress.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}}

{{- define "old-wordpress.annotations" -}}
{{ .Values.annotations | toYaml }}
{{- end -}}
4 changes: 4 additions & 0 deletions demo-apps/old-wordpress/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ metadata:
name: {{ include "old-wordpress.fullname" . }}
labels:
{{- include "old-wordpress.labels" . | nindent 4 }}
annotations:
{{- include "old-wordpress.annotations" . | nindent 4 }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
Expand All @@ -17,6 +19,8 @@ spec:
metadata:
labels:
{{- include "old-wordpress.selectorLabels" . | nindent 8 }}
annotations:
{{- include "old-wordpress.annotations" . | nindent 8 }}
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
Expand Down
2 changes: 2 additions & 0 deletions demo-apps/old-wordpress/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ metadata:
name: {{ include "old-wordpress.fullname" . }}
labels:
{{- include "old-wordpress.labels" . | nindent 4 }}
annotations:
{{- include "old-wordpress.annotations" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
ports:
Expand Down
6 changes: 6 additions & 0 deletions demo-apps/old-wordpress/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""

# -- add labels to the deployment, service and pods
labels: {}

# -- add annotations to the deployment, service and pods
annotations: {}

podSecurityContext: {}
# fsGroup: 2000

Expand Down
Loading