Merge pull request #70 from nolte/feature/esphome-git-sync

[esphome] adding a option for git init container
using arm supported version
2020-09-28 16:08:35 -04:00 · 2020-09-28 19:57:36 +02:00 · 2020-09-27 21:39:48 +02:00 · 2020-09-27 12:58:59 -05:00 · 2020-09-26 22:44:07 -05:00 · 2020-09-26 22:42:02 -05:00
7 changed files with 187 additions and 72 deletions
--- a/charts/esphome/Chart.yaml
+++ b/charts/esphome/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: 1.14.5
+appVersion: 1.15.2
 description: ESPHome
 name: esphome
-version: 2.0.0
+version: 2.2.0
 keywords:
 - esphome
 home: https://github.com/k8s-at-home/charts/tree/master/charts/esphome
--- a/charts/esphome/README.md
+++ b/charts/esphome/README.md
@@ -34,65 +34,72 @@ The command removes all the Kubernetes components associated with the chart and

 The following tables lists the configurable parameters of the ESPHome chart and their default values.

-| Parameter                  | Description                         | Default                                                 |
-|----------------------------|-------------------------------------|---------------------------------------------------------|
-| `image.repository`         | Image repository | `esphome/esphome` |
-| `image.tag`                | Image tag. Possible values listed [here](https://hub.docker.com/r/esphome/esphome/tags/).| `0.14.5`|
-| `image.pullPolicy`         | Image pull policy | `IfNotPresent` |
-| `image.pullSecrets`        | Secrets to use when pulling the image | `[]` |
-| `strategyType`             | Specifies the strategy used to replace old Pods by new ones | `Recreate` |
-| `probes.liveness.enabled`  | Use the livenessProbe?  | `true` |
-| `probes.liveness.scheme `  | Specify liveness `scheme` parameter for the deployment  | `HTTP` |
-| `probes.liveness.initialDelaySeconds`  | Specify liveness `initialDelaySeconds` parameter for the deployment  | `60` |
-| `probes.liveness.failureThreshold`     | Specify liveness `failureThreshold` parameter for the deployment     | `5`  |
-| `probes.liveness.timeoutSeconds`       | Specify liveness `timeoutSeconds` parameter for the deployment       | `10` |
-| `probes.readiness.enabled`  | Use the readinessProbe?  | `true` |
-| `probes.readiness.scheme `  | Specify readiness `scheme` parameter for the deployment  | `HTTP` |
-| `probes.readiness.initialDelaySeconds` | Specify readiness `initialDelaySeconds` parameter for the deployment | `60` |
-| `probes.readiness.failureThreshold`    | Specify readiness `failureThreshold` parameter for the deployment    | `5`  |
-| `probes.readiness.timeoutSeconds`      | Specify readiness `timeoutSeconds` parameter for the deployment      | `10` |
-| `probes.startup.enabled`  | Use the startupProbe? (new in kubernetes 1.16)  | `false` |
-| `probes.startup.scheme `  | Specify startup `scheme` parameter for the deployment  | `HTTP` |
-| `probes.startup.failureThreshold`    | Specify startup `failureThreshold` parameter for the deployment    | `5`  |
-| `probes.startup.periodSeconds`      | Specify startup `periodSeconds` parameter for the deployment      | `10` |
-| `service.type`             | Kubernetes service type for the esphome GUI | `ClusterIP` |
-| `service.port`             | Kubernetes port where the esphome GUI is exposed| `6052` |
-| `service.portName`         | Kubernetes port name where the esphome GUI is exposed | `api` |
-| `service.additionalPorts`  | Add additional ports exposed by the esphome container integrations. Example homematic needs to expose a proxy port | `{}` |
-| `service.annotations`      | Service annotations for the esphome GUI | `{}` |
-| `service.clusterIP`   | Cluster IP for the esphom GUI | `` |
-| `service.externalIPs`   | External IPs for the esphome GUI | `[]` |
-| `service.loadBalancerIP`   | Loadbalancer IP for the esphome GUI | `` |
-| `service.loadBalancerSourceRanges`   | Loadbalancer client IP restriction range for the esphome GUI | `[]` |
-| `service.publishNotReadyAddresses`   | Set to true if the notReadyAddresses should be published | `false` |
-| `service.externalTrafficPolicy`   | Loadbalancer externalTrafficPolicy | `` |
-| `hostNetwork`              | Enable hostNetwork - might be needed for discovery to work | `false` |
-| `service.nodePort`   | nodePort to listen on for the esphome GUI | `` |
-| `ingress.enabled`              | Enables Ingress | `false` |
-| `ingress.annotations`          | Ingress annotations | `{}` |
-| `ingress.path`                 | Ingress path | `/` |
-| `ingress.hosts`                | Ingress accepted hostnames | `chart-example.local` |
-| `ingress.tls`                  | Ingress TLS configuration | `[]` |
-| `persistence.enabled`      | Use persistent volume to store data | `true` |
-| `persistence.size`         | Size of persistent volume claim | `5Gi` |
-| `persistence.existingClaim`| Use an existing PVC to persist data | `nil` |
-| `persistence.hostPath`| The path to the config directory on the host, instead of a PVC | `nil` |
-| `persistence.storageClass` | Type of persistent volume claim | `-` |
-| `persistence.accessMode`  | Persistence access modes | `ReadWriteMany` |
-| `hostMounts`        | Array of host directories to mount; can be used for devices | [] |
-| `hostMounts.name`   | Name of the volume | `nil` |
-| `hostMounts.hostPath` | The path on the host machine | `nil` |
-| `hostMounts.mountPath` | The path at which to mount (optional; assumed same as hostPath) | `nil` |
-| `hostMounts.type` | The type to mount (optional, i.e., `Directory`) | `nil` |
-| `extraEnv`          | Extra ENV vars to pass to the esphome container | `{}` |
-| `extraEnvSecrets`   | Extra env vars to pass to the esphome container from k8s secrets - see `values.yaml` for an example | `{}` |
-| `resources`                | CPU/Memory resource requests/limits or the esphome GUI | `{}` |
-| `nodeSelector`             | Node labels for pod assignment or the esphome GUI | `{}` |
-| `tolerations`              | Toleration labels for pod assignment or the esphome GUI | `[]` |
-| `affinity`                 | Affinity settings for pod assignment or the esphome GUI | `{}` |
-| `podAnnotations`            | Key-value pairs to add as pod annotations  | `{}` |
-| `extraVolumes`            | Any extra volumes to define for the pod  | `{}` |
-| `extraVolumeMounts`       | Any extra volumes mounts to define for each container of the pod  | `{}` |
+| Parameter                              | Description                                                                                                        | Default               |
+|----------------------------------------|--------------------------------------------------------------------------------------------------------------------|-----------------------|
+| `image.repository`                     | Image repository                                                                                                   | `esphome/esphome`     |
+| `image.tag`                            | Image tag. Possible values listed [here](https://hub.docker.com/r/esphome/esphome/tags/).                          | `0.14.5`              |
+| `image.pullPolicy`                     | Image pull policy                                                                                                  | `IfNotPresent`        |
+| `image.pullSecrets`                    | Secrets to use when pulling the image                                                                              | `[]`                  |
+| `strategyType`                         | Specifies the strategy used to replace old Pods by new ones                                                        | `Recreate`            |
+| `probes.liveness.enabled`              | Use the livenessProbe?                                                                                             | `true`                |
+| `probes.liveness.scheme `              | Specify liveness `scheme` parameter for the deployment                                                             | `HTTP`                |
+| `probes.liveness.initialDelaySeconds`  | Specify liveness `initialDelaySeconds` parameter for the deployment                                                | `60`                  |
+| `probes.liveness.failureThreshold`     | Specify liveness `failureThreshold` parameter for the deployment                                                   | `5`                   |
+| `probes.liveness.timeoutSeconds`       | Specify liveness `timeoutSeconds` parameter for the deployment                                                     | `10`                  |
+| `probes.readiness.enabled`             | Use the readinessProbe?                                                                                            | `true`                |
+| `probes.readiness.scheme `             | Specify readiness `scheme` parameter for the deployment                                                            | `HTTP`                |
+| `probes.readiness.initialDelaySeconds` | Specify readiness `initialDelaySeconds` parameter for the deployment                                               | `60`                  |
+| `probes.readiness.failureThreshold`    | Specify readiness `failureThreshold` parameter for the deployment                                                  | `5`                   |
+| `probes.readiness.timeoutSeconds`      | Specify readiness `timeoutSeconds` parameter for the deployment                                                    | `10`                  |
+| `probes.startup.enabled`               | Use the startupProbe? (new in kubernetes 1.16)                                                                     | `false`               |
+| `probes.startup.scheme `               | Specify startup `scheme` parameter for the deployment                                                              | `HTTP`                |
+| `probes.startup.failureThreshold`      | Specify startup `failureThreshold` parameter for the deployment                                                    | `5`                   |
+| `probes.startup.periodSeconds`         | Specify startup `periodSeconds` parameter for the deployment                                                       | `10`                  |
+| `service.type`                         | Kubernetes service type for the esphome GUI                                                                        | `ClusterIP`           |
+| `service.port`                         | Kubernetes port where the esphome GUI is exposed                                                                   | `6052`                |
+| `service.portName`                     | Kubernetes port name where the esphome GUI is exposed                                                              | `api`                 |
+| `service.additionalPorts`              | Add additional ports exposed by the esphome container integrations. Example homematic needs to expose a proxy port | `{}`                  |
+| `service.annotations`                  | Service annotations for the esphome GUI                                                                            | `{}`                  |
+| `service.clusterIP`                    | Cluster IP for the esphom GUI                                                                                      | ``                    |
+| `service.externalIPs`                  | External IPs for the esphome GUI                                                                                   | `[]`                  |
+| `service.loadBalancerIP`               | Loadbalancer IP for the esphome GUI                                                                                | ``                    |
+| `service.loadBalancerSourceRanges`     | Loadbalancer client IP restriction range for the esphome GUI                                                       | `[]`                  |
+| `service.publishNotReadyAddresses`     | Set to true if the notReadyAddresses should be published                                                           | `false`               |
+| `service.externalTrafficPolicy`        | Loadbalancer externalTrafficPolicy                                                                                 | ``                    |
+| `hostNetwork`                          | Enable hostNetwork - might be needed for discovery to work                                                         | `false`               |
+| `service.nodePort`                     | nodePort to listen on for the esphome GUI                                                                          | ``                    |
+| `ingress.enabled`                      | Enables Ingress                                                                                                    | `false`               |
+| `ingress.annotations`                  | Ingress annotations                                                                                                | `{}`                  |
+| `ingress.path`                         | Ingress path                                                                                                       | `/`                   |
+| `ingress.hosts`                        | Ingress accepted hostnames                                                                                         | `chart-example.local` |
+| `ingress.tls`                          | Ingress TLS configuration                                                                                          | `[]`                  |
+| `persistence.enabled`                  | Use persistent volume to store data                                                                                | `true`                |
+| `persistence.size`                     | Size of persistent volume claim                                                                                    | `5Gi`                 |
+| `persistence.existingClaim`            | Use an existing PVC to persist data                                                                                | `nil`                 |
+| `persistence.hostPath`                 | The path to the config directory on the host, instead of a PVC                                                     | `nil`                 |
+| `persistence.storageClass`             | Type of persistent volume claim                                                                                    | `-`                   |
+| `persistence.accessMode`               | Persistence access modes                                                                                           | `ReadWriteMany`       |
+| `git.enabled`                          | Use git-sync in init container                                                                                     | `false`               |
+| `git.secret`                           | Git secret to use for git-sync                                                                                     | `git-creds`           |
+| `git.syncPath`                         | Git sync path                                                                                                      | `/config`             |
+| `git.keyPath`                          | Git ssh key path                                                                                                   | `/root/.ssh`          |
+| `git.user.name`                        | Human-readable name in the “committer” and “author” fields                                                         | ``                    |
+| `git.user.email`                       | Email address for the “committer” and “author” fields                                                              | ``                    |
+| `hostMounts`                           | Array of host directories to mount; can be used for devices                                                        | []                    |
+| `hostMounts.name`                      | Name of the volume                                                                                                 | `nil`                 |
+| `hostMounts.hostPath`                  | The path on the host machine                                                                                       | `nil`                 |
+| `hostMounts.mountPath`                 | The path at which to mount (optional; assumed same as hostPath)                                                    | `nil`                 |
+| `hostMounts.type`                      | The type to mount (optional, i.e., `Directory`)                                                                    | `nil`                 |
+| `extraEnv`                             | Extra ENV vars to pass to the esphome container                                                                    | `{}`                  |
+| `extraEnvSecrets`                      | Extra env vars to pass to the esphome container from k8s secrets - see `values.yaml` for an example                | `{}`                  |
+| `resources`                            | CPU/Memory resource requests/limits or the esphome GUI                                                             | `{}`                  |
+| `nodeSelector`                         | Node labels for pod assignment or the esphome GUI                                                                  | `{}`                  |
+| `tolerations`                          | Toleration labels for pod assignment or the esphome GUI                                                            | `[]`                  |
+| `affinity`                             | Affinity settings for pod assignment or the esphome GUI                                                            | `{}`                  |
+| `podAnnotations`                       | Key-value pairs to add as pod annotations                                                                          | `{}`                  |
+| `extraVolumes`                         | Any extra volumes to define for the pod                                                                            | `{}`                  |
+| `extraVolumeMounts`                    | Any extra volumes mounts to define for each container of the pod                                                   | `{}`                  |
+



--- a/charts/esphome/templates/deployment.yaml
+++ b/charts/esphome/templates/deployment.yaml
@@ -37,6 +37,56 @@ spec:
      hostNetwork: {{ .Values.hostNetwork }}
      dnsPolicy: ClusterFirstWithHostNet
      {{- end }}
+      initContainers:
+      {{- if .Values.git.enabled }}
+      - name: git-sync
+        image: "{{ .Values.git.image.repository }}:{{ .Values.git.image.tag }}"
+        imagePullPolicy: {{ .Values.git.image.pullPolicy }}
+        {{- if .Values.git.command }}
+        command:
+          {{- range .Values.git.command }}
+          - {{ . | quote }}
+          {{- end }}
+        {{- else }}
+        command: ["/bin/sh", "-c"]
+        args:
+        - set -e;
+          if [ -d "{{ .Values.git.syncPath }}/.git" ];
+          then
+            git -C "{{ .Values.git.syncPath }}" pull || true;
+          else
+            if [ "$(ls -A {{ .Values.git.syncPath }})" ]; 
+            then
+              git clone --depth 2 "{{ .Values.git.repo }}" /tmp/repo;
+              cp -rf /tmp/repo/.git "{{ .Values.git.syncPath }}";
+              cd "{{ .Values.git.syncPath }}";
+              git checkout -f;
+            else
+              git clone --depth 2 "{{ .Values.git.repo }}" "{{ .Values.git.syncPath }}";
+            fi;
+          fi;
+          if [ -f "{{ .Values.git.keyPath }}/git-crypt-key" ];
+          then
+            cd {{ .Values.git.syncPath }};
+            git-crypt unlock "{{ .Values.git.keyPath }}/git-crypt-key";
+          fi;
+        {{- end }}
+        volumeMounts:
+        - mountPath: /config
+          name: config
+        - mountPath: {{ .Values.git.keyPath }}
+          name: git-secret
+        {{- if .Values.extraVolumeMounts }}{{ toYaml .Values.extraVolumeMounts | trim | nindent 8 }}{{ end }}
+        {{- if .Values.usePodSecurityContext }}
+        securityContext:
+          runAsUser: {{ default 0 .Values.runAsUser }}
+        {{- if and (.Values.runAsUser) (.Values.fsGroup) }}
+        {{- if not (eq .Values.runAsUser 0.0) }}
+          fsGroup: {{ .Values.fsGroup }}
+        {{- end }}
+        {{- end }}
+        {{- end }}
+      {{- end }}              
      containers:
        - name: {{ .Chart.Name }}
          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
@@ -144,6 +194,13 @@ spec:
          type: {{ .type }}
          {{- end }}
      {{- end }}
+      {{- if .Values.git.enabled }}
+      - name: git-secret
+        secret:
+          defaultMode: 256
+          secretName: {{ .Values.git.secret }}
+          optional: true
+      {{ end }}      
      {{- if .Values.extraVolumes  }}{{ toYaml .Values.extraVolumes | trim | nindent 6 }}{{ end }}
    {{- with .Values.nodeSelector }}
      nodeSelector:
--- a/charts/esphome/values.yaml
+++ b/charts/esphome/values.yaml
@@ -4,7 +4,7 @@

 image:
  repository: esphome/esphome
-  tag: 1.14.5
+  tag: 1.15.2
  pullPolicy: IfNotPresent
  pullSecrets: []

@@ -152,3 +152,25 @@ extraVolumes: []
 extraVolumeMounts: []
 #   - name: example-name
 #     mountPath: /path/in/container
+
+
+git:
+  enabled: false
+
+  image:
+    repository: k8sathome/git-crypt
+    tag: 2020.09.28
+    pullPolicy: IfNotPresent
+
+  ## Specify the command that runs in the git-sync container to pull in configuration.
+  # command: []
+
+  # Committer settings
+  user:
+    name: ""
+    email: ""
+
+  repo: ""
+  secret: git-creds
+  syncPath: /config
+  keyPath: /root/.ssh
--- a/charts/media-common/Chart.yaml
+++ b/charts/media-common/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: media-common
 description: Common dependancy chart for media ecosystem containers
 type: application
-version: 1.2.0
+version: 1.3.0
 keywords:
  - media-common
 home: https://github.com/k8s-at-home/charts/tree/master/charts/media-common
--- a/charts/media-common/templates/ingress.yaml
+++ b/charts/media-common/templates/ingress.yaml
@@ -1,7 +1,10 @@
 {{- if .Values.ingress.enabled -}}
+  {{- $kubeVersion := .Capabilities.KubeVersion.GitVersion -}}
  {{- $fullName := include "media-common.fullname" . -}}
  {{- $svcPort := .Values.service.port -}}
-  {{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+  {{- if semverCompare ">= 1.19-0" $kubeVersion -}}
+apiVersion: networking.k8s.io/v1
+  {{- else if semverCompare ">= 1.14-0 < 1.19-0" $kubeVersion -}}
 apiVersion: networking.k8s.io/v1beta1
  {{- else -}}
 apiVersion: extensions/v1beta1
@@ -32,17 +35,29 @@ spec:
      http:
        paths:
          {{- range .paths }}
-          - path: {{ . }}
+          - path: {{ .path }}
+            {{- if semverCompare ">= 1.14-0" $kubeVersion}}
+            pathType: {{ .pathType }}
+            {{- end }}
            backend:
+              {{- if semverCompare ">= 1.19-0" $kubeVersion}}
+              service:
+                name: {{ $fullName }}
+                port:
+                  name: http
+              {{- else }}
              serviceName: {{ $fullName }}
              servicePort: {{ $svcPort }}
+              {{- end }}
          {{- end }}
  {{- end }}
  {{- range $index, $ingress := .Values.ingress.extraIngresses }}
 ---
-    {{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+  {{- if semverCompare ">= 1.19-0" $kubeVersion -}}
+apiVersion: networking.k8s.io/v1
+  {{- else if semverCompare ">= 1.14-0 < 1.19-0" $kubeVersion -}}
 apiVersion: networking.k8s.io/v1beta1
-    {{- else -}}
+  {{- else -}}
 apiVersion: extensions/v1beta1
    {{- end }}
 kind: Ingress
@@ -71,11 +86,21 @@ spec:
      http:
        paths:
          {{- range .paths }}
-          - path: {{ . }}
+          - path: {{ .path }}
+            {{- if semverCompare ">= 1.14-0" $kubeVersion}}
+            pathType: {{ .pathType }}
+            {{- end }}
            backend:
+              {{- if semverCompare ">= 1.19-0" $kubeVersion}}
+              service:
+                name: {{ $fullName }}
+                port:
+                  name: http
+              {{- else }}
              serviceName: {{ $fullName }}
              servicePort: {{ $svcPort }}
-  {{- end }}
-  {{- end }}
+              {{- end }}
+          {{- end }}
+    {{- end }}
  {{- end }}
 {{- end }}
--- a/charts/media-common/values.yaml
+++ b/charts/media-common/values.yaml
@@ -50,7 +50,9 @@ ingress:
  hosts:
    - host: chart-example.local
      paths:
-        - /
+        - path: /
+          # Ignored if not kubeVersion >= 1.14-0
+          pathType: Prefix
  tls: []
  #  - secretName: chart-example-tls
  #    hosts:
@@ -65,7 +67,9 @@ ingress:
  #   hosts:
  #     - host: chart-example.local
  #       paths:
-  #         - /api
+  #         - path: /api
+  #          # Ignored if not kubeVersion >= 1.14-0
+  #          pathType: Prefix
  #   tls: []
  #   #  - secretName: chart-example-tls
  #   #    hosts:
Author	SHA1	Message	Date
Ryan Holt	2dba5d9d8e	Merge pull request #70 from nolte/feature/esphome-git-sync [esphome] adding a option for git init container	2020-09-28 16:08:35 -04:00
nolte	1a3f1ad996	using arm supported version Signed-off-by: nolte <nolte07@googlemail.com>	2020-09-28 19:57:36 +02:00
nolte	f00fef03b6	Adding a option for a git init container. Signed-off-by: nolte <nolte07@googlemail.com>	2020-09-27 21:39:48 +02:00
Nicholas St. Germain	d90ddd9e2b	Merge pull request #68 from k8s-at-home/bug/media-common [media-common] fix nested kube check and update for kube version 1.19 check	2020-09-27 12:58:59 -05:00
Nicholas St. Germain	c058d4adc0	Merge branch 'master' into bug/media-common	2020-09-26 22:44:07 -05:00
Nicholas St. Germain	7e56103498	Update Chart.yaml	2020-09-26 22:42:02 -05:00
Nicholas St. Germain	b237726244	Merge branch 'master' into bug/media-common	2020-09-26 22:36:41 -05:00
Nicholas St. Germain	b8ae055561	fix nested kube check and update for kube version 1.19 check	2020-09-26 19:34:30 -05:00