[pod-gateway] Fix issue where values.yaml defined 'configFile' wouldn't work in vpn addon (#1061 )

* [pod-gateway] Fix issue where values.yaml defined 'configFile' wouldn't work in vpn addon Co-authored-by: Angel Nunez Mencias <github@angelnu.com>
docs: add TuxOtaku as a contributor for code (#1069 )
2021-06-28 19:24:16 +02:00 · 2021-06-28 09:05:58 -04:00 · 2021-06-28 09:04:31 -04:00
10 changed files with 42 additions and 16 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -274,6 +274,15 @@
      "contributions": [
        "code"
      ]
+    },
+    {
+      "login": "TuxOtaku",
+      "name": "Ryan Draga",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3494484?v=4",
+      "profile": "https://boxingoctop.us",
+      "contributions": [
+        "code"
+      ]
    }
  ],
  "contributorsPerLine": 7,
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Helm charts
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-30-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-31-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->

 [![docs](https://img.shields.io/badge/docs-rtfm-yellow?logo=gitbook&logoColor=white&style=for-the-badge)](https://docs.k8s-at-home.com/)
@@ -86,6 +86,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
  <tr>
    <td align="center"><a href="https://github.com/jmmaloney4"><img src="https://avatars.githubusercontent.com/u/5781547?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jack Maloney</b></sub></a><br /><a href="https://github.com/k8s-at-home/charts/commits?author=jmmaloney4" title="Code">💻</a></td>
    <td align="center"><a href="https://github.com/zamnuts"><img src="https://avatars.githubusercontent.com/u/4969305?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Andrew Zammit</b></sub></a><br /><a href="https://github.com/k8s-at-home/charts/commits?author=zamnuts" title="Code">💻</a></td>
+    <td align="center"><a href="https://boxingoctop.us"><img src="https://avatars.githubusercontent.com/u/3494484?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ryan Draga</b></sub></a><br /><a href="https://github.com/k8s-at-home/charts/commits?author=TuxOtaku" title="Code">💻</a></td>
  </tr>
 </table>

--- a/charts/stable/joplin-server/Chart.yaml
+++ b/charts/stable/joplin-server/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: 1.7.2
+appVersion: 2.1.2
 description: This server allows you to sync any Joplin client
 name: joplin-server
-version: 3.1.0
+version: 3.2.0
 keywords:
  - joplin
  - notes
--- a/charts/stable/joplin-server/README.md
+++ b/charts/stable/joplin-server/README.md
@@ -1,6 +1,6 @@
 # joplin-server

-![Version: 3.1.0](https://img.shields.io/badge/Version-3.1.0-informational?style=flat-square) ![AppVersion: 1.7.2](https://img.shields.io/badge/AppVersion-1.7.2-informational?style=flat-square)
+![Version: 3.2.0](https://img.shields.io/badge/Version-3.2.0-informational?style=flat-square) ![AppVersion: 2.1.2](https://img.shields.io/badge/AppVersion-2.1.2-informational?style=flat-square)

 This server allows you to sync any Joplin client

@@ -88,7 +88,7 @@ N/A
 | env.TZ | string | `"UTC"` | Set the container timezone |
 | image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
 | image.repository | string | `"joplin/server"` | image repository |
-| image.tag | string | `"1.7.2"` | image tag |
+| image.tag | string | `"2.1.2"` | image tag |
 | ingress.main | object | See values.yaml | Enable and configure ingress settings for the chart under this key. |
 | postgresql | object | See values.yaml | Enable and configure postgresql database subchart under this key.    For more options see [postgresql chart documentation](https://github.com/bitnami/charts/tree/master/bitnami/postgresql) |
 | service | object | See values.yaml | Configures service settings for the chart. |
@@ -99,6 +99,12 @@ All notable changes to this application Helm chart will be documented in this fi

 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

+### [3.2.0]
+
+#### Changed
+
+- Updated Joplin Server version to 2.1.2, as 2.0 introduces breaking changes between client and server.
+
 ### [3.0.0]

 #### Added
--- a/charts/stable/joplin-server/README_CHANGELOG.md.gotmpl
+++ b/charts/stable/joplin-server/README_CHANGELOG.md.gotmpl
@@ -9,6 +9,12 @@ All notable changes to this application Helm chart will be documented in this fi

 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

+### [3.2.0]
+
+#### Changed
+
+- Updated Joplin Server version to 2.1.2, as 2.0 introduces breaking changes between client and server.
+
 ### [3.0.0]

 #### Added
--- a/charts/stable/joplin-server/values.yaml
+++ b/charts/stable/joplin-server/values.yaml
@@ -9,7 +9,7 @@ image:
  # -- image repository
  repository: joplin/server
    # -- image tag
-  tag: 1.7.2
+  tag: 2.1.2
  # -- image pull policy
  pullPolicy: IfNotPresent

--- a/charts/stable/pod-gateway/Chart.yaml
+++ b/charts/stable/pod-gateway/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 1.2.6
 description: Admision controller to change the default gateway and DNS server of PODs
 name: pod-gateway
-version: 3.2.1
+version: 3.2.2
 kubeVersion: ">=1.16.0-0"
 keywords:
 - pod-gateway
--- a/charts/stable/pod-gateway/README.md
+++ b/charts/stable/pod-gateway/README.md
@@ -1,6 +1,6 @@
 # pod-gateway

-![Version: 3.2.1](https://img.shields.io/badge/Version-3.2.1-informational?style=flat-square) ![AppVersion: 1.2.6](https://img.shields.io/badge/AppVersion-1.2.6-informational?style=flat-square)
+![Version: 3.2.2](https://img.shields.io/badge/Version-3.2.2-informational?style=flat-square) ![AppVersion: 1.2.6](https://img.shields.io/badge/AppVersion-1.2.6-informational?style=flat-square)

 Admision controller to change the default gateway and DNS server of PODs

@@ -100,17 +100,13 @@ certificates. It does not install it as dependency to avoid conflicts.
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | DNS | string | `"172.16.0.1"` | IP address of the DNS server within the vxlan tunnel. All mutated PODs will get this as their DNS server. It must match VXLAN_GATEWAY_IP in settings.sh |
-| addons.vpn.configFileSecret | string | `"openvpn"` |  |
 | addons.vpn.enabled | bool | `false` | Enable the VPN if you want to route through a VPN. You might also want to set VPN_BLOCK_OTHER_TRAFFIC to true for extra safeness in case the VPN does connect |
-| addons.vpn.env | string | `nil` |  |
 | addons.vpn.networkPolicy.egress[0].ports[0].port | int | `443` |  |
 | addons.vpn.networkPolicy.egress[0].ports[0].protocol | string | `"UDP"` |  |
 | addons.vpn.networkPolicy.egress[0].to[0].ipBlock.cidr | string | `"0.0.0.0/0"` |  |
 | addons.vpn.networkPolicy.egress[1].to[0].ipBlock.cidr | string | `"10.0.0.0/8"` |  |
 | addons.vpn.networkPolicy.enabled | bool | `true` |  |
-| addons.vpn.openvpn | string | `nil` |  |
 | addons.vpn.type | string | `"openvpn"` |  |
-| addons.vpn.wireguard | string | `nil` |  |
 | clusterName | string | `"cluster.local"` | cluster name used to derive the gateway full name |
 | image.pullPolicy | string | `"IfNotPresent"` | image pull policy of the gateway and inserted helper cotainers |
 | image.repository | string | `"ghcr.io/k8s-at-home/pod-gateway"` | image repository of the gateway and inserted helper containers |
@@ -143,6 +139,10 @@ All notable changes to this application Helm chart will be documented in this fi

 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

+### [3.2.2]
+
+- Remove some default values (`addons.vpn.openvpn`, `addons.vpn.wireguard`, `addons.vpn.env`, `addons.vpn.configFileSecret`) which were interfering with user supplied configuration.
+
 ### [3.0.2]

 #### Fixed
--- a/charts/stable/pod-gateway/README_CHANGELOG.md.gotmpl
+++ b/charts/stable/pod-gateway/README_CHANGELOG.md.gotmpl
@@ -9,6 +9,10 @@ All notable changes to this application Helm chart will be documented in this fi

 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

+### [3.2.2]
+
+- Remove some default values (`addons.vpn.openvpn`, `addons.vpn.wireguard`, `addons.vpn.env`, `addons.vpn.configFileSecret`) which were interfering with user supplied configuration.
+
 ### [3.0.2]

 #### Fixed
--- a/charts/stable/pod-gateway/values.yaml
+++ b/charts/stable/pod-gateway/values.yaml
@@ -73,10 +73,10 @@ addons:
    # for extra safeness in case the VPN does connect
    enabled: false
    type: openvpn
-    openvpn:
-    wireguard:
-    env:
-    configFileSecret: openvpn
+    # openvpn:
+    # wireguard:
+    # env:
+    # configFileSecret: openvpn
    networkPolicy:
      enabled: true
      egress: