ci: use oci

.drone.yml

@@ -6,16 +6,17 @@ name: default
 trigger:
   event:
   - push
+  - tag
 
 steps:
 - name: release
-    image: cr.grachevko.ru/drone/helm:RELEASE.2023-03-01T13-46-55Z
+  image: cr.grachevko.ru/drone/helm:24
   settings:
+    tag: ${DRONE_TAG}
     username:
       from_secret: HELM_REPO_USERNAME
     password:
       from_secret: HELM_REPO_PASSWORD
   when:
-      branch:
-        - master
-        - rc
+    event:
+    - tag

.helmignore

@@ -27,3 +27,6 @@ starter/
 gcloud_auth_key.json
 create.sh
 README.md
+
+# Ci
+.drone.yml

README.md

@@ -1,38 +1,3 @@
-# Common: The Helm Helper Chart
-
-This chart was originally forked from [`incubator/common`](https://github.com/helm/charts/tree/master/incubator/common), which is designed to make it easier for you to build and maintain Helm charts.
-
-It provides utilities that reflect best practices of Kubernetes chart development, making it faster for you to write charts.
-
-## Contents
-
-- [Getting Started](#getting-started)
-  - [Adding Repository](#adding-repository)
-  - [Adding Dependency](#adding-dependency)
-  - [Using Starter](#using-starter)
-- [Resource Kinds](#resource-kinds)
-  - [`common.configMap`](#commonconfigmap)
-  - [`common.cronJob`](#commoncronjob)
-  - [`common.deployment`](#commondeployment)
-  - [`common.hpa`](#commonhpa)
-  - [`common.ingress`](#commoningress)
-  - [`common.pdb`](#commonpdb)
-  - [`common.secret`](#commonsecret)
-  - [`common.service`](#commonservice)
-  - [`common.serviceAccount`](#commonserviceaccount)
-  - [`common.serviceMonitor`](#commonservicemonitor)
-  - [`common.serviceMonitor.secret`](#commonservicemonitorsecret)
-- [Partial Objects](#partial-objects)
-  - [`common.chart`](#commonchart)
-  - [`common.container`](#commoncontainer)
-  - [`common.fullname`](#commonfullname)
-  - [`common.labels`](#commonlabels)
-  - [`common.metadata`](#commonmetadata)
-  - [`common.name`](#commonname)
-  - [`common.pod.template`](#commonpodtemplate)
-  - [`common.selectorLabels`](#commonselectorlabels)
-  - [`common.serviceAccountName`](#commonserviceaccountname)
-
 ## Getting Started
 
 ### Adding Repository
@@ -54,7 +19,8 @@ dependencies:
     repository: https://harbor.grachevko.ru/chartrepo/helm
 ```
 
-Once you have defined dependencies, you should run the following command to download this chart into your `charts/` directory:
+Once you have defined dependencies, you should run the following command to download this chart into your `charts/`
+directory:
 
 ```shell
 $ helm dep build
@@ -66,701 +32,12 @@ The best way to get started is to use the [`create` script](create.sh) to genera
 
 You can fetch that script, and then execute it locally:
 
-```shell
-$ curl -fsSL -o create.sh https://git.grachevko.ru/helm/common/raw/branch/master/create.sh
-$ chmod 700 create.sh
-$ ./create.sh mychart
-```
-
-or simply
-
 ```shell
 $ curl https://git.grachevko.ru/helm/common/raw/branch/master/create.sh | bash -s -- mychart
 ```
 
 Now, there is a chart in `./mychart`. You can edit it and create your own templates.
 
-## Resource Kinds
-
-Kubernetes defines a variety of resource kinds, from `Secret` to `StatefulSet`. We define some of the most common kinds in a way that lets you easily work with them.
-
-The resource kind templates are designed to make it much faster for you to define _basic_ versions of these resources. They allow you to extend and modify just what you need, without having to copy around lots of boilerplate.
-
-To make use of these templates you must define a template that will extend the base template (though it can be empty). The name of this template is then passed to the base template, for example:
-
-```yaml
-{{- include "common.service" (list . .Values.service "mychart.service") }}
-{{- define "mychart.service" -}}
-## Define overrides for your Service resource here, e.g.
-# metadata:
-#   labels:
-#     custom: label
-# spec:
-#   ports:
-#   - port: 8080
-#     targetPort: http
-#     protocol: TCP
-#     name: http
-{{- end }}
-```
-
-Note that the [`common.service`](#commonservice) template defines three parameters:
-
-- The root context (usually `.`)
-- A dictionary of values which are used in the template
-- A optional template name containing the service definition overrides
-
-A limitation of the Go template library is that a template can only take a single argument. The `list` function is used to workaround this by constructing a list or array of arguments that is passed to the template.
-
-The [`common.service`](#commonservice) template is responsible for rendering the templates with the root context and merging any overrides. As you can see, this makes it very easy to create a basic `Service` resource without having to copy around the standard metadata and labels.
-
-Each implemented base resource is described in greater detail below.
-
-### `common.configMap`
-
-The `common.configMap` template accepts a list of two values:
-
-- `$top`, the top context
-- [optional] the template name of the overrides
-
-It creates an empty `ConfigMap` resource that you can override with your configuration.
-
-Example use:
-
-```yaml
-{{- include "common.configMap" (list . "mychart.configMap") }}
-{{- define "mychart.configMap" -}}
-data:
-  zeus: cat
-  athena: cat
-  julius: cat
-  one: |-
-    {{ .Files.Get "file1.txt" }}
-{{- end }}
-```
-
-Output:
-
-```yaml
-apiVersion: v1
-data:
-  athena: cat
-  julius: cat
-  one: This is a file.
-  zeus: cat
-kind: ConfigMap
-metadata:
-  labels:
-    app.kubernetes.io/instance: release-name
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/name: mychart
-    app.kubernetes.io/version: 1.16.0
-    helm.sh/chart: mychart-0.1.0
-  name: release-name-mychart
-```
-
-### `common.cronJob`
-
-The `common.cronJob` template accepts a list of five values:
-
-- `$top`, the top context
-- `$cronJob`, a dictionary of values used in the cronjob template
-- `$pod`, a dictionary of values used in the pod template
-- `$serviceAccount`, a dictionary of values used in the service account template
-- [optional] the template name of the overrides
-
-It defines a basic `CronJob` with the following defaults:
-
-- Labels of `JobTemplate` are defined with [`common.selectorLabels`](#commonselectorlabels) as this is also used as the selector.
-- Restart policy of pod is set to `OnFailure`
-
-In addition, it uses the following configuration from the `$cronJob`:
-
-| Value                                 | Description                                             |
-| ------------------------------------- | ------------------------------------------------------- |
-| `$cronJob.schedule`                   | Schedule for the cronjob                                |
-| `$cronJob.concurrencyPolicy`          | [optional] `Allow\|Forbid\|Replace` concurrent jobs     |
-| `$cronJob.failedJobsHistoryLimit`     | [optional] Specify the number of failed jobs to keep    |
-| `$cronJob.successfulJobsHistoryLimit` | [optional] Specify the number of completed jobs to keep |
-| `$cronJob.suspend`                    | [optional] Specify cronjob is suspend, default false    |
-| `$cronJob.activeDeadlineSeconds`      | [optional] Specify cronjob activeDeadlineSeconds        |
-
-Underneath the hood, it invokes [`common.pod.template`](#commonpodtemplate) template with `$pod` to populate the `PodTemplate`.
-
-Example use:
-
-```yaml
-{
-  {
-    - include "common.cronJob" (list . .Values.cronJob .Values .Values.serviceAccount),
-  },
-}
-## The following is the same as above:
-# {{- include "common.cronJob" (list . .Values.cronJob .Values .Values.serviceAccount "mychart.cronJob") }}
-# {{- define "mychart.cronJob" -}}
-# {{- end }}
-```
-
-### `common.deployment`
-
-The `common.deployment` template accepts a list of five values:
-
-- `$top`, the top context
-- `$deployment`, a dictionary of values used in the deployment template
-- `$autoscaling`, a dictionary of values used in the hpa template
-- `$serviceAccount`, a dictionary of values used in the service account template
-- [optional] the template name of the overrides
-
-It defines a basic `Deployment` with the following settings:
-
-| Value                            | Description                                                                |
-| -------------------------------- | -------------------------------------------------------------------------- |
-| `$deployment.replicaCount`       | Number of replica. If autoscaling enabled, this field will be ignored      |
-| `$deployment.imagePullSecrets`   | [optional] Name of Secret resource containing private registry credentials |
-| `$deployment.podSecurityContext` | [optional] Security options for pod                                        |
-| `$deployment.nodeSelector`       | [optional] Node labels for pod assignment                                  |
-| `$deployment.affinity`           | [optional] Expressions for affinity                                        |
-| `$deployment.tolerations`        | [optional] Toleration labels for pod assignment                            |
-| `$autoscaling.enabled`           | [optional] Set this to `true` to enable autoscaling                        |
-
-Underneath the hood, it invokes [`common.pod.template`](#commonpodtemplate) template with `$deployment` to populate the `PodTemplate`.
-
-Example use:
-
-```yaml
-{
-  {
-    - include "common.deployment" (list . .Values .Values.autoscaling .Values.serviceAccount),
-  },
-}
-## The following is the same as above:
-# {{- include "common.deployment" (list . .Values .Values.autoscaling .Values.serviceAccount "mychart.deployment") }}
-# {{- define "mychart.deployment" -}}
-# {{- end }}
-```
-
-### `common.hpa`
-
-The `common.hpa` template accepts a list of three values:
-
-- `$top`, the top context
-- `$autoscaling`, a dictionary of values used in the hpa template
-- [optional] the template name of the overrides
-
-It creates a basic `HorizontalPodAutoscaler` resource with the following defaults:
-
-- The name of scaled target is set with [`common.fullname`](#commonfullname)
-
-An example values file that can be used to configure the `HorizontalPodAutoscaler` resource is:
-
-```yaml
-autoscaling:
-  enabled: true
-  minReplicas: 3
-  maxReplicas: 5
-  cpuUtilizationPercentage: 50
-  memoryUtilizationPercentage: 90
-```
-
-Example use:
-
-```yaml
-{ { - include "common.hpa" (list . .Values.autoscaling) } }
-## The following is the same as above:
-# {{- include "common.hpa" (list . .Values.autoscaling "mychart.hpa") }}
-# {{- define "mychart.hpa" -}}
-# {{- end }}
-```
-
-Output:
-
-```yaml
-apiVersion: autoscaling/v2beta2
-kind: HorizontalPodAutoscaler
-metadata:
-  labels:
-    app.kubernetes.io/instance: release-name
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/name: mychart
-    app.kubernetes.io/version: 1.16.0
-    helm.sh/chart: mychart-0.1.0
-  name: release-name-mychart
-spec:
-  maxReplicas: 5
-  metrics:
-    - resource:
-        name: cpu
-        target:
-          averageUtilization: 50
-          type: Utilization
-      type: Resource
-    - resource:
-        name: memory
-        target:
-          averageUtilization: 90
-          type: Utilization
-      type: Resource
-  minReplicas: 3
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: release-name-mychart
-```
-
-### `common.ingress`
-
-The `common.ingress` template accepts a list of four values:
-
-- `$top`, the top context
-- `$ingress`, a dictionary of values used in the ingress template
-- `$service`, a dictionary of values used in the service template
-- [optional] the template name of the overrides
-
-It is designed to give you a well-defined `Ingress` resource, that can be configured using `$ingress`. An example values file that can be used to configure the `Ingress` resource is:
-
-```yaml
-ingress:
-  enabled: true
-  annotations:
-    kubernetes.io/ingress.class: nginx
-    kubernetes.io/tls-acme: "true"
-  hosts:
-    - host: chart-example.local
-      paths:
-        - path: /path/to/somewhere
-          pathType: ImplementationSpecific
-  tls:
-    - secretName: chart-example-tls
-      hosts:
-        - chart-example.local
-service:
-  type: ClusterIP
-  port: 80
-```
-
-Example use:
-
-```yaml
-{ { - include "common.ingress" (list . .Values.ingress .Values.service) } }
-## The following is the same as above:
-# {{- include "common.ingress" (list . .Values.ingress .Values.service "mychart.ingress") }}
-# {{- define "mychart.ingress" -}}
-# {{- end }}
-```
-
-Output:
-
-```yaml
-apiVersion: networking.k8s.io/v1beta1
-kind: Ingress
-metadata:
-  annotations:
-    kubernetes.io/ingress.class: nginx
-    kubernetes.io/tls-acme: "true"
-  labels:
-    app.kubernetes.io/instance: release-name
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/name: mychart
-    app.kubernetes.io/version: 1.16.0
-    helm.sh/chart: mychart-0.1.0
-  name: release-name-mychart
-spec:
-  rules:
-    - host: "chart-example.local"
-      http:
-        paths:
-          - backend:
-              service:
-                name: release-name-mychart
-                port:
-                  number: 80
-            path: /path/to/somewhere
-            pathType: ImplementationSpecific
-  tls:
-    - hosts:
-        - "chart-example.local"
-      secretName: chart-example-tls
-```
-
-### `common.pdb`
-
-The `common.pdb` template accepts a list of five values:
-
-- `$top`, the top context
-- `$pdb`, a dictionary of values used in the hpa template
-- `$deployment`, a dictionary of values used in the deployment template
-- `$autoscaling`, a dictionary of values used in the hpa template
-- [optional] the template name of the overrides
-
-It creates a basic `PodDisruptionBudget` resource with the following defaults:
-
-- Selector is set with [`common.selectorLabels`](#commonselectorlabels) to match the default used in the `Pod` resource
-
-An example values file that can be used to configure the `PodDisruptionBudget` resource is:
-
-```yaml
-podDisruptionBudget:
-  ## You can specify only one of maxUnavailable and minAvailable in a single PodDisruptionBudget
-  minAvailable: 2
-  # maxUnavailable: 1
-```
-
-Example use:
-
-```yaml
-{
-  {
-    - include "common.pdb" (list . .Values.podDisruptionBudget .Values .Values.autoscaling),
-  },
-}
-## The following is the same as above:
-# {{- include "common.pdb" (list . .Values.podDisruptionBudget .Values .Values.autoscaling "mychart.pdb") }}
-# {{- define "mychart.pdb" -}}
-# {{- end }}
-```
-
-Output:
-
-```yaml
-apiVersion: policy/v1beta1
-kind: PodDisruptionBudget
-metadata:
-  labels:
-    app.kubernetes.io/instance: release-name
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/name: mychart
-    app.kubernetes.io/version: 1.16.0
-    helm.sh/chart: mychart-0.1.0
-  name: release-name-mychart
-spec:
-  minAvailable: 2
-  selector:
-    matchLabels:
-      app.kubernetes.io/instance: release-name
-      app.kubernetes.io/name: mychart
-```
-
-### `common.secret`
-
-The `common.secret` template accepts a list of two values:
-
-- `$top`, the top context
-- [optional] the template name of the overrides
-
-It creates an empty `Secret` resource that you can override with your secrets.
-
-Example use:
-
-```yaml
-{{- include "common.secret" (list . "mychart.secret") }}
-{{- define "mychart.secret" -}}
-data:
-  zeus: {{ print "cat" | b64enc }}
-  athena: {{ print "cat" | b64enc }}
-  julius: {{ print "cat" | b64enc }}
-  one: |-
-    {{ .Files.Get "file1.txt" | b64enc }}
-{{- end }}
-```
-
-Output:
-
-```yaml
-apiVersion: v1
-data:
-  athena: Y2F0
-  julius: Y2F0
-  one: VGhpcyBpcyBhIGZpbGUuCg==
-  zeus: Y2F0
-kind: Secret
-metadata:
-  labels:
-    app.kubernetes.io/instance: release-name
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/name: mychart
-    app.kubernetes.io/version: 1.16.0
-    helm.sh/chart: mychart-0.1.0
-  name: release-name-mychart
-type: Opaque
-```
-
-### `common.service`
-
-The `common.service` template accepts a list of three values:
-
-- `$top`, the top context
-- `$service`, a dictionary of values used in the service template
-- [optional] the template name of the overrides
-
-It creates a basic `Service` resource with the following defaults:
-
-- Service type (ClusterIP, NodePort, LoadBalancer) made configurable by `$service.type`
-- Named port `http` configured on port `$service.port`
-- Selector set with [`common.selectorLabels`](#commonselectorlabels) to match the default used in the `Deployment` resource
-
-Example template:
-
-```yaml
-{{- include "common.service" (list . .Values.service "mychart.mail.service") }}
-{{- define "mychart.mail.service" -}}
-{{- $top := first . }}
-metadata:
-  name: {{ include "common.fullname" $top }}-mail # overrides the default name to add a suffix
-  labels:                                         # appended to the labels section
-    protocol: mail
-spec:
-  ports:                                          # composes the `ports` section of the service definition.
-  - name: smtp
-    port: 25
-    targetPort: 25
-  - name: imaps
-    port: 993
-    targetPort: 993
-  selector:                                       # this is appended to the default selector
-    protocol: mail
-{{- end }}
----
-{{ include "common.service" (list . .Values.service "mychart.web.service") }}
-{{- define "mychart.web.service" -}}
-{{- $top := first . }}
-metadata:
-  name: {{ include "common.fullname" $top }}-www  # overrides the default name to add a suffix
-  labels:                                         # appended to the labels section
-    protocol: www
-spec:
-  ports:                                          # composes the `ports` section of the service definition.
-  - name: www
-    port: 80
-    targetPort: 8080
-{{- end }}
-```
-
-The above template defines _two_ services: a web service and a mail service.
-
-The most important part of a service definition is the `ports` object, which defines the ports that this service will listen on. Most of the time, `selector` is computed for you. But you can replace it or add to it.
-
-The output of the example above is:
-
-```yaml
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app.kubernetes.io/instance: release-name
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/name: mychart
-    app.kubernetes.io/version: 1.16.0
-    helm.sh/chart: mychart-0.1.0
-    protocol: www
-  name: release-name-mychart-www
-spec:
-  ports:
-    - name: www
-      port: 80
-      targetPort: 8080
-  selector:
-    app.kubernetes.io/instance: release-name
-    app.kubernetes.io/name: mychart
-  type: ClusterIP
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app.kubernetes.io/instance: release-name
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/name: mychart
-    app.kubernetes.io/version: 1.16.0
-    helm.sh/chart: mychart-0.1.0
-    protocol: mail
-  name: release-name-mychart-mail
-spec:
-  ports:
-    - name: smtp
-      port: 25
-      targetPort: 25
-    - name: imaps
-      port: 993
-      targetPort: 993
-  selector:
-    app.kubernetes.io/instance: release-name
-    app.kubernetes.io/name: mychart
-    protocol: mail
-  type: ClusterIP
-```
-
-### `common.serviceAccount`
-
-The `common.serviceAccount` template accepts a list of three values:
-
-- `$top`, the top context
-- `$serviceAccount`, a dictionary of values used in the service account template
-- [optional] the template name of the overrides
-
-It creates a basic `ServiceAccount` resource with the following defaults:
-
-- The name is set with [`common.serviceAccountName`](#commonserviceaccountname)
-- Lays out the annotations using `$serviceAccount.annotations`
-
-An example values file that can be used to configure the `ServiceAccount` resource is:
-
-```yaml
-serviceAccount:
-  create: true
-  annotations: {}
-  name:
-```
-
-Example use:
-
-```yaml
-{ { - include "common.serviceAccount" (list . .Values.serviceAccount) } }
-## The following is the same as above:
-# {{- include "common.serviceAccount" (list . .Values.serviceAccount "mychart.serviceAccount") }}
-# {{- define "mychart.serviceAccount" -}}
-# {{- end }}
-```
-
-Output:
-
-```yaml
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  labels:
-    app.kubernetes.io/instance: release-name
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/name: mychart
-    app.kubernetes.io/version: 1.16.0
-    helm.sh/chart: mychart-0.1.0
-  name: release-name-mychart
-```
-
-### `common.serviceMonitor`
-
-The `common.serviceMonitor` template accepts a list of three values:
-
-- `$top`, the top context
-- `$serviceMonitor`, a dictionary of values used in the service account template
-- [optional] the template name of the overrides
-
-It creates a basic `ServiceMonitor` resource with the following defaults:
-
-- Namespace selector is set to the release namespace
-- Selector is set with [`common.selectorLabels`](#commonselectorlabels) to match the default used in the `Service` resource
-
-An example values file that can be used to configure the `ServiceMonitor` resource is:
-
-```yaml
-serviceMonitor:
-  enabled: true
-  namespace: monitoring
-  port: 80
-  path: /path/to/metrics
-  interval: 30s
-  scrapeTimeout: 30s
-  basicAuth:
-    enabled: true
-    username: administrator
-    password: password
-```
-
-Example use:
-
-```yaml
-{ { - include "common.serviceMonitor" (list . .Values.serviceMonitor) } }
-## The following is the same as above:
-# {{- include "common.serviceMonitor" (list . .Values.serviceMonitor "mychart.serviceMonitor") }}
-# {{- define "mychart.serviceMonitor" -}}
-# {{- end }}
-```
-
-Output:
-
-```yaml
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  labels:
-    app.kubernetes.io/instance: release-name
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/name: mychart
-    app.kubernetes.io/version: 1.16.0
-    helm.sh/chart: mychart-0.1.0
-  name: release-name-mychart
-  namespace: monitoring
-spec:
-  endpoints:
-    - basicAuth:
-        password:
-          key: password
-          name: release-name-mychart
-        username:
-          key: username
-          name: release-name-mychart
-      interval: 30s
-      path: /path/to/metrics
-      port: 80
-      scrapeTimeout: 30s
-  namespaceSelector:
-    matchNames:
-      - default
-  selector:
-    matchLabels:
-      app.kubernetes.io/instance: release-name
-      app.kubernetes.io/name: mychart
-```
-
-### `common.serviceMonitor.secret`
-
-The `common.serviceMonitor.secret` template accepts a list of three values:
-
-- `$top`, the top context
-- `$serviceMonitor`, a dictionary of values used in the service account template
-- [optional] the template name of the overrides
-
-It creates a `Secret` resource contains the BasicAuth information for the `ServiceMonitor`.
-
-An example `values.yaml` for your `ServiceMonitor` could look like:
-
-```yaml
-serviceMonitor:
-  basicAuth:
-    enabled: true
-    username: administrator
-    password: password
-```
-
-Example use:
-
-```yaml
-{ { - include "common.serviceMonitor.secret" (list . .Values.serviceMonitor) } }
-## The following is the same as above:
-# {{- include "common.serviceMonitor.secret" (list . .Values.serviceMonitor "mychart.serviceMonitor.secret") }}
-# {{- define "mychart.serviceMonitor.secret" -}}
-# {{- end }}
-```
-
-Output:
-
-```yaml
-apiVersion: v1
-data:
-  password: cGFzc3dvcmQ=
-  username: YWRtaW5pc3RyYXRvcg==
-kind: Secret
-metadata:
-  labels:
-    app.kubernetes.io/instance: release-name
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/name: mychart
-    app.kubernetes.io/version: 1.16.0
-    helm.sh/chart: mychart-0.1.0
-  name: release-name-mychart
-  namespace: monitoring
-type: Opaque
-```
-
 ## Partial Objects
 
 When writing Kubernetes resources, you may find the following helpers useful to construct parts of the spec.
@@ -783,151 +60,17 @@ helm.sh/chart: foo-1.2.3-beta.55_1234
 
 (Note that `+` is an illegal character in label values)
 
-### `common.container`
-
-The `common.container` template accepts a list of three values:
-
-- `$top`, the top context
-- `$container`, a dictionary of values used in the container template
-- [optional] the template name of the overrides
-
-It creates a basic `Container` spec to be used within a `Deployment` or `CronJob`. It holds the following defaults:
-
-- The name is set to the chart name
-- Uses `$container.image` to describe the image to run, with the following spec:
-  ```yaml
-  image:
-    repository: nginx
-    tag: stable
-    pullPolicy: IfNotPresent
-  ```
-- Lays out the security options using `$container.securityContext`
-- Lays out the compute resources using `$container.resources`
-
-Example use:
-
-```yaml
-{{- include "common.deployment" (list . .Values .Values.autoscaling "mychart.deployment") }}
-{{- define "mychart.deployment" -}}
-## Define overrides for your Deployment resource here, e.g.
-{{- $top := first . }}
-{{- $deployment := index . 1 }}
-spec:
-  template:
-    spec:
-      containers:
-      - {{- include "common.container" (list $top $deployment "mychart.deployment.container") | nindent 8 }}
-{{- end }}
-{{- define "mychart.deployment.container" -}}
-## Define overrides for your Container here, e.g.
-ports:
-- name: http
-  containerPort: 80
-  protocol: TCP
-livenessProbe:
-  httpGet:
-    path: /
-    port: http
-readinessProbe:
-  httpGet:
-    path: /
-    port: http
-{{- end }}
-```
-
-The above example creates a `Deployment` resource which makes use of the `common.container` template to populate the `PodSpec`'s container list. The usage of this template is similar to the other resources, you must define and reference a template that contains overrides for the container object.
-
-The most important part of a container definition is the image you want to run. As mentioned above, this is derived from `$container.image` by default. It is a best practice to define the image, tag and pull policy in your charts' values as this makes it easy for an operator to change the image registry, or use a specific tag or version. Another example of configuration that should be exposed to chart operators is the container's required compute resources, as this is also very specific to an operators environment. An example `values.yaml` for your chart could look like:
-
-```yaml
-replicaCount: 1
-image:
-  repository: nginx
-  tag: stable
-  pullPolicy: IfNotPresent
-securityContext:
-  capabilities:
-    drop:
-      - ALL
-  readOnlyRootFilesystem: true
-  runAsNonRoot: true
-  runAsUser: 1000
-resources:
-  limits:
-    cpu: 100m
-    memory: 128Mi
-  requests:
-    cpu: 100m
-    memory: 128Mi
-```
-
-The output of running the above values through the earlier template is:
-
-```yaml
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app.kubernetes.io/instance: release-name
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/name: mychart
-    app.kubernetes.io/version: 1.16.0
-    helm.sh/chart: mychart-0.1.0
-  name: release-name-mychart
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app.kubernetes.io/instance: release-name
-      app.kubernetes.io/name: mychart
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/instance: release-name
-        app.kubernetes.io/name: mychart
-    spec:
-      containers:
-        - image: nginx:stable
-          imagePullPolicy: IfNotPresent
-          livenessProbe:
-            httpGet:
-              path: /
-              port: http
-          name: mychart
-          ports:
-            - containerPort: 80
-              name: http
-              protocol: TCP
-          readinessProbe:
-            httpGet:
-              path: /
-              port: http
-          resources:
-            limits:
-              cpu: 100m
-              memory: 128Mi
-            requests:
-              cpu: 100m
-              memory: 128Mi
-          securityContext:
-            capabilities:
-              drop:
-                - ALL
-            readOnlyRootFilesystem: true
-            runAsNonRoot: true
-            runAsUser: 1000
-      serviceAccountName: release-name-mychart
-```
-
 ### `common.fullname`
 
-The `common.fullname` template generates a name suitable for the `name:` field in Kubernetes metadata. It is used like this:
+The `common.fullname` template generates a name suitable for the `name:` field in Kubernetes metadata. It is used like
+this:
 
 ```yaml
 name: { { include "common.fullname" . } }
 ```
 
-This prints the value of `{{ .Release.Name }}-{{ .Chart.Name }}` by default, but can be overridden with `.Values. fullnameOverride`:
+This prints the value of `{{ .Release.Name }}-{{ .Chart.Name }}` by default, but can be overridden
+with `.Values. fullnameOverride`:
 
 ```yaml
 fullnameOverride: some-name
@@ -1002,7 +145,8 @@ metadata:
   name: release-name-mychart
 ```
 
-Most of the common templates that define a resource type (e.g. `common.configMap` or `common.cronJob`) use this to generate the metadata, which means they inherit the same `labels` and `name` fields.
+Most of the common templates that define a resource type (e.g. `common.configMap` or `common.cronJob`) use this to
+generate the metadata, which means they inherit the same `labels` and `name` fields.
 
 ### `common.name`
 
@@ -1032,35 +176,6 @@ app.kubernetes.io/name: mychart
 
 Output of this function is truncated at 63 characters, which is the maximum length of name.
 
-### `common.pod.template`
-
-The `common.pod.template` template accepts a list of four values:
-
-- `$top`, the top context
-- `$pod`, a dictionary of values used in the container template
-- `$serviceAccount`, a dictionary of values used in the service account template
-- [optional] the template name of the overrides
-
-It creates a basic `PodTemplate` spec to be used within a `Deployment` or `CronJob`. It holds the following defaults:
-
-- Labels are defined with [`common.selectorLabels`](#commonselectorlabels) as this is also used as the selector.
-- Service account name is set with [`common.serviceAccountName`](#commonserviceaccountname)
-
-It also uses the following configuration from the `$pod`:
-
-| Value                     | Description                                              |
-| ------------------------- | -------------------------------------------------------- |
-| `$pod.imagePullSecrets`   | Names of secrets containing private registry credentials |
-| `$pod.podAnnotations`     | Pod annotations                                          |
-| `$pod.podSecurityContext` | Security options                                         |
-| `$pod.nodeSelector `      | Node labels for pod assignment                           |
-| `$pod.affinity `          | Expressions for affinity                                 |
-| `$pod.tolerations `       | Toleration labels for pod assignment                     |
-| `$pod.podLabels`          | Pod extra labels                                         |
-| `$pod.priorityClassName`  | Pod priorityClassName                                    |
-
-Underneath the hood, it invokes [`common.container`](#commoncontainer) template with `$pod` to populate the `PodSpec`'s container list.
-
 ### `common.selectorLabels`
 
 `common.selectorLabels` prints the standard set of selector labels.
@@ -1077,44 +192,3 @@ Example output:
 app.kubernetes.io/instance: release-name
 app.kubernetes.io/name: mychart
 ```
-
-### `common.serviceAccountName`
-
-The `common.serviceAccountName` template accepts a list of two values:
-
-- `$top`, the top context
-- `$serviceAccount`, a dictionary of values used in the service account template
-
-It generates a name suitable for the `serviceAccountName` field of a `Pod` resource.
-
-Example usage:
-
-```
-serviceAccountName: {{ include "common.serviceAccountName" . .Values.serviceAccount }}
-```
-
-The following values can influence the output:
-
-```yaml
-serviceAccount:
-  create: true
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: some-name
-```
-
-Example output:
-
-```yaml
----
-# with the values above
-serviceAccountName: some-name
-
----
-# if serviceAccount.name is not set, the value will be the same as "common.fullname"
-serviceAccountName: release-name-mychart
-
----
-# if serviceAccount.create is false, the value will be "default"
-serviceAccountName: default
-```

starter/.helmignore

@@ -21,3 +21,5 @@
 .idea/
 *.tmproj
 .vscode/
+# CI
+.drone.yml

starter/templates/NOTES.txt

@@ -1,3 +1,7 @@
+CHART NAME: {{ .Chart.Name  }}
+CHART VERSION: {{ .Chart.Version  }}
+APP VERSION: {{ .Chart.AppVersion  }}
+
 1. Get the application URL by running these commands:
 {{- if .Values.ingress.enabled }}
 {{- range $host := .Values.ingress.hosts }}

starter/templates/configmap.yaml

@@ -1,4 +1,12 @@
-{{- include "common.configMap" (list . "<CHARTNAME>.configMap") }}
-{{- define "<CHARTNAME>.configMap" -}}
-data: {}
+{{- if not .Values.existingConfigmap }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "common.fullname" . }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+data:
+  {{- if .Values.config.debug }}
+  DEBUG: true
+  {{- end }}
 {{- end }}

starter/templates/deployment.yaml

@@ -1,26 +1,85 @@
-{{/* vim: set filetype=mustache: */}}
-
-{{- include "common.deployment" (list . .Values .Values.autoscaling .Values.serviceAccount "<CHARTNAME>.deployment") }}
-
-{{- define "<CHARTNAME>.deployment" -}}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "common.fullname" . }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
 spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      {{- include "common.selectorLabels" . | nindent 6 }}
   template:
-    spec:
-      containers:
-      - {{- include "common.container" (append . "<CHARTNAME>.container") | nindent 8 }}
+    metadata:
+      annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+        checksum/secret: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
+      {{- with .Values.podAnnotations }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "common.selectorLabels" . | nindent 8 }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      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 }}
+        envFrom:
+          {{- if .Values.existingConfigmap }}
+        - configMapRef:
+            name: {{ .Values.existingConfigmap }}
+          {{- else }}
+        - configMapRef:
+            name: {{ include "common.fullname" . }}
+          {{- end }}
+          {{- if .Values.existingSecret }}
+        - secretRef:
+            name: {{ .Values.existingSecret }}
+          {{- else }}
+        - secretRef:
+            name: {{ include "common.fullname" . }}
+          {{- end }}
+          {{- if .Values.extraEnvVarsSecret }}
+        - secretRef:
+            name: {{ .Values.extraEnvVarsSecret }}
           {{- end }}
-
-{{- define "<CHARTNAME>.container" -}}
         ports:
         - name: http
-    containerPort: 80
+          containerPort: 5678
           protocol: TCP
         livenessProbe:
           httpGet:
-    path: /
+            path: /healthz
             port: http
         readinessProbe:
           httpGet:
-    path: /
+            path: /healthz
             port: http
+        startupProbe:
+          httpGet:
+            path: /healthz
+            port: http
+          failureThreshold: 30
+          periodSeconds: 10
+        resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
       {{- end }}

starter/templates/hpa.yaml

@@ -1,3 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-
-{{- include "common.hpa" (list . .Values.autoscaling) -}}

starter/templates/ingress.yaml

@@ -1,3 +1,41 @@
-{{/* vim: set filetype=mustache: */}}
-
-{{- include "common.ingress" (list . .Values.ingress .Values.service) }}
+{{- if .Values.ingress.enabled -}}
+{{- $fullName := include "common.fullname" . -}}
+{{- $svcPort := .Values.service.port -}}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ $fullName }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  ingressClassName: {{ .Values.ingress.className }}
+  {{- 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 }}
+        pathType: {{ default "ImplementationSpecific" .pathType }}
+        backend:
+          service:
+            name: {{ $fullName }}
+            port:
+              number: {{ $svcPort }}
+          {{- end }}
+    {{- end }}
+{{- end }}

starter/templates/secret.yaml

@@ -1,4 +0,0 @@
-{{- include "common.secret" (list . "<CHARTNAME>.secret") }}
-{{- define "<CHARTNAME>.secret" -}}
-data: {}
-{{- end }}

starter/templates/secrets.yaml

@@ -0,0 +1,10 @@
+{{- if not .Values.existingSecret }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "common.fullname" . }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+type: Opaque
+data: {}
+{{- end }}

starter/templates/service.yaml

@@ -1,3 +1,15 @@
-{{/* vim: set filetype=mustache: */}}
-
-{{- include "common.service" (list . .Values.service) }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "common.fullname" . }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+  - port: {{ .Values.service.port }}
+    targetPort: http
+    protocol: TCP
+    name: http
+  selector:
+    {{- include "common.selectorLabels" . | nindent 4 }}

starter/templates/serviceaccount.yaml

@@ -1,3 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-
-{{- include "common.serviceAccount" (list . .Values.serviceAccount) }}

starter/values.yaml

@@ -2,9 +2,17 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+config: {}
+
+existingConfigmap:
+existingSecret:
+
+extraEnvVarsSecret:
+
 replicaCount: 1
 
 image:
+  registry: docker.io
   repository: nginx
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
@@ -42,6 +50,11 @@ service:
 
 ingress:
   enabled: false
+  ## @param ingress.ingressClassName IngressClass that will be used to implement the Ingress (Kubernetes 1.18+)
+  ## This is supported in Kubernetes 1.18+ and required if you have more than one IngressClass marked as the default for your cluster.
+  ## ref: https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/
+  ##
+  ingressClassName: ""
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"

templates/_configmap.yaml

@@ -1,14 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-
-{{- define "common.configMap.tpl" -}}
-{{- $top := first . }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  {{- include "common.metadata" (list $top) | nindent 2 }}
-data: {}
-{{- end }}
-
-{{- define "common.configMap" -}}
-{{- include "common.utils.merge" (append . "common.configMap.tpl") }}
-{{- end }}

templates/_container.yaml

@@ -1,18 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-
-{{- define "common.container.tpl" -}}
-{{- $top := first . }}
-{{- $container := index . 1 }}
-{{- $image := $container.image | default (dict) }}
-name: {{ $top.Chart.Name }}
-securityContext:
-  {{- toYaml $container.securityContext | nindent 2 }}
-image: "{{ $image.repository }}:{{ $image.tag | default $top.Chart.AppVersion }}"
-imagePullPolicy: {{ $container.image.pullPolicy }}
-resources:
-  {{- toYaml $container.resources | nindent 2 }}
-{{- end }}
-
-{{- define "common.container" -}}
-{{- include "common.utils.merge" (append . "common.container.tpl") }}
-{{- end }}

templates/_cronjob.yaml

@@ -1,49 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-
-{{- define "common.cronJob.pod" -}}
-spec:
-  restartPolicy: OnFailure
-{{- end }}
-
-{{- define "common.cronJob.tpl" -}}
-{{- $top := first . }}
-{{- $cronJob := index . 1 }}
-{{- $pod := index . 2 }}
-{{- $serviceAccount := index . 3 }}
-{{- if semverCompare ">=1.21-0" $top.Capabilities.KubeVersion.GitVersion -}}
-apiVersion: batch/v1
-{{- else -}}
-apiVersion: batch/v1beta1
-{{- end }}
-kind: CronJob
-metadata:
-  {{- include "common.metadata" (list $top) | nindent 2 }}
-spec:
-  schedule: "{{ $cronJob.schedule }}"
-  {{- with $cronJob.concurrencyPolicy }}
-  concurrencyPolicy: {{ . }}
-  {{- end }}
-  {{- with $cronJob.failedJobsHistoryLimit }}
-  failedJobsHistoryLimit: {{ . }}
-  {{- end }}
-  {{- with $cronJob.successfulJobsHistoryLimit }}
-  successfulJobsHistoryLimit: {{ . }}
-  {{- end }}
-  {{- with $cronJob.suspend }}
-  suspend: {{ . }}
-  {{- end }}
-  jobTemplate:
-    metadata:
-      labels:
-        {{- include "common.selectorLabels" $top | nindent 8 }}
-    spec:
-      {{- with $cronJob.activeDeadlineSeconds }}
-      activeDeadlineSeconds: {{ . }}
-      {{- end }}
-      template:
-        {{- include "common.pod.template" (list $top $pod $serviceAccount "common.cronJob.pod") | nindent 8 }}
-{{- end }}
-
-{{- define "common.cronJob" -}}
-{{- include "common.utils.merge" (append . "common.cronJob.tpl") }}
-{{- end }}

templates/_debug.yaml

@@ -0,0 +1,3 @@
+{{- define "common.dd" -}}
+{{- . | toYaml | fail }}
+{{- end -}}

templates/_deployment.yaml

@@ -1,25 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-
-{{- define "common.deployment.tpl" -}}
-{{- $top := first . }}
-{{- $deployment := index . 1 }}
-{{- $autoscaling := index . 2 }}
-{{- $serviceAccount := index . 3 }}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  {{- include "common.metadata" (list $top) | nindent 2 }}
-spec:
-  {{- if not $autoscaling.enabled }}
-  replicas: {{ $deployment.replicaCount | default 1 }}
-  {{- end }}
-  selector:
-    matchLabels:
-      {{- include "common.selectorLabels" $top | nindent 6 }}
-  template:
-    {{- include "common.pod.template" (list $top $deployment $serviceAccount) | nindent 4 }}
-{{- end }}
-
-{{- define "common.deployment" -}}
-{{- include "common.utils.merge" (append . "common.deployment.tpl") }}
-{{- end }}

templates/_hpa.yaml

@@ -1,45 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-
-{{- define "common.hpa.tpl" -}}
-{{- $top := first . }}
-{{- $autoscaling := index . 1 }}
-{{- if semverCompare ">=1.23-0" $top.Capabilities.KubeVersion.GitVersion -}}
-apiVersion: autoscaling/v2
-{{- else -}}
-apiVersion: autoscaling/v2beta2
-{{- end }}
-kind: HorizontalPodAutoscaler
-metadata:
-  {{- include "common.metadata" (list $top) | nindent 2 }}
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: {{ include "common.fullname" $top }}
-  minReplicas: {{ $autoscaling.minReplicas }}
-  maxReplicas: {{ $autoscaling.maxReplicas }}
-  metrics:
-  {{- with $autoscaling.cpuUtilizationPercentage }}
-  - type: Resource
-    resource:
-      name: cpu
-      target:
-        type: Utilization
-        averageUtilization: {{ . }}
-  {{- end }}
-  {{- with $autoscaling.memoryUtilizationPercentage }}
-  - type: Resource
-    resource:
-      name: memory
-      target:
-        type: Utilization
-        averageUtilization: {{ . }}
-  {{- end }}
-{{- end }}
-
-{{- define "common.hpa" -}}
-{{- $autoscaling := index . 1 }}
-{{- if $autoscaling.enabled }}
-  {{- include "common.utils.merge" (append . "common.hpa.tpl") }}
-{{- end }}
-{{- end }}

templates/_ingress.yaml

@@ -1,67 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-
-{{- define "common.ingress.metadata" -}}
-{{- $ingress := index . 1 }}
-{{- with $ingress.annotations }}
-annotations:
-  {{- toYaml . | nindent 2 }}
-{{- end }}
-{{- end }}
-
-{{- define "common.ingress.tpl" -}}
-{{- $top := first . }}
-{{- $ingress := index . 1 }}
-{{- $service := index . 2 }}
-{{- $fullName := include "common.fullname" $top }}
-{{- $svcPort := $service.port }}
-{{- if semverCompare ">=1.19-0" $top.Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1
-{{- else if semverCompare ">=1.14-0" $top.Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
-apiVersion: extensions/v1beta1
-{{- end }}
-kind: Ingress
-metadata:
-  {{- include "common.metadata" (append . "common.ingress.metadata") | nindent 2 }}
-spec:
-{{- if $ingress.tls }}
-  tls:
-  {{- range $ingress.tls }}
-  - hosts:
-    {{- range .hosts }}
-    - {{ . | quote }}
-    {{- end }}
-    secretName: {{ .secretName }}
-  {{- end }}
-{{- end }}
-  rules:
-  {{- range $ingress.hosts }}
-  - host: {{ .host | quote }}
-    http:
-      paths:
-      {{- range .paths }}
-      - path: {{ .path }}
-        {{- if and .pathType (semverCompare ">=1.18-0" $top.Capabilities.KubeVersion.GitVersion) }}
-        pathType: {{ .pathType }}
-        {{- end }}
-        backend:
-          {{- if semverCompare ">=1.19-0" $top.Capabilities.KubeVersion.GitVersion }}
-          service:
-            name: {{ $fullName }}
-            port:
-              number: {{ $svcPort }}
-          {{- else }}
-          serviceName: {{ $fullName }}
-          servicePort: {{ $svcPort }}
-          {{- end }}
-      {{- end }}
-  {{- end }}
-{{- end }}
-
-{{- define "common.ingress" -}}
-{{- $ingress := index . 1 }}
-{{- if $ingress.enabled }}
-  {{- include "common.utils.merge" (append . "common.ingress.tpl") }}
-{{- end }}
-{{- end }}

templates/_pdb.yaml

@@ -1,36 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-
-{{- define "common.pdb.tpl" -}}
-{{- $top := first . }}
-{{- $pdb := index . 1 }}
-{{- if semverCompare ">=1.21-0" $top.Capabilities.KubeVersion.GitVersion -}}
-apiVersion: policy/v1
-{{- else -}}
-apiVersion: policy/v1beta1
-{{- end }}
-kind: PodDisruptionBudget
-metadata:
-  {{- include "common.metadata" (list $top) | nindent 2 }}
-spec:
-  selector:
-    matchLabels:
-      {{- include "common.selectorLabels" $top | nindent 6 }}
-  {{- if not (or (empty $pdb.minAvailable) (empty $pdb.maxUnavailable)) }}
-    {{- fail "minAvailable and maxUnavailable can not be set together" }}
-  {{- end }}
-  {{- with $pdb.minAvailable }}
-  minAvailable: {{ . }}
-  {{- end }}
-  {{- with $pdb.maxUnavailable }}
-  maxUnavailable: {{ . }}
-  {{- end }}
-{{- end }}
-
-{{- define "common.pdb" -}}
-{{- $top := first . }}
-{{- $deployment := index . 2 }}
-{{- $autoscaling := index . 3 }}
-{{- if or (and $autoscaling.enabled (gt ($autoscaling.minReplicas | int) 1)) (and (not $autoscaling.enabled) (gt ($deployment.replicaCount | int) 1)) }}
-  {{- include "common.utils.merge" (append . "common.pdb.tpl") }}
-{{- end }}
-{{- end }}

templates/_pod.tpl

@@ -1,46 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-
-{{- define "common.pod.template.tpl" -}}
-{{- $top := first . }}
-{{- $pod := index . 1 }}
-{{- $serviceAccount := index . 2 }}
-metadata:
-  {{- with $pod.podAnnotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  labels:
-    {{- include "common.selectorLabels" $top | nindent 4 }}
-  {{- with $pod.podLabels }}
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  {{- with $pod.imagePullSecrets }}
-  imagePullSecrets:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  serviceAccountName: {{ include "common.serviceAccountName" (list $top $serviceAccount) }}
-  securityContext:
-    {{- toYaml $pod.podSecurityContext | nindent 4 }}
-  containers:
-  - {{- include "common.container" (list $top $pod) | nindent 4 }}
-  {{- with $pod.nodeSelector }}
-  nodeSelector:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  {{- with $pod.affinity }}
-  affinity:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  {{- with $pod.tolerations }}
-  tolerations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  {{- with $pod.priorityClassName }}
-  priorityClassName: {{ . }}
-  {{- end }}
-{{- end }}
-
-{{- define "common.pod.template" -}}
-{{- include "common.utils.merge" (append . "common.pod.template.tpl") }}
-{{- end }}

templates/_secret.yaml

@@ -1,15 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-
-{{- define "common.secret.tpl" -}}
-{{- $top := first . }}
-apiVersion: v1
-kind: Secret
-metadata:
-  {{- include "common.metadata"  (list $top) | nindent 2 }}
-type: Opaque
-data: {}
-{{- end }}
-
-{{- define "common.secret" -}}
-{{- include "common.utils.merge" (append . "common.secret.tpl") }}
-{{- end }}

templates/_secrets.tpl

@@ -87,7 +87,7 @@ The order in which this function returns a secret password:
 {{- $password := "" }}
 {{- $subchart := "" }}
 {{- $chartName := default "" .chartName }}
-{{- $passwordLength := default 10 .length }}
+{{- $passwordLength := default 32 .length }}
 {{- $providedPasswordKey := include "common.utils.getKeyFromList" (dict "keys" .providedValues "context" $.context) }}
 {{- $providedPasswordValue := include "common.utils.getValueFromKey" (dict "key" $providedPasswordKey "context" $.context) }}
 {{- $secretData := (lookup "v1" "Secret" (include "common.namespace" .context) .secret).data }}
@@ -115,6 +115,8 @@ The order in which this function returns a secret password:
     {{- $password = randAscii $passwordLength }}
     {{- $password = regexReplaceAllLiteral "\\W" $password "@" | substr 5 $passwordLength }}
     {{- $password = printf "%s%s" $subStr $password | toString | shuffle | b64enc | quote }}
+  {{- else if .hex }}
+    {{- $password = include "common.secrets.randHex" $passwordLength | b64enc | quote }}
   {{- else }}
     {{- $password = randAlphaNum $passwordLength | b64enc | quote }}
   {{- end }}
@@ -122,6 +124,23 @@ The order in which this function returns a secret password:
 {{- printf "%s" $password -}}
 {{- end -}}
 
+{{- /*
+    Returns given number of random Hex characters.
+    - randNumeric 4 | atoi generates a random number in [0, 10^4)
+      This is a range evenly divisble by 16, but even if off by one,
+      that last partial interval offsetting randomness is only 1 part in 625.
+    - mod N 16 maps to the range 0-15
+    - printf "%x" represents a single number 0-15 as a single hex character
+*/}}
+{{- define "common.secrets.randHex" -}}
+    {{- $result := "" }}
+    {{- range $i := until . }}
+        {{- $rand_hex_char := mod (randNumeric 4 | atoi) 16 | printf "%x" }}
+        {{- $result = print $result $rand_hex_char }}
+    {{- end }}
+    {{- $result }}
+{{- end }}
+
 {{/*
 Reuses the value from an existing secret, otherwise sets its value to a default value.
 

templates/_service.yaml

@@ -1,23 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-
-{{- define "common.service.tpl" -}}
-{{- $top := first . }}
-{{- $service := index . 1 }}
-apiVersion: v1
-kind: Service
-metadata:
-  {{- include "common.metadata" (list $top) | nindent 2 }}
-spec:
-  type: {{ $service.type }}
-  ports:
-  - port: {{ $service.port }}
-    targetPort: http
-    protocol: TCP
-    name: http
-  selector:
-    {{- include "common.selectorLabels" $top | nindent 4 }}
-{{- end }}
-
-{{- define "common.service" -}}
-{{- include "common.utils.merge" (append . "common.service.tpl") }}
-{{- end }}

templates/_serviceaccount.yaml

@@ -1,26 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-
-{{- define "common.serviceAccount.metadata" -}}
-{{- $top := first . }}
-{{- $serviceAccount := index . 1 }}
-name: {{ include "common.serviceAccountName" . }}
-{{- with $serviceAccount.annotations }}
-annotations:
-  {{- toYaml . | nindent 2 }}
-{{- end }}
-{{- end }}
-
-{{- define "common.serviceAccount.tpl" -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  {{- include "common.metadata" (append . "common.serviceAccount.metadata") | nindent 2 }}
-{{- end }}
-
-{{- define "common.serviceAccount" -}}
-{{- $top := first . }}
-{{- $serviceAccount := index . 1 }}
-{{- if $serviceAccount.create }}
-  {{- include "common.utils.merge" (append . "common.serviceAccount.tpl") }}
-{{- end }}
-{{- end }}

templates/_servicemonitor-secret.yaml

@@ -1,25 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-
-{{- define "common.serviceMonitor.secret.tpl" -}}
-{{- $top := first . }}
-{{- $serviceMonitor := index . 1 }}
-{{- $basicAuth := $serviceMonitor.basicAuth | default (dict) }}
-metadata:
-  name: {{ $basicAuth.secretName | default (include "common.fullname" $top) }}
-  {{- with $serviceMonitor.namespace }}
-  namespace: {{ . }}
-  {{- end }}
-{{- if $basicAuth.enabled }}
-data:
-  {{ $basicAuth.usernameKey | default "username" }}: {{ $basicAuth.username | toString | b64enc | quote }}
-  {{ $basicAuth.passwordKey | default "password" }}: {{ $basicAuth.password | toString | b64enc | quote }}
-{{- end }}
-{{- end }}
-
-{{- define "common.serviceMonitor.secret" -}}
-{{- $top := first . }}
-{{- $serviceMonitor := index . 1 }}
-{{- if $serviceMonitor.enabled }}
-  {{- include "common.secret" (append . "common.serviceMonitor.secret.tpl") }}
-{{- end }}
-{{- end }}

templates/_servicemonitor.yaml

@@ -1,54 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-
-{{- define "common.serviceMonitor.metadata" -}}
-{{- $serviceMonitor := index . 1 }}
-{{- with $serviceMonitor.namespace }}
-namespace: {{ . }}
-{{- end }}
-{{- end }}
-
-{{- define "common.serviceMonitor.tpl" -}}
-{{- $top := first . }}
-{{- $serviceMonitor := index . 1 }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  {{- include "common.metadata" (append . "common.serviceMonitor.metadata") | nindent 2 }}
-spec:
-  selector:
-    matchLabels:
-      {{- include "common.selectorLabels" $top | nindent 6 }}
-  namespaceSelector:
-    matchNames:
-    - {{ $top.Release.Namespace | quote }}
-  endpoints:
-  - port: "{{ $serviceMonitor.port }}"
-    {{- with $serviceMonitor.path }}
-    path: {{ . }}
-    {{- end }}
-    {{- with $serviceMonitor.interval }}
-    interval: {{ . }}
-    {{- end }}
-    {{- with $serviceMonitor.scrapeTimeout }}
-    scrapeTimeout: {{ . }}
-    {{- end }}
-    {{- $basicAuth := $serviceMonitor.basicAuth | default (dict) }}
-    {{- $name := $basicAuth.secretName | default (include "common.fullname" $top) }}
-    {{- if $basicAuth.enabled }}
-    basicAuth:
-      username:
-        name: {{ $name }}
-        key: {{ $basicAuth.usernameKey | default "username" }}
-      password:
-        name: {{ $name }}
-        key: {{ $basicAuth.passwordKey | default "password" }}
-    {{- end }}
-{{- end }}
-
-{{- define "common.serviceMonitor" -}}
-{{- $top := first . }}
-{{- $serviceMonitor := index . 1 }}
-{{- if $serviceMonitor.enabled }}
-  {{- include "common.utils.merge" (append . "common.serviceMonitor.tpl") }}
-{{- end }}
-{{- end }}