Skip to content

Commit

Permalink
add labels & annotations
Browse files Browse the repository at this point in the history
  • Loading branch information
@dkapanidis
dkapanidis committed Dec 16, 2020
1 parent 21ae1f7 commit a0f2f2d
Show file tree
Hide file tree
Showing 7 changed files with 100 additions and 26 deletions.
2 changes: 1 addition & 1 deletion charts/kubernetic/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ apiVersion: v1
appVersion: 3.1.0
description: Kubernetic - Supercharge your clusters
name: kubernetic
version: 3.1.2
version: 3.1.3
62 changes: 37 additions & 25 deletions charts/kubernetic/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,34 +138,46 @@ We provide below an example how to setup SSO using Pomerium on top of Kubernetic

### Backend

| Parameter | Description | Default |
|--------------------------|----------------------------------------------------|--------------------------------------------------------------------------------|
| backend.image.repository | Backend image repository | `europe-west1-docker.pkg.dev/woven-computing-234012/public/kubernetic-backend` |
| backend.image.tag | Backend image tag | `3.1.0` |
| backend.image.pullPolicy | Backend image pull policy | `IfNotPresent` |
| backend.updateStrategy | TBD | |
| backend.imagePullSecrets | Backend image pull secrets | `[]` |
| backend.resources | Backend resources allocation (Requests and Limits) | `{}` |
| backend.nodeSelector | Backend node labels for pod assignment | `{}` |
| backend.tolerations | Backend toleration labels for pod assignment | `[]` |
| backend.affinity | Backend affinity settings | `{}` |
| backend.service.type | Backend service type | `ClusterIP` |
| backend.service.port | Backend service port | `80` |
| Parameter | Description | Default |
|-----------------------------|----------------------------------------------------|--------------------------------------------------------------------------------|
| backend.image.repository | Backend image repository | `europe-west1-docker.pkg.dev/woven-computing-234012/public/kubernetic-backend` |
| backend.image.tag | Backend image tag | `3.1.0` |
| backend.image.pullPolicy | Backend image pull policy | `IfNotPresent` |
| backend.updateStrategy | TBD | |
| backend.imagePullSecrets | Backend image pull secrets | `[]` |
| backend.resources | Backend resources allocation (Requests and Limits) | `{}` |
| backend.nodeSelector | Backend node labels for pod assignment | `{}` |
| backend.tolerations | Backend toleration labels for pod assignment | `[]` |
| backend.affinity | Backend affinity settings | `{}` |
| backend.annotations | Backend deployment annotations | Not Set |
| backend.labels | Backend deployment labels | Not Set |
| backend.podAnnotations | Backend pod annotations | Not Set |
| backend.podLabels | Backend pod labels | Not Set |
| backend.service.type | Backend service type | `ClusterIP` |
| backend.service.port | Backend service port | `80` |
| backend.service.annotations | Backend service annotations | Not Set |
| backend.service.labels | Backend service labels | Not Set |

### Frontend

| Parameter | Description | Default |
|---------------------------|-----------------------------------------------------|---------------------------------------------------------------------------------|
| frontend.image.repository | Frontend image repository | `europe-west1-docker.pkg.dev/woven-computing-234012/public/kubernetic-frontend` |
| frontend.image.tag | Frontend image tag | `3.1.0` |
| frontend.image.pullPolicy | Frontend image pull policy | `IfNotPresent` |
| frontend.imagePullSecrets | Frontend image pull secrets | `[]` |
| frontend.resources | Frontend resources allocation (Requests and Limits) | `{}` |
| frontend.nodeSelector | Frontend node labels for pod assignment | `{}` |
| frontend.tolerations | Frontend toleration labels for pod assignment | `[]` |
| frontend.affinity | Frontend affinity settings | `{}` |
| frontend.service.type | Frontend service type | `ClusterIP` |
| frontend.service.port | Frontend service port | `80` |
| Parameter | Description | Default |
|------------------------------|-----------------------------------------------------|---------------------------------------------------------------------------------|
| frontend.image.repository | Frontend image repository | `europe-west1-docker.pkg.dev/woven-computing-234012/public/kubernetic-frontend` |
| frontend.image.tag | Frontend image tag | `3.1.0` |
| frontend.image.pullPolicy | Frontend image pull policy | `IfNotPresent` |
| frontend.imagePullSecrets | Frontend image pull secrets | `[]` |
| frontend.resources | Frontend resources allocation (Requests and Limits) | `{}` |
| frontend.nodeSelector | Frontend node labels for pod assignment | `{}` |
| frontend.tolerations | Frontend toleration labels for pod assignment | `[]` |
| frontend.affinity | Frontend affinity settings | `{}` |
| frontend.annotations | Frontend deployment annotations | Not Set |
| frontend.labels | Frontend deployment labels | Not Set |
| frontend.podAnnotations | Frontend pod annotations | Not Set |
| frontend.podLabels | Frontend pod labels | Not Set |
| frontend.service.type | Frontend service type | `ClusterIP` |
| frontend.service.port | Frontend service port | `80` |
| frontend.service.annotations | Frontend service annotations | Not Set |
| frontend.service.labels | Frontend service labels | Not Set |

### Persistence

Expand Down
13 changes: 13 additions & 0 deletions charts/kubernetic/templates/backend/deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ metadata:
labels:
app.kubernetes.io/component: backend
{{ include "kubernetic.labels" . | indent 4 }}
{{- with .Values.backend.labels }}
{{ toYaml . | indent 4 }}
{{- end }}
{{- with .Values.backend.annotations }}
annotations:
{{ toYaml . | indent 4 }}
{{- end }}
spec:
replicas: 1
strategy:
Expand All @@ -17,9 +24,15 @@ spec:
metadata:
annotations:
checksum/config: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
{{- with .Values.backend.podAnnotations }}
{{ toYaml . | indent 8 }}
{{- end }}
labels:
app.kubernetes.io/name: {{ include "kubernetic.name" . }}-backend
app.kubernetes.io/instance: {{ .Release.Name }}
{{- with .Values.backend.podLabels }}
{{ toYaml . | indent 8 }}
{{- end }}
spec:
{{- with .Values.backend.imagePullSecrets }}
imagePullSecrets:
Expand Down
7 changes: 7 additions & 0 deletions charts/kubernetic/templates/backend/service.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ metadata:
name: {{ include "kubernetic.name" . }}-backend
labels:
{{ include "kubernetic.labels" . | indent 4 }}
{{- with .Values.backend.service.labels }}
{{ toYaml . | indent 4 }}
{{- end }}
{{- with .Values.backend.service.annotations }}
annotations:
{{ toYaml . | indent 4 }}
{{- end }}
spec:
type: {{ .Values.backend.service.type }}
ports:
Expand Down
14 changes: 14 additions & 0 deletions charts/kubernetic/templates/frontend/deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ metadata:
labels:
app.kubernetes.io/component: frontend
{{ include "kubernetic.labels" . | indent 4 }}
{{- with .Values.frontend.labels }}
{{ toYaml . | indent 4 }}
{{- end }}
{{- with .Values.frontend.annotations }}
annotations:
{{ toYaml . | indent 4 }}
{{- end }}
spec:
replicas: 1
selector:
Expand All @@ -13,9 +20,16 @@ spec:
app.kubernetes.io/instance: {{ .Release.Name }}
template:
metadata:
{{- with .Values.frontend.podAnnotations }}
annotations:
{{ toYaml . | indent 8 }}
{{- end }}
labels:
app.kubernetes.io/name: {{ include "kubernetic.name" . }}-frontend
app.kubernetes.io/instance: {{ .Release.Name }}
{{- with .Values.frontend.podLabels }}
{{ toYaml . | indent 8 }}
{{- end }}
spec:
{{- with .Values.frontend.imagePullSecrets }}
imagePullSecrets:
Expand Down
7 changes: 7 additions & 0 deletions charts/kubernetic/templates/frontend/service.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ metadata:
name: {{ include "kubernetic.name" . }}-frontend
labels:
{{ include "kubernetic.labels" . | indent 4 }}
{{- with .Values.frontend.service.labels }}
{{ toYaml . | indent 4 }}
{{- end }}
{{- with .Values.frontend.service.annotations }}
annotations:
{{ toYaml . | indent 4 }}
{{- end }}
spec:
type: {{ .Values.frontend.service.type }}
ports:
Expand Down
21 changes: 21 additions & 0 deletions charts/kubernetic/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,21 @@ backend:
tolerations: []
affinity: {}

## Backend deployment labels & annotations
# annotations: {}
# labels: {}

## Backend pod labels & annotations
# podAnnotations: {}
# podLabels: {}


## Backend service configuration
service:
type: ClusterIP
port: 80
annotations: {}
labels: {}

frontend:
image:
Expand All @@ -57,10 +68,20 @@ frontend:
tolerations: []
affinity: {}

## Frontend deployment labels & annotations
# annotations: {}
# labels: {}

## Frontend pod labels & annotations
# podAnnotations: {}
# podLabels: {}

## Frontend service configuration
service:
type: ClusterIP
port: 80
annotations: {}
labels: {}

persistence:
enabled: true
Expand Down

0 comments on commit a0f2f2d

Please sign in to comment.