From 23bb3f7b23297e14f42b2c15544f9740bb22a628 Mon Sep 17 00:00:00 2001 From: Jrester Date: Sun, 8 Oct 2023 14:35:07 +0200 Subject: [PATCH 1/3] update ntfy --- charts/ntfy/templates/statefulset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/ntfy/templates/statefulset.yaml b/charts/ntfy/templates/statefulset.yaml index f0ef567..8fb208b 100644 --- a/charts/ntfy/templates/statefulset.yaml +++ b/charts/ntfy/templates/statefulset.yaml @@ -81,7 +81,7 @@ spec: - metadata: name: cache spec: - accessModes: ["ReadWriteOnce"] + accessModess: ["ReadWriteOnce"] resources: requests: storage: {{ .Values.ntfy.cache.size }} From 62693903bfb61b9ca9ee4082cedb8ea624c059e0 Mon Sep 17 00:00:00 2001 From: Jrester Date: Sun, 8 Oct 2023 15:37:34 +0200 Subject: [PATCH 2/3] add gate --- charts/gate/.helmignore | 23 ++++++++ charts/gate/Chart.yaml | 6 ++ charts/gate/README.md | 37 ++++++++++++ charts/gate/templates/_helpers.tpl | 62 ++++++++++++++++++++ charts/gate/templates/configmap.yaml | 9 +++ charts/gate/templates/deployment.yaml | 61 +++++++++++++++++++ charts/gate/templates/hpa.yaml | 32 ++++++++++ charts/gate/templates/service.yaml | 15 +++++ charts/gate/templates/serviceaccount.yaml | 12 ++++ charts/gate/values.yaml | 71 +++++++++++++++++++++++ 10 files changed, 328 insertions(+) create mode 100644 charts/gate/.helmignore create mode 100644 charts/gate/Chart.yaml create mode 100644 charts/gate/README.md create mode 100644 charts/gate/templates/_helpers.tpl create mode 100644 charts/gate/templates/configmap.yaml create mode 100644 charts/gate/templates/deployment.yaml create mode 100644 charts/gate/templates/hpa.yaml create mode 100644 charts/gate/templates/service.yaml create mode 100644 charts/gate/templates/serviceaccount.yaml create mode 100644 charts/gate/values.yaml diff --git a/charts/gate/.helmignore b/charts/gate/.helmignore new file mode 100644 index 0000000..0e8a0eb --- /dev/null +++ b/charts/gate/.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/gate/Chart.yaml b/charts/gate/Chart.yaml new file mode 100644 index 0000000..273fa5d --- /dev/null +++ b/charts/gate/Chart.yaml @@ -0,0 +1,6 @@ +apiVersion: v2 +name: gate +description: High-Performance, Low-Memory, Lightweight, Extensible Minecraft Reverse Proxy with Excellent Multi-Protocol Version Support +type: application +version: 0.1.0 +appVersion: "v0.33.2" diff --git a/charts/gate/README.md b/charts/gate/README.md new file mode 100644 index 0000000..6bf9335 --- /dev/null +++ b/charts/gate/README.md @@ -0,0 +1,37 @@ +# gate + +![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.33.2](https://img.shields.io/badge/AppVersion-v0.33.2-informational?style=flat-square) + +High-Performance, Low-Memory, Lightweight, Extensible Minecraft Reverse Proxy with Excellent Multi-Protocol Version Support + +## Values + +| Key | Type | Default | Description | +|-----|------|---------|-------------| +| affinity | object | `{}` | | +| autoscaling.enabled | bool | `false` | | +| autoscaling.maxReplicas | int | `100` | | +| autoscaling.minReplicas | int | `1` | | +| autoscaling.targetCPUUtilizationPercentage | int | `80` | | +| fullnameOverride | string | `""` | | +| gate.config | object | `{}` | YAML config for gate | +| image.pullPolicy | string | `"IfNotPresent"` | | +| image.repository | string | `"ghcr.io/minekube/gate"` | | +| image.tag | string | `"latest"` | | +| imagePullSecrets | list | `[]` | | +| nameOverride | string | `""` | | +| nodeSelector | object | `{}` | | +| podAnnotations | object | `{}` | | +| podSecurityContext | object | `{}` | | +| replicaCount | int | `1` | | +| resources | object | `{}` | | +| securityContext | object | `{}` | | +| service.port | int | `22565` | | +| service.type | string | `"ClusterIP"` | | +| serviceAccount.annotations | object | `{}` | | +| serviceAccount.create | bool | `true` | | +| serviceAccount.name | string | `""` | | +| tolerations | list | `[]` | | + +---------------------------------------------- +Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) diff --git a/charts/gate/templates/_helpers.tpl b/charts/gate/templates/_helpers.tpl new file mode 100644 index 0000000..99923c4 --- /dev/null +++ b/charts/gate/templates/_helpers.tpl @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "gate.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 "gate.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 "gate.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "gate.labels" -}} +helm.sh/chart: {{ include "gate.chart" . }} +{{ include "gate.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "gate.selectorLabels" -}} +app.kubernetes.io/name: {{ include "gate.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "gate.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "gate.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/charts/gate/templates/configmap.yaml b/charts/gate/templates/configmap.yaml new file mode 100644 index 0000000..a6f31c5 --- /dev/null +++ b/charts/gate/templates/configmap.yaml @@ -0,0 +1,9 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "gate.fullname" . }} + labels: + {{- include "gate.labels" . | nindent 4 }} +data: + config.yml: | +{{ toYaml .Values.gate.config | indent 4 }} diff --git a/charts/gate/templates/deployment.yaml b/charts/gate/templates/deployment.yaml new file mode 100644 index 0000000..75b98e6 --- /dev/null +++ b/charts/gate/templates/deployment.yaml @@ -0,0 +1,61 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "gate.fullname" . }} + labels: + {{- include "gate.labels" . | nindent 4 }} +spec: + {{- if not .Values.autoscaling.enabled }} + replicas: {{ .Values.replicaCount }} + {{- end }} + selector: + matchLabels: + {{- include "gate.selectorLabels" . | nindent 6 }} + template: + metadata: + {{- with .Values.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- include "gate.selectorLabels" . | nindent 8 }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "gate.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: minecraft + containerPort: {{ .Values.service.port }} + protocol: TCP + volumeMounts: + - mountPath: /config.yml + name: config + subPath: config.yml + resources: + {{- toYaml .Values.resources | nindent 12 }} + volumes: + - configMap: + name: {{ include "gate.fullname" . }} + name: config + {{- 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/gate/templates/hpa.yaml b/charts/gate/templates/hpa.yaml new file mode 100644 index 0000000..2a4a647 --- /dev/null +++ b/charts/gate/templates/hpa.yaml @@ -0,0 +1,32 @@ +{{- if .Values.autoscaling.enabled }} +apiVersion: autoscaling/v2 +kind: HorizontalPodAutoscaler +metadata: + name: {{ include "gate.fullname" . }} + labels: + {{- include "gate.labels" . | nindent 4 }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include "gate.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/charts/gate/templates/service.yaml b/charts/gate/templates/service.yaml new file mode 100644 index 0000000..baa169c --- /dev/null +++ b/charts/gate/templates/service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "gate.fullname" . }} + labels: + {{- include "gate.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: minecraft + protocol: TCP + name: minecraft + selector: + {{- include "gate.selectorLabels" . | nindent 4 }} diff --git a/charts/gate/templates/serviceaccount.yaml b/charts/gate/templates/serviceaccount.yaml new file mode 100644 index 0000000..8004a15 --- /dev/null +++ b/charts/gate/templates/serviceaccount.yaml @@ -0,0 +1,12 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "gate.serviceAccountName" . }} + labels: + {{- include "gate.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +{{- end }} diff --git a/charts/gate/values.yaml b/charts/gate/values.yaml new file mode 100644 index 0000000..dd697e8 --- /dev/null +++ b/charts/gate/values.yaml @@ -0,0 +1,71 @@ +# Default values for gate. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + +image: + repository: ghcr.io/minekube/gate + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + # Sadly gate does only provide the latest tag.. + tag: "latest" + +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: 22565 + +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 + +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + +nodeSelector: {} + +tolerations: [] + +affinity: {} + +gate: + # -- YAML config for gate + config: {} From 1ce8b40f8712ca10a342887a21b04a027f097653 Mon Sep 17 00:00:00 2001 From: Jrester Date: Sun, 8 Oct 2023 16:48:31 +0200 Subject: [PATCH 3/3] update gate --- charts/gate/README.md | 2 +- charts/gate/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/gate/README.md b/charts/gate/README.md index 6bf9335..97d0827 100644 --- a/charts/gate/README.md +++ b/charts/gate/README.md @@ -26,7 +26,7 @@ High-Performance, Low-Memory, Lightweight, Extensible Minecraft Reverse Proxy wi | replicaCount | int | `1` | | | resources | object | `{}` | | | securityContext | object | `{}` | | -| service.port | int | `22565` | | +| service.port | int | `25565` | | | service.type | string | `"ClusterIP"` | | | serviceAccount.annotations | object | `{}` | | | serviceAccount.create | bool | `true` | | diff --git a/charts/gate/values.yaml b/charts/gate/values.yaml index dd697e8..fdd3b2a 100644 --- a/charts/gate/values.yaml +++ b/charts/gate/values.yaml @@ -39,7 +39,7 @@ securityContext: {} service: type: ClusterIP - port: 22565 + port: 25565 resources: {} # We usually recommend not to specify default resources and to leave this as a conscious