Merge pull request #29 from foomo/squadron-nextjs-server-0.1.0

feat(squadron-nextjs-server): add chart

Makefile

@@ -32,8 +32,9 @@ docs:
 schema: PWD=$(pwd)
 schema:
 	#helm-schema -n -c charts/namespace
-	helm-schema -n -c charts/keel-server
-	helm-schema -n -c charts/keel-cronjob
+	helm-schema -n -c charts/squadron-keel-server
+	helm-schema -n -c charts/squadron-keel-cronjob
+	helm-schema -n -c charts/squadron-nextjs-server
 	helm schema-gen charts/namespace/values.yaml > charts/namespace/values.schema.json
 	helm schema-gen charts/beam/values.yaml > charts/beam/values.schema.json
 	helm schema-gen charts/contentserver/values.yaml > charts/contentserver/values.schema.json

charts/squadron-keel-cronjob/Chart.yaml

@@ -0,0 +1,19 @@
+apiVersion: v2
+type: application
+name: squadron-keel-cronjob
+description: Squadron Keel CronJob Chart
+icon: https://avatars.githubusercontent.com/u/889755?s=200&v=4
+home: https://www.foomo.org
+keywords:
+  - foomo
+  - foomo-keel
+  - foomo-squadron
+sources:
+  - https://github.com/foomo/helm-charts
+annotations:
+  "artifacthub.io/links": |
+    - name: Chart Source
+      url: https://github.com/foomo/helm-charts
+
+version: 0.1.1
+appVersion: 0.1.1

charts/keel-cronjob/README.md → charts/squadron-keel-cronjob/README.md

@@ -1,8 +1,8 @@
-# keel-cronjob
+# squadron-keel-cronjob
 
-![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: 0.1.0](https://img.shields.io/badge/AppVersion-0.1.0-informational?style=flat-square)
+![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.1](https://img.shields.io/badge/AppVersion-0.1.1-informational?style=flat-square)
 
-Keel CronJob Chart
+Squadron Keel CronJob Chart
 
 **Homepage:** <https://www.foomo.org>
 
@@ -30,7 +30,7 @@ Keel CronJob Chart
 | cronjob.livenessProbe | object | `{"httpGet":{"path":"/healthz/liveness","port":"healthz"}}` | Liveness probe settings |
 | cronjob.podAnnotations | object | `{}` | Pod annotations |
 | cronjob.readinessProbe | object | `{"httpGet":{"path":"/healthz/readiness","port":"healthz"}}` | Readiness probe settings |
-| cronjob.resources | object | `{}` | See: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/ |
+| cronjob.resources | object | `{}` | Resource settings |
 | cronjob.restart | string | `"Never"` | Restart policy |
 | cronjob.startupProbe | object | `{"httpGet":{"path":"/healthz/startup","port":"healthz"}}` | Startup probe settings |
 | env | object | `{}` | FOO: bar |

charts/keel-cronjob/templates/persistentvolumeclaim.yaml → charts/squadron-keel-cronjob/templates/persistentvolumeclaim.yaml

@@ -23,7 +23,6 @@ metadata:
   labels: {{- include "keel.cronjob.labels" $ | nindent 4 }}
   namespace: {{ include "keel.cronjob.namespace" $ }}
 spec:
-  # https://kubernetes.io/docs/concepts/storage/persistent-volumes/#access-modes
   {{- if $value.name }}
   volumeName: {{ $value.name }}
   {{- end }}

charts/keel-cronjob/values.schema.json → charts/squadron-keel-cronjob/values.schema.json

@@ -216,7 +216,7 @@
         },
         "resources": {
           "additionalProperties": true,
-          "description": "Resouce settings\nSee: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/",
+          "description": "Resource settings",
           "required": [],
           "title": "resources",
           "type": [

charts/keel-cronjob/values.yaml → charts/squadron-keel-cronjob/values.yaml

@@ -361,8 +361,7 @@ cronjob:
   # type: [object, null]
   # additionalProperties: true
   # @schema
-  # -- Resouce settings
-  # -- See: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
+  # -- Resource settings
   resources: {}
   # @schema
   # type: [object, null]

charts/keel-server/Chart.yaml → charts/squadron-keel-server/Chart.yaml

@@ -1,18 +1,19 @@
 apiVersion: v2
 type: application
-name: keel-server
-description: Keel Server Chart
+name: squadron-keel-server
+description: Squadron Keel Server Chart
 icon: https://avatars.githubusercontent.com/u/889755?s=200&v=4
 home: https://www.foomo.org
 keywords:
   - foomo
   - foomo-keel
+  - foomo-squadron
 sources:
   - https://github.com/foomo/helm-charts
 annotations:
   "artifacthub.io/links": |
     - name: Chart Source
       url: https://github.com/foomo/helm-charts
 
-version: 0.1.4
-appVersion: 0.1.4
+version: 0.1.5
+appVersion: 0.1.5

charts/keel-server/README.md → charts/squadron-keel-server/README.md

@@ -1,8 +1,8 @@
-# keel-server
+# squadron-keel-server
 
-![Version: 0.1.4](https://img.shields.io/badge/Version-0.1.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.4](https://img.shields.io/badge/AppVersion-0.1.4-informational?style=flat-square)
+![Version: 0.1.5](https://img.shields.io/badge/Version-0.1.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.5](https://img.shields.io/badge/AppVersion-0.1.5-informational?style=flat-square)
 
-Keel Server Chart
+Squadron Keel Server Chart
 
 **Homepage:** <https://www.foomo.org>
 
@@ -14,11 +14,11 @@ Keel Server Chart
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| autoscaling | object | `{"additionalMetrics":{},"behavior":{},"enabled":false,"maxReplicas":5,"minReplicas":1,"targetCPU":75,"targetMemory":null}` | Autoscaling settings |
+| autoscaling | object | `{"additionalMetrics":{},"behavior":{},"enabled":false,"maxReplicas":9,"maxUnavailable":1,"minAvailable":"","minReplicas":1,"targetCPU":75,"targetMemory":null}` | Autoscaling settings |
 | autoscaling.additionalMetrics | object | `{}` | Additional scaling metrics |
 | autoscaling.behavior | object | `{}` | Autoscaling behavior settings |
 | autoscaling.enabled | bool | `false` | Specifies whether a auto scaling should be enabled |
-| autoscaling.maxReplicas | int | `5` | Maximum replication number |
+| autoscaling.maxReplicas | int | `9` | Maximum replication number |
 | autoscaling.minReplicas | int | `1` | Minimum replication number |
 | autoscaling.targetCPU | int | `75` | Target CPU utilization |
 | autoscaling.targetMemory | string | `nil` | Target Memory utilization |
@@ -78,8 +78,6 @@ Keel Server Chart
 | persistence.mountPath | string | `"/var/lib/server/data"` | Storage mount path |
 | persistence.size | string | `"1Gi"` | Storage size |
 | persistence.storageClass | string | `""` | Storage class name |
-| podDisruptionBudget | object | `{"enabled":false,"maxUnavailable":"","minAvailable":""}` | Pod disruption budget settings |
-| podDisruptionBudget.enabled | bool | `false` | Indicates wether the pod disruption budget is enabled |
 | ports | object | `{}` | http: 8080 |
 | rbac | object | `{"enabled":false}` | RBAC configuration |
 | rbac.enabled | bool | `false` | Create PodSecurityPolicy. |
@@ -109,7 +107,7 @@ Keel Server Chart
 | server.livenessProbe | object | `{"httpGet":{"path":"/healthz/liveness","port":"healthz"}}` | Liveness probe settings |
 | server.podAnnotations | object | `{}` | Pod annotations |
 | server.readinessProbe | object | `{"httpGet":{"path":"/healthz/readiness","port":"healthz"}}` | Readiness probe settings |
-| server.resources | object | `{}` | See: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/ |
+| server.resources | object | `{}` | Resource settings |
 | server.startupProbe | object | `{"httpGet":{"path":"/healthz/startup","port":"healthz"}}` | Startup probe settings |
 | service | object | `{"additionalLabels":{},"annotations":{},"type":"ClusterIP"}` | Service settings |
 | service.additionalLabels | object | `{}` | Additional Service labels |

charts/keel-server/templates/ingress.yaml → charts/squadron-keel-server/templates/ingress.yaml

@@ -13,7 +13,9 @@ metadata:
   {{- end }}
   namespace: {{ include "keel.server.namespace" . }}
 spec:
-  ingressClassName: {{ .Values.ingress.className }}
+  {{- with .Values.ingress.className }}
+  ingressClassName: {{ . }}
+  {{- end }}
   rules:
     {{- range .Values.ingress.hosts }}
     - host: {{ tpl . $ | quote }}

charts/keel-server/templates/persistentvolumeclaim.yaml → charts/squadron-keel-server/templates/persistentvolumeclaim.yaml

@@ -23,7 +23,6 @@ metadata:
   labels: {{- include "keel.server.labels" $ | nindent 4 }}
   namespace: {{ include "keel.server.namespace" $ }}
 spec:
-  # https://kubernetes.io/docs/concepts/storage/persistent-volumes/#access-modes
   {{- if $value.name }}
   volumeName: {{ $value.name }}
   {{- end }}

charts/keel-server/templates/poddisruptionbudget.yaml → charts/squadron-keel-server/templates/poddisruptionbudget.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.podDisruptionBudget.enabled }}
+{{- if .Values.autoscaling.enabled }}
 apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
@@ -8,10 +8,10 @@ metadata:
 spec:
   selector:
     matchLabels: {{- include "keel.server.selectorLabels" . | nindent 6 }}
-  {{- with .Values.podDisruptionBudget.minAvailable }}
+  {{- with .Values.autoscaling.minAvailable }}
   minAvailable: {{ . }}
   {{- end }}
-  {{- with .Values.podDisruptionBudget.maxUnavailable }}
+  {{- with .Values.autoscaling.maxUnavailable }}
   maxUnavailable: {{ . }}
   {{- end }}
 {{- end }}

charts/keel-server/values.schema.json → charts/squadron-keel-server/values.schema.json

@@ -28,12 +28,32 @@
           "type": "boolean"
         },
         "maxReplicas": {
-          "default": 5,
+          "default": 9,
           "description": "Maximum replication number",
           "required": [],
           "title": "maxReplicas",
           "type": "integer"
         },
+        "maxUnavailable": {
+          "default": 1,
+          "description": "Maximum unavailablity",
+          "required": [],
+          "title": "maxUnavailable",
+          "type": [
+            "integer",
+            "string"
+          ]
+        },
+        "minAvailable": {
+          "default": "",
+          "description": "Minimum availablity",
+          "required": [],
+          "title": "minAvailable",
+          "type": [
+            "integer",
+            "string"
+          ]
+        },
         "minReplicas": {
           "default": 1,
           "description": "Minimum replication number",
@@ -563,42 +583,6 @@
       "title": "persistence",
       "type": "object"
     },
-    "podDisruptionBudget": {
-      "additionalProperties": false,
-      "description": "Pod disruption budget settings",
-      "properties": {
-        "enabled": {
-          "default": false,
-          "description": "Indicates wether the pod disruption budget is enabled",
-          "required": [],
-          "title": "enabled",
-          "type": "boolean"
-        },
-        "maxUnavailable": {
-          "default": "",
-          "description": "Maximum unavailablity",
-          "required": [],
-          "title": "maxUnavailable",
-          "type": [
-            "integer",
-            "string"
-          ]
-        },
-        "minAvailable": {
-          "default": "",
-          "description": "Minimum availablity",
-          "required": [],
-          "title": "minAvailable",
-          "type": [
-            "integer",
-            "string"
-          ]
-        }
-      },
-      "required": [],
-      "title": "podDisruptionBudget",
-      "type": "object"
-    },
     "ports": {
       "additionalProperties": true,
       "description": "Map of ports to expose\nports:\n  http: 8080",
@@ -930,7 +914,7 @@
         },
         "resources": {
           "additionalProperties": true,
-          "description": "Resouce settings\nSee: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/",
+          "description": "Resource settings",
           "required": [],
           "title": "resources",
           "type": [
@@ -940,7 +924,7 @@
         },
         "startupProbe": {
           "additionalProperties": true,
-          "description": "Startup probe settings",
+          "description": "resources:\n  limits:\n    memory: 256Mi\n  requests:\n    cpu: 1\n    memory: 256Mi\nStartup probe settings",
           "properties": {
             "httpGet": {
               "additionalProperties": false,

charts/keel-server/values.yaml → charts/squadron-keel-server/values.yaml

@@ -440,9 +440,14 @@ server:
   # type: [object, null]
   # additionalProperties: true
   # @schema
-  # -- Resouce settings
-  # -- See: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
+  # -- Resource settings
   resources: {}
+  # resources:
+  #   limits:
+  #     memory: 256Mi
+  #   requests:
+  #     cpu: 1
+  #     memory: 256Mi
   # @schema
   # type: [object, null]
   # additionalProperties: true
@@ -471,27 +476,6 @@ server:
       port: healthz
       path: /healthz/liveness
 
-# @schema
-# type: object
-# @schema
-# -- Pod disruption budget settings
-podDisruptionBudget:
-  # @schema
-  # type: boolean
-  # @schema
-  # -- Indicates wether the pod disruption budget is enabled
-  enabled: false
-  # @schema
-  # type: [integer, string]
-  # @schema
-  # Minimum availablity
-  minAvailable: ''
-  # @schema
-  # type: [integer, string]
-  # @schema
-  # Maximum unavailablity
-  maxUnavailable: ''
-
 # @schema
 # type: object
 # @schema
@@ -511,7 +495,17 @@ autoscaling:
   # type: integer
   # @schema
   # -- Maximum replication number
-  maxReplicas: 5
+  maxReplicas: 9
+  # @schema
+  # type: [integer, string]
+  # @schema
+  # Minimum availablity
+  minAvailable: ''
+  # @schema
+  # type: [integer, string]
+  # @schema
+  # Maximum unavailablity
+  maxUnavailable: 1
   # @schema
   # type: [integer, null]
   # @schema

charts/squadron-nextjs-server/.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/

charts/keel-cronjob/Chart.yaml → charts/squadron-nextjs-server/Chart.yaml

@@ -1,12 +1,12 @@
 apiVersion: v2
 type: application
-name: keel-cronjob
-description: Keel CronJob Chart
+name: squadron-nextjs-server
+description: Squadron NextJS Server Chart
 icon: https://avatars.githubusercontent.com/u/889755?s=200&v=4
 home: https://www.foomo.org
 keywords:
   - foomo
-  - foomo-keel
+  - foomo-squadron
 sources:
   - https://github.com/foomo/helm-charts
 annotations: