From 77ffc073cfc1a1ebfe3fd20900d4f9ddb7811363 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=E1=B4=87=CA=80=C9=B4=E1=B4=85=20S=E1=B4=84=CA=9C?= =?UTF-8?q?=E1=B4=8F=CA=80=C9=A2=E1=B4=87=CA=80s?= Date: Fri, 11 Jun 2021 15:38:31 +0200 Subject: [PATCH] [pod-gateway] Fix sidecar command (#979) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Bᴇʀɴᴅ Sᴄʜᴏʀɢᴇʀs --- charts/stable/pod-gateway/Chart.yaml | 2 +- charts/stable/pod-gateway/README.md | 16 ++++++++++++---- .../pod-gateway/README_CHANGELOG.md.gotmpl | 8 ++++++++ .../templates/webhook-deployment.yaml | 2 +- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/charts/stable/pod-gateway/Chart.yaml b/charts/stable/pod-gateway/Chart.yaml index 0781d97f..ecbb3c22 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.0.0 +version: 3.0.1 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 023f74dd..f1e04998 100644 --- a/charts/stable/pod-gateway/README.md +++ b/charts/stable/pod-gateway/README.md @@ -1,6 +1,6 @@ # pod-gateway -![Version: 3.0.0](https://img.shields.io/badge/Version-3.0.0-informational?style=flat-square) ![AppVersion: 1.2.6](https://img.shields.io/badge/AppVersion-1.2.6-informational?style=flat-square) +![Version: 3.0.1](https://img.shields.io/badge/Version-3.0.1-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 @@ -126,7 +126,7 @@ certificates. It does not install it as dependency to avoid conflicts. | settings.VXLAN_GATEWAY_FIRST_DYNAMIC_IP | int | `20` | Keep a range of IPs for static assignment in nat.conf | | settings.VXLAN_ID | int | `42` | Vxlan ID to use | | settings.VXLAN_IP_NETWORK | string | `"172.16.0"` | VXLAN needs an /24 IP range not conflicting with K8S and local IP ranges | -| webhook | object | `{"gatewayAnnotation":"setGateway","gatewayDefault":true,"gatewayLabel":"setGateway","image":{"pullPolicy":"IfNotPresent","repository":"ghcr.io/k8s-at-home/gateway-admision-controller","tag":"v3.3.2"},"namespaceSelector":{"matchLabels":{"routed-gateway":"true"}},"replicas":1,"strategy":{"type":"RollingUpdate"}}` | The webhook is used to mutate the PODs matching the given namespace labels. It inserts an init and sidecard helper containers that connect to the gateway pod created by this chart. | +| webhook | object | See below | The webhook is used to mutate the PODs matching the given namespace labels. It inserts an init and sidecard helper containers that connect to the gateway pod created by this chart. | | webhook.gatewayAnnotation | string | `"setGateway"` | annotation name to check when evaluating POD. If true the POD will get the gateway. If not set setGatewayDefault will apply. | | webhook.gatewayDefault | bool | `true` | default behviour for new PODs in the evaluated namespace | | webhook.gatewayLabel | string | `"setGateway"` | label name to check when evaluating POD. If true the POD will get the gateway. If not set setGatewayDefault will apply. | @@ -143,6 +143,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.0.1] + +#### Fixed + +- Sidecar cmd was referring to the wrong script. + ### [3.0.0] #### Added @@ -152,8 +158,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), #### Changed -- **BREAKING**: Upgraded the common library dependency to version 3.0.1. This introduces several breaking changes (`service`, `ingress` and `persistence` keys have been refactored). - Be sure to check out the [library chart](https://github.com/k8s-at-home/library-charts/blob/common-3.0.1/charts/stable/common/) for the up-to-date values. +- **BREAKING**: Upgraded the common library dependency to version 3.0.2. This introduces several breaking changes (`service`, `ingress` and `persistence` keys have been refactored). + Be sure to check out the [library chart](https://github.com/k8s-at-home/library-charts/blob/common-3.0.2/charts/stable/common/) for the up-to-date values. #### Removed @@ -230,6 +236,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - N/A +[3.0.1]: #3.0.1 +[3.0.0]: #3.0.0 [1.0.0]: #1.0.0 ## Support diff --git a/charts/stable/pod-gateway/README_CHANGELOG.md.gotmpl b/charts/stable/pod-gateway/README_CHANGELOG.md.gotmpl index e29a5e90..d79dcf96 100644 --- a/charts/stable/pod-gateway/README_CHANGELOG.md.gotmpl +++ b/charts/stable/pod-gateway/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.0.1] + +#### Fixed + +- Sidecar cmd was referring to the wrong script. + ### [3.0.0] #### Added @@ -96,5 +102,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - N/A +[3.0.1]: #3.0.1 +[3.0.0]: #3.0.0 [1.0.0]: #1.0.0 {{- end -}} diff --git a/charts/stable/pod-gateway/templates/webhook-deployment.yaml b/charts/stable/pod-gateway/templates/webhook-deployment.yaml index c626ac0c..7855cf92 100644 --- a/charts/stable/pod-gateway/templates/webhook-deployment.yaml +++ b/charts/stable/pod-gateway/templates/webhook-deployment.yaml @@ -59,7 +59,7 @@ spec: # Sidecar container - --sidecarImage={{ .Values.image.repository }}:{{ .Values.image.tag }} - --sidecarImagePullPol={{ .Values.image.pullPolicy }} - - --sidecarCmd=/bin/sidecar_init.sh + - --sidecarCmd=/bin/client_sidecar.sh - --sidecarMountPoint=/config ports: - name: http