From bb05f263c0590918fca74e03b8e615e54d9875d3 Mon Sep 17 00:00:00 2001 From: Emmanuel Mathot Date: Mon, 28 Oct 2024 15:17:22 +0100 Subject: [PATCH] =?UTF-8?q?Co-authored-by:=20Ciaran=20Sweet=20=20Co-authored-by:=20x=C4=B1=CA=83?= =?UTF-8?q?=C7=9D=C9=9F=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp-polder/templates/configmap.yaml | 10 +- .../webapp-polder/templates/deployment.yaml | 10 +- deployment/helm/webapp-polder/values.yaml | 22 +-- deployment/helm2/polder/.helmignore | 23 ++++ deployment/helm2/polder/Chart.yaml | 24 ++++ deployment/helm2/polder/templates/NOTES.txt | 22 +++ .../helm2/polder/templates/_helpers.tpl | 62 +++++++++ .../helm2/polder/templates/configmap.yaml | 11 ++ .../helm2/polder/templates/deployment.yaml | 68 ++++++++++ deployment/helm2/polder/templates/hpa.yaml | 32 +++++ .../helm2/polder/templates/ingress.yaml | 43 ++++++ .../helm2/polder/templates/service.yaml | 15 ++ .../polder/templates/serviceaccount.yaml | 13 ++ .../templates/tests/test-connection.yaml | 15 ++ deployment/helm2/polder/values.yaml | 128 ++++++++++++++++++ 15 files changed, 478 insertions(+), 20 deletions(-) create mode 100644 deployment/helm2/polder/.helmignore create mode 100644 deployment/helm2/polder/Chart.yaml create mode 100644 deployment/helm2/polder/templates/NOTES.txt create mode 100644 deployment/helm2/polder/templates/_helpers.tpl create mode 100644 deployment/helm2/polder/templates/configmap.yaml create mode 100644 deployment/helm2/polder/templates/deployment.yaml create mode 100644 deployment/helm2/polder/templates/hpa.yaml create mode 100644 deployment/helm2/polder/templates/ingress.yaml create mode 100644 deployment/helm2/polder/templates/service.yaml create mode 100644 deployment/helm2/polder/templates/serviceaccount.yaml create mode 100644 deployment/helm2/polder/templates/tests/test-connection.yaml create mode 100644 deployment/helm2/polder/values.yaml diff --git a/deployment/helm/webapp-polder/templates/configmap.yaml b/deployment/helm/webapp-polder/templates/configmap.yaml index 8c4503c..4eb5940 100644 --- a/deployment/helm/webapp-polder/templates/configmap.yaml +++ b/deployment/helm/webapp-polder/templates/configmap.yaml @@ -4,6 +4,10 @@ metadata: name: webapp-polder-configmap labels: {{- include "webapp-polder.labels" . | nindent 4 }} -data: {{ with .Values.config }} - {{- toYaml . | nindent 2}} - {{- end }} +data: + app_config.js: | + window.__APP_CONFIG__ = { + MAPBOX_TOKEN: {{ .Values.mapboxToken }}, + STAC_API: {{ .Values.stacApiUrl }}, + TILER_API: {{ .Values.tilerApiUrl }}, + }; diff --git a/deployment/helm/webapp-polder/templates/deployment.yaml b/deployment/helm/webapp-polder/templates/deployment.yaml index ccf0400..aaa2ece 100644 --- a/deployment/helm/webapp-polder/templates/deployment.yaml +++ b/deployment/helm/webapp-polder/templates/deployment.yaml @@ -46,12 +46,18 @@ spec: {{- toYaml .Values.readinessProbe | nindent 12 }} resources: {{- toYaml .Values.resources | nindent 12 }} - {{- with .Values.volumeMounts }} volumeMounts: + - name: webapp-polder-config + mountPath: /usr/share/nginx/html/app_config.js + subPath: app_config.js + {{- with .Values.volumeMounts }} {{- toYaml . | nindent 12 }} {{- end }} - {{- with .Values.volumes }} volumes: + - name: webapp-polder-config + configMap: + name: webapp-polder-configmap + {{- with .Values.volumes }} {{- toYaml . | nindent 8 }} {{- end }} {{- with .Values.nodeSelector }} diff --git a/deployment/helm/webapp-polder/values.yaml b/deployment/helm/webapp-polder/values.yaml index a0baea1..2a0212d 100644 --- a/deployment/helm/webapp-polder/values.yaml +++ b/deployment/helm/webapp-polder/values.yaml @@ -104,20 +104,14 @@ autoscaling: # targetMemoryUtilizationPercentage: 80 # Additional volumes on the output Deployment definition. -volumes: - - name: webapp-polder-config - configMap: - name: webapp-polder-configmap +volumes: {} # - name: foo # secret: # secretName: mysecret # optional: false # Additional volumeMounts on the output Deployment definition. -volumeMounts: - - name: webapp-polder-config - mountPath: /usr/share/nginx/html/app_config.js - subPath: app_config.js +volumeMounts: {} # - name: foo # mountPath: "/etc/foo" # readOnly: true @@ -128,10 +122,8 @@ tolerations: [] affinity: {} -config: - app_config.js: | - window.__APP_CONFIG__ = { - MAPBOX_TOKEN: "pk.eyJ1IjoiZGV2c2VlZCIsImEiOiJnUi1mbkVvIn0.018aLhX0Mb0tdtaT2QNe2Q", - STAC_API: "https://rx3hna9pbg.execute-api.eu-central-1.amazonaws.com", - TILER_API: "https://zbrrek3x0i.execute-api.eu-central-1.amazonaws.com", - }; +# Application specific values +mapboxToken: "token" +stacApiUrl: "https://localhost:8080" +tilerApiUrl: "https://localhost:8080" + diff --git a/deployment/helm2/polder/.helmignore b/deployment/helm2/polder/.helmignore new file mode 100644 index 0000000..0e8a0eb --- /dev/null +++ b/deployment/helm2/polder/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/deployment/helm2/polder/Chart.yaml b/deployment/helm2/polder/Chart.yaml new file mode 100644 index 0000000..d7060aa --- /dev/null +++ b/deployment/helm2/polder/Chart.yaml @@ -0,0 +1,24 @@ +apiVersion: v2 +name: polder +description: A Helm chart for Kubernetes + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +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.0 + +# 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: "1.16.0" diff --git a/deployment/helm2/polder/templates/NOTES.txt b/deployment/helm2/polder/templates/NOTES.txt new file mode 100644 index 0000000..4b1679a --- /dev/null +++ b/deployment/helm2/polder/templates/NOTES.txt @@ -0,0 +1,22 @@ +1. Get the application URL by running these commands: +{{- if .Values.ingress.enabled }} +{{- range $host := .Values.ingress.hosts }} + {{- range .paths }} + http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} + {{- end }} +{{- end }} +{{- else if contains "NodePort" .Values.service.type }} + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "polder.fullname" . }}) + export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") + echo http://$NODE_IP:$NODE_PORT +{{- else if contains "LoadBalancer" .Values.service.type }} + NOTE: It may take a few minutes for the LoadBalancer IP to be available. + You can watch its status by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "polder.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "polder.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + echo http://$SERVICE_IP:{{ .Values.service.port }} +{{- else if contains "ClusterIP" .Values.service.type }} + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "polder.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT +{{- end }} diff --git a/deployment/helm2/polder/templates/_helpers.tpl b/deployment/helm2/polder/templates/_helpers.tpl new file mode 100644 index 0000000..5d3ecd7 --- /dev/null +++ b/deployment/helm2/polder/templates/_helpers.tpl @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "polder.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "polder.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "polder.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "polder.labels" -}} +helm.sh/chart: {{ include "polder.chart" . }} +{{ include "polder.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "polder.selectorLabels" -}} +app.kubernetes.io/name: {{ include "polder.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "polder.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "polder.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/deployment/helm2/polder/templates/configmap.yaml b/deployment/helm2/polder/templates/configmap.yaml new file mode 100644 index 0000000..5f0e51d --- /dev/null +++ b/deployment/helm2/polder/templates/configmap.yaml @@ -0,0 +1,11 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "polder.fullname" . }}-configmap +data: + app_config.js: | + window.__APP_CONFIG__ = { + MAPBOX_TOKEN: {{ .Values.mapboxToken }}, + STAC_API: {{ .Values.stacApiUrl }}, + TILER_API: {{ .Values.tilerApiUrl }}, + }; diff --git a/deployment/helm2/polder/templates/deployment.yaml b/deployment/helm2/polder/templates/deployment.yaml new file mode 100644 index 0000000..6eb4cc4 --- /dev/null +++ b/deployment/helm2/polder/templates/deployment.yaml @@ -0,0 +1,68 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "polder.fullname" . }} + labels: + {{- include "polder.labels" . | nindent 4 }} +spec: + {{- if not .Values.autoscaling.enabled }} + replicas: {{ .Values.replicaCount }} + {{- end }} + selector: + matchLabels: + {{- include "polder.selectorLabels" . | nindent 6 }} + template: + metadata: + {{- with .Values.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- include "polder.labels" . | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "polder.serviceAccountName" . }} + securityContext: + {{- toYaml .Values.podSecurityContext | nindent 8 }} + containers: + - name: {{ .Chart.Name }} + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - name: http + containerPort: {{ .Values.service.port }} + protocol: TCP + livenessProbe: + {{- toYaml .Values.livenessProbe | nindent 12 }} + readinessProbe: + {{- toYaml .Values.readinessProbe | nindent 12 }} + resources: + {{- toYaml .Values.resources | nindent 12 }} + {{- with .Values.volumeMounts }} + volumeMounts: + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.volumes }} + volumes: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/deployment/helm2/polder/templates/hpa.yaml b/deployment/helm2/polder/templates/hpa.yaml new file mode 100644 index 0000000..d044055 --- /dev/null +++ b/deployment/helm2/polder/templates/hpa.yaml @@ -0,0 +1,32 @@ +{{- if .Values.autoscaling.enabled }} +apiVersion: autoscaling/v2 +kind: HorizontalPodAutoscaler +metadata: + name: {{ include "polder.fullname" . }} + labels: + {{- include "polder.labels" . | nindent 4 }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include "polder.fullname" . }} + minReplicas: {{ .Values.autoscaling.minReplicas }} + maxReplicas: {{ .Values.autoscaling.maxReplicas }} + metrics: + {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} + - type: Resource + resource: + name: cpu + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} + {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} + - type: Resource + resource: + name: memory + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + {{- end }} +{{- end }} diff --git a/deployment/helm2/polder/templates/ingress.yaml b/deployment/helm2/polder/templates/ingress.yaml new file mode 100644 index 0000000..a505530 --- /dev/null +++ b/deployment/helm2/polder/templates/ingress.yaml @@ -0,0 +1,43 @@ +{{- if .Values.ingress.enabled -}} +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: {{ include "polder.fullname" . }} + labels: + {{- include "polder.labels" . | nindent 4 }} + {{- with .Values.ingress.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- with .Values.ingress.className }} + ingressClassName: {{ . }} + {{- end }} + {{- if .Values.ingress.tls }} + tls: + {{- range .Values.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} + {{- end }} + rules: + {{- range .Values.ingress.hosts }} + - host: {{ .host | quote }} + http: + paths: + {{- range .paths }} + - path: {{ .path }} + {{- with .pathType }} + pathType: {{ . }} + {{- end }} + backend: + service: + name: {{ include "polder.fullname" $ }} + port: + number: {{ $.Values.service.port }} + {{- end }} + {{- end }} +{{- end }} diff --git a/deployment/helm2/polder/templates/service.yaml b/deployment/helm2/polder/templates/service.yaml new file mode 100644 index 0000000..0b26545 --- /dev/null +++ b/deployment/helm2/polder/templates/service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "polder.fullname" . }} + labels: + {{- include "polder.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: http + protocol: TCP + name: http + selector: + {{- include "polder.selectorLabels" . | nindent 4 }} diff --git a/deployment/helm2/polder/templates/serviceaccount.yaml b/deployment/helm2/polder/templates/serviceaccount.yaml new file mode 100644 index 0000000..6079057 --- /dev/null +++ b/deployment/helm2/polder/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "polder.serviceAccountName" . }} + labels: + {{- include "polder.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +automountServiceAccountToken: {{ .Values.serviceAccount.automount }} +{{- end }} diff --git a/deployment/helm2/polder/templates/tests/test-connection.yaml b/deployment/helm2/polder/templates/tests/test-connection.yaml new file mode 100644 index 0000000..4a26c22 --- /dev/null +++ b/deployment/helm2/polder/templates/tests/test-connection.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Pod +metadata: + name: "{{ include "polder.fullname" . }}-test-connection" + labels: + {{- include "polder.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": test +spec: + containers: + - name: wget + image: busybox + command: ['wget'] + args: ['{{ include "polder.fullname" . }}:{{ .Values.service.port }}'] + restartPolicy: Never diff --git a/deployment/helm2/polder/values.yaml b/deployment/helm2/polder/values.yaml new file mode 100644 index 0000000..9b094cc --- /dev/null +++ b/deployment/helm2/polder/values.yaml @@ -0,0 +1,128 @@ +# Default values for polder. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +# This will set the replicaset count more information can be found here: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/ +replicaCount: 1 + +# This sets the container image more information can be found here: https://kubernetes.io/docs/concepts/containers/images/ +image: + repository: ghcr.io/developmnetseed/polder + # This sets the pull policy for images. + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: "dev" + +# This is for the secretes for pulling an image from a private repository more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ +imagePullSecrets: [] +# This is to override the chart name. +nameOverride: "" +fullnameOverride: "" + +#This section builds out the service account more information can be found here: https://kubernetes.io/docs/concepts/security/service-accounts/ +serviceAccount: + # Specifies whether a service account should be created + create: true + # Automatically mount a ServiceAccount's API credentials? + automount: true + # Annotations to add to the service account + annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: "" + +# This is for setting Kubernetes Annotations to a Pod. +# For more information checkout: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ +podAnnotations: {} +# This is for setting Kubernetes Labels to a Pod. +# For more information checkout: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ +podLabels: {} + +podSecurityContext: {} + # fsGroup: 2000 + +securityContext: {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true + # runAsNonRoot: true + # runAsUser: 1000 + +# This is for setting up a service more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/ +service: + # This sets the service type more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types + type: ClusterIP + # This sets the ports more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/#field-spec-ports + port: 80 + +# This block is for setting up the ingress for more information can be found here: https://kubernetes.io/docs/concepts/services-networking/ingress/ +ingress: + enabled: false + className: "" + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + hosts: + - host: chart-example.local + paths: + - path: / + pathType: ImplementationSpecific + tls: [] + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + +resources: {} + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + +# This is to setup the liveness and readiness probes more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/ +livenessProbe: + httpGet: + path: / + port: http +readinessProbe: + httpGet: + path: / + port: http + +#This section is for setting up autoscaling more information can be found here: https://kubernetes.io/docs/concepts/workloads/autoscaling/ +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + +# Additional volumes on the output Deployment definition. +volumes: [] +# - name: foo +# secret: +# secretName: mysecret +# optional: false + +# Additional volumeMounts on the output Deployment definition. +volumeMounts: [] +# - name: foo +# mountPath: "/etc/foo" +# readOnly: true + +nodeSelector: {} + +tolerations: [] + +affinity: {} + +# Application specific values +mapboxToken: "" +stacApiUrl: "" +tilerApiUrl: ""