From 4a6351dee8f0f8823cc67c621a5cf0f09146bcf9 Mon Sep 17 00:00:00 2001 From: 0hlov3 Date: Tue, 26 Sep 2023 21:38:45 +0200 Subject: [PATCH] Adds cinnyapp initial HELM Chart --- charts/cinnyapp/.helmignore | 23 +++++ charts/cinnyapp/Chart.yaml | 32 +++++++ charts/cinnyapp/templates/NOTES.txt | 22 +++++ charts/cinnyapp/templates/_helpers.tpl | 62 +++++++++++++ charts/cinnyapp/templates/configmap.yaml | 17 ++++ charts/cinnyapp/templates/deployment.yaml | 76 ++++++++++++++++ charts/cinnyapp/templates/ingress.yaml | 61 +++++++++++++ .../cinnyapp/templates/networkpolicies.yaml | 53 ++++++++++++ charts/cinnyapp/templates/service.yaml | 15 ++++ charts/cinnyapp/templates/serviceaccount.yaml | 12 +++ .../templates/tests/test-connection.yaml | 15 ++++ charts/cinnyapp/values.yaml | 86 +++++++++++++++++++ 12 files changed, 474 insertions(+) create mode 100644 charts/cinnyapp/.helmignore create mode 100644 charts/cinnyapp/Chart.yaml create mode 100644 charts/cinnyapp/templates/NOTES.txt create mode 100644 charts/cinnyapp/templates/_helpers.tpl create mode 100644 charts/cinnyapp/templates/configmap.yaml create mode 100644 charts/cinnyapp/templates/deployment.yaml create mode 100644 charts/cinnyapp/templates/ingress.yaml create mode 100644 charts/cinnyapp/templates/networkpolicies.yaml create mode 100644 charts/cinnyapp/templates/service.yaml create mode 100644 charts/cinnyapp/templates/serviceaccount.yaml create mode 100644 charts/cinnyapp/templates/tests/test-connection.yaml create mode 100644 charts/cinnyapp/values.yaml diff --git a/charts/cinnyapp/.helmignore b/charts/cinnyapp/.helmignore new file mode 100644 index 0000000..0e8a0eb --- /dev/null +++ b/charts/cinnyapp/.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/charts/cinnyapp/Chart.yaml b/charts/cinnyapp/Chart.yaml new file mode 100644 index 0000000..92af057 --- /dev/null +++ b/charts/cinnyapp/Chart.yaml @@ -0,0 +1,32 @@ +apiVersion: v2 +name: cinnyapp +description: A Helm chart for Kubernetes, to deploy cinnyapp. +icon: https://cinny.in/assets/cinny.svg +home: https://github.com/cinnyapp/cinny + + +maintainers: + - name: fSocietySocial + email: dev@fsociety.social + url: https://fsociety.social + +# 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: "v2.2.6" \ No newline at end of file diff --git a/charts/cinnyapp/templates/NOTES.txt b/charts/cinnyapp/templates/NOTES.txt new file mode 100644 index 0000000..d38c09d --- /dev/null +++ b/charts/cinnyapp/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 "cinnyapp.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 the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "cinnyapp.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "cinnyapp.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 "cinnyapp.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/charts/cinnyapp/templates/_helpers.tpl b/charts/cinnyapp/templates/_helpers.tpl new file mode 100644 index 0000000..db3b3d4 --- /dev/null +++ b/charts/cinnyapp/templates/_helpers.tpl @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "cinnyapp.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 "cinnyapp.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 "cinnyapp.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "cinnyapp.labels" -}} +helm.sh/chart: {{ include "cinnyapp.chart" . }} +{{ include "cinnyapp.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "cinnyapp.selectorLabels" -}} +app.kubernetes.io/name: {{ include "cinnyapp.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "cinnyapp.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "cinnyapp.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/charts/cinnyapp/templates/configmap.yaml b/charts/cinnyapp/templates/configmap.yaml new file mode 100644 index 0000000..5f5d060 --- /dev/null +++ b/charts/cinnyapp/templates/configmap.yaml @@ -0,0 +1,17 @@ +{{- if .Values.config.override }} +{{ $fullName := include "cinnyapp.fullname" . }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "cinnyapp.fullname" . }} +data: + config.json: |- + { + "defaultHomeserver": {{ .Values.config.defaultHomeserver }}, + {{- with .Values.config.homeserverList }} + "homeserverList": {{ . | toJson }}, + {{- end }} + "allowCustomHomeservers": {{ .Values.config.allowCustomHomeservers }} + } +{{- end }} \ No newline at end of file diff --git a/charts/cinnyapp/templates/deployment.yaml b/charts/cinnyapp/templates/deployment.yaml new file mode 100644 index 0000000..eee74f6 --- /dev/null +++ b/charts/cinnyapp/templates/deployment.yaml @@ -0,0 +1,76 @@ +{{ $fullName := include "cinnyapp.fullname" . }} +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ $fullName }} + labels: + {{- include "cinnyapp.labels" . | nindent 4 }} +spec: + replicas: 1 + selector: + matchLabels: + {{- include "cinnyapp.selectorLabels" . | nindent 6 }} + template: + metadata: + annotations: + checksum/config: {{ include (print .Template.BasePath "/configmap.yaml") . | sha256sum }} + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- include "cinnyapp.selectorLabels" . | nindent 8 }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "cinnyapp.serviceAccountName" . }} + securityContext: + {{- toYaml .Values.podSecurityContext | nindent 8 }} + containers: + - name: {{ .Chart.Name }} + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - name: http + containerPort: {{ .Values.service.port }} + protocol: TCP + #livenessProbe: + # httpGet: + # path: / + # port: http + #readinessProbe: + # httpGet: + # path: / + # port: http + resources: + {{- toYaml .Values.resources | nindent 12 }} + {{- if .Values.config.override }} + volumeMounts: + - mountPath: /app/config.json + subPath: config.json + name: {{ $fullName }} + volumes: + - name: {{ $fullName }} + configMap: + name: {{ $fullName }} + defaultMode: 0644 + items: + - key: "config.json" + path: "config.json" + {{- 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/charts/cinnyapp/templates/ingress.yaml b/charts/cinnyapp/templates/ingress.yaml new file mode 100644 index 0000000..f8387cf --- /dev/null +++ b/charts/cinnyapp/templates/ingress.yaml @@ -0,0 +1,61 @@ +{{- if .Values.ingress.enabled -}} +{{- $fullName := include "cinnyapp.fullname" . -}} +{{- $svcPort := .Values.service.port -}} +{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} + {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} + {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} + {{- end }} +{{- end }} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1beta1 +{{- else -}} +apiVersion: extensions/v1beta1 +{{- end }} +kind: Ingress +metadata: + name: {{ $fullName }} + labels: + {{- include "cinnyapp.labels" . | nindent 4 }} + {{- with .Values.ingress.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} + ingressClassName: {{ .Values.ingress.className }} + {{- 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 }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} + backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} + serviceName: {{ $fullName }} + servicePort: {{ $svcPort }} + {{- end }} + {{- end }} + {{- end }} +{{- end }} diff --git a/charts/cinnyapp/templates/networkpolicies.yaml b/charts/cinnyapp/templates/networkpolicies.yaml new file mode 100644 index 0000000..cfa6e05 --- /dev/null +++ b/charts/cinnyapp/templates/networkpolicies.yaml @@ -0,0 +1,53 @@ +{{- if .Values.networkpolicies.enabled }} +{{ $fullName := include "cinnyapp.fullname" . }} +--- +apiVersion: networking.k8s.io/v1 +kind: NetworkPolicy +metadata: + name: {{ $fullName }}-default-deny + labels: + {{- include "cinnyapp.labels" . | nindent 4 }} +spec: + podSelector: {} + policyTypes: + - Ingress + - Egress +--- +apiVersion: networking.k8s.io/v1 +kind: NetworkPolicy +metadata: + name: {{ $fullName }}-allow + labels: + {{- include "cinnyapp.labels" . | nindent 4 }} +spec: + egress: + - ports: + - port: 53 + protocol: TCP + - port: 53 + protocol: UDP + to: + - namespaceSelector: + matchLabels: + kubernetes.io/metadata.name: kube-system + - podSelector: + matchLabels: + k8s-app: kube-dns + - to: + - ipBlock: + cidr: 0.0.0.0/0 + except: + - 10.0.0.0/8 + - 172.16.0.0/12 + - 192.168.0.0/16 + ingress: + - from: + - ipBlock: + cidr: 0.0.0.0/0 + podSelector: + matchLabels: + {{- include "cinnyapp.selectorLabels" . | nindent 6 }} + policyTypes: + - Ingress + - Egress +{{- end }} \ No newline at end of file diff --git a/charts/cinnyapp/templates/service.yaml b/charts/cinnyapp/templates/service.yaml new file mode 100644 index 0000000..e3ddbb0 --- /dev/null +++ b/charts/cinnyapp/templates/service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "cinnyapp.fullname" . }} + labels: + {{- include "cinnyapp.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: http + protocol: TCP + name: http + selector: + {{- include "cinnyapp.selectorLabels" . | nindent 4 }} diff --git a/charts/cinnyapp/templates/serviceaccount.yaml b/charts/cinnyapp/templates/serviceaccount.yaml new file mode 100644 index 0000000..4dfbfd9 --- /dev/null +++ b/charts/cinnyapp/templates/serviceaccount.yaml @@ -0,0 +1,12 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "cinnyapp.serviceAccountName" . }} + labels: + {{- include "cinnyapp.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +{{- end }} diff --git a/charts/cinnyapp/templates/tests/test-connection.yaml b/charts/cinnyapp/templates/tests/test-connection.yaml new file mode 100644 index 0000000..93a6b73 --- /dev/null +++ b/charts/cinnyapp/templates/tests/test-connection.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Pod +metadata: + name: "{{ include "cinnyapp.fullname" . }}-test-connection" + labels: + {{- include "cinnyapp.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": test +spec: + containers: + - name: wget + image: busybox + command: ['wget'] + args: ['{{ include "cinnyapp.fullname" . }}:{{ .Values.service.port }}'] + restartPolicy: Never diff --git a/charts/cinnyapp/values.yaml b/charts/cinnyapp/values.yaml new file mode 100644 index 0000000..441e956 --- /dev/null +++ b/charts/cinnyapp/values.yaml @@ -0,0 +1,86 @@ +# Default values for cinnyapp. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +image: + registry: ghcr.io + repository: cinnyapp/cinny + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: "" + +config: + override: false + homeserverList: + - matrix.fsociety.social + - converser.eu + - envs.net + - halogen.city + - matrix.org + - mozilla.org + defaultHomeserver: 0 + allowCustomHomeservers: true + +networkpolicies: + enabled: false + +imagePullSecrets: [] +nameOverride: "" +fullnameOverride: "" + +serviceAccount: + # Specifies whether a service account should be created + create: 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: "" + +podAnnotations: {} + +podSecurityContext: {} +# fsGroup: 2000 + +securityContext: {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true + # runAsNonRoot: true +# runAsUser: 1000 + +service: + type: ClusterIP + port: 80 + +ingress: + enabled: false + className: "" + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + # cert-manager.io/cluster-issuer: letsencrypt-prod + hosts: + - host: chart-example.local + paths: + - path: / + pathType: ImplementationSpecific + tls: [] + # - secretName: tls-cinnyapp-general + # hosts: + # - chart-example.local + +resources: + limits: + cpu: 100m + memory: 128Mi + requests: + cpu: 100m + memory: 128Mi + +nodeSelector: {} + +tolerations: [] + +affinity: {}