diff --git a/charts/base/Chart.yaml b/charts/base/Chart.yaml index 7d76b23..7f12d21 100644 --- a/charts/base/Chart.yaml +++ b/charts/base/Chart.yaml @@ -14,5 +14,5 @@ maintainers: url: https://github.com/jordanopensource/charts/ sources: - https://github.com/jordanopensource/charts/tree/main/charts/base -version: 1.2.1 -appVersion: 1.0.1 +version: 1.3.0 +appVersion: 1.0.0 diff --git a/charts/base/README.md b/charts/base/README.md index a75e547..d9358e3 100644 --- a/charts/base/README.md +++ b/charts/base/README.md @@ -1,6 +1,6 @@ # base -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![AppVersion: 0.1.0](https://img.shields.io/badge/AppVersion-0.1.0-informational?style=flat-square) +![Version: 1.3.0](https://img.shields.io/badge/Version-1.3.0-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square) A general helm chart for any container @@ -10,7 +10,7 @@ A general helm chart for any container | Name | Email | Url | | ---- | ------ | --- | -| Jordan open source association | | | +| JOSA | | | ## Source Code @@ -26,16 +26,21 @@ A general helm chart for any container | nameOverride | string | `""` | | | namespaceOverride | string | `""` | | | workload.affinity | object | `{}` | | +| workload.args | list | `[]` | | | workload.autoscaling.enabled | bool | `false` | | | workload.autoscaling.maxReplicas | int | `100` | | | workload.autoscaling.minReplicas | int | `1` | | | workload.autoscaling.targetCPUUtilizationPercentage | int | `80` | | | workload.autoscaling.targetMemoryUtilizationPercentage | int | `80` | | +| workload.command | list | `[]` | | +| workload.containerPorts[0].containerPort | int | `80` | | +| workload.containerPorts[0].name | string | `"http"` | | +| workload.containerPorts[0].protocol | string | `"TCP"` | | | workload.env | list | `[]` | | | workload.envFrom | list | `[]` | | | workload.image.pullPolicy | string | `"IfNotPresent"` | | -| workload.image.repository | string | `"REPOSITORY_NAME/DOCKER_IMAGE_NAME"` | | -| workload.image.tag | string | `""` | | +| workload.image.repository | string | `"josaorg/whoami"` | | +| workload.image.tag | string | `"latest"` | | | workload.imagePullSecrets | list | `[]` | | | workload.ingress.annotations | object | `{}` | | | workload.ingress.className | string | `""` | | @@ -43,10 +48,10 @@ A general helm chart for any container | workload.ingress.hosts[0].host | string | `"chart-example.local"` | | | workload.ingress.hosts[0].paths[0].path | string | `"/"` | | | workload.ingress.hosts[0].paths[0].pathType | string | `"ImplementationSpecific"` | | +| workload.ingress.servicePort | int | `80` | | | workload.ingress.tls | list | `[]` | | | workload.initContainers | list | `[]` | | -| workload.livenessProbe.httpGet.path | string | `"/"` | | -| workload.livenessProbe.httpGet.port | string | `"http"` | | +| workload.livenessProbe | object | `{}` | | | workload.nodeAffinityPreset.key | string | `""` | | | workload.nodeAffinityPreset.type | string | `""` | | | workload.nodeAffinityPreset.values | list | `[]` | | @@ -70,20 +75,24 @@ A general helm chart for any container | workload.podAntiAffinityPreset | string | `"soft"` | | | workload.podLabels | object | `{}` | | | workload.podSecurityContext | object | `{}` | | -| workload.readinessProbe.httpGet.path | string | `"/"` | | -| workload.readinessProbe.httpGet.port | string | `"http"` | | +| workload.readinessProbe | object | `{}` | | | workload.replicaCount | int | `1` | | | workload.resources | object | `{}` | | | workload.resourcesPreset | string | `"micro"` | | | workload.securityContext | object | `{}` | | | workload.service.annotations | object | `{}` | | -| workload.service.port | int | `3000` | | +| workload.service.create | bool | `true` | | +| workload.service.ports[0].name | string | `"http"` | | +| workload.service.ports[0].port | int | `80` | | +| workload.service.ports[0].protocol | string | `"TCP"` | | +| workload.service.ports[0].targetPort | int | `80` | | | workload.service.type | string | `"ClusterIP"` | | | workload.serviceAccount.annotations | object | `{}` | | | workload.serviceAccount.automount | bool | `true` | | | workload.serviceAccount.create | bool | `true` | | | workload.serviceAccount.name | string | `""` | | | workload.sideCars | list | `[]` | | +| workload.startupProbe | object | `{}` | | | workload.tolerations | list | `[]` | | | workload.type | string | `"Deployment"` | | | workload.volumeMounts | list | `[]` | | diff --git a/charts/base/templates/application.yaml b/charts/base/templates/application.yaml index 2d276c5..a493d1a 100644 --- a/charts/base/templates/application.yaml +++ b/charts/base/templates/application.yaml @@ -69,6 +69,9 @@ spec: {{- if .Values.workload.containerPorts }} ports: {{- include "base.tplvalues.render" (dict "value" .Values.workload.containerPorts "context" $) | nindent 12 }} {{- end }} + {{- if .Values.workload.startupProbe }} + startupProbe: {{- include "base.tplvalues.render" (dict "value" .Values.workload.startupProbe "context" $) | nindent 12 }} + {{- end }} {{- if .Values.workload.livenessProbe }} livenessProbe: {{- include "base.tplvalues.render" (dict "value" .Values.workload.livenessProbe "context" $) | nindent 12 }} {{- end }} diff --git a/charts/base/values.yaml b/charts/base/values.yaml index 95200fb..3c66898 100644 --- a/charts/base/values.yaml +++ b/charts/base/values.yaml @@ -170,18 +170,17 @@ workload: # cpu: 100m # memory: 128Mi + ## @param workload.startupProbe define the startupProbe for the pod + ## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/ + startupProbe: {} + ## @param workload.livenessProbe define the livenessProbe for the pod ## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/ - livenessProbe: - httpGet: - path: / - port: http + livenessProbe: {} + ## @param workload.readinessProbe define the readinessProbe for the pod ## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/ - readinessProbe: - httpGet: - path: / - port: http + readinessProbe: {} ## Autoscaling parameters autoscaling: