From 9cd4a424651661216dcfdaf8b50b4f4f6e44a3f3 Mon Sep 17 00:00:00 2001 From: Jack Maloney Date: Mon, 28 Jun 2021 12:24:16 -0500 Subject: [PATCH] [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 --- charts/stable/pod-gateway/Chart.yaml | 2 +- charts/stable/pod-gateway/README.md | 10 +++++----- charts/stable/pod-gateway/README_CHANGELOG.md.gotmpl | 4 ++++ charts/stable/pod-gateway/values.yaml | 8 ++++---- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/charts/stable/pod-gateway/Chart.yaml b/charts/stable/pod-gateway/Chart.yaml index 94965a5b..abaa05db 100644 --- 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 diff --git a/charts/stable/pod-gateway/README.md b/charts/stable/pod-gateway/README.md index 1c1fe7ae..515123b4 100644 --- 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 diff --git a/charts/stable/pod-gateway/README_CHANGELOG.md.gotmpl b/charts/stable/pod-gateway/README_CHANGELOG.md.gotmpl index 10428a88..15b965ff 100644 --- 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 diff --git a/charts/stable/pod-gateway/values.yaml b/charts/stable/pod-gateway/values.yaml index d932ed84..42e1bad7 100644 --- 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: