From 1b24806fa3756eb7cc8232d64fd618d1b4f370a2 Mon Sep 17 00:00:00 2001 From: Dario Tranchitella Date: Tue, 13 Sep 2022 10:52:41 +0200 Subject: [PATCH] fix(helm): protocol is not required for external etcd endpoints --- charts/kamaji/Chart.yaml | 2 +- charts/kamaji/README.md | 4 ++-- charts/kamaji/values.yaml | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/charts/kamaji/Chart.yaml b/charts/kamaji/Chart.yaml index 67ff769..cf6f942 100644 --- a/charts/kamaji/Chart.yaml +++ b/charts/kamaji/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.9.0 +version: 0.9.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/kamaji/README.md b/charts/kamaji/README.md index 51b6ab0..7f7b717 100644 --- a/charts/kamaji/README.md +++ b/charts/kamaji/README.md @@ -1,6 +1,6 @@ # kamaji -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.0](https://img.shields.io/badge/AppVersion-0.1.0-informational?style=flat-square) +![Version: 0.9.1](https://img.shields.io/badge/Version-0.9.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.0](https://img.shields.io/badge/AppVersion-0.1.0-informational?style=flat-square) Kamaji is a tool aimed to build and operate a Managed Kubernetes Service with a fraction of the operational burden. With Kamaji, you can deploy and operate hundreds of Kubernetes clusters as a hyper-scaler. @@ -97,7 +97,7 @@ Here the values you can override: | etcd.overrides.caSecret.namespace | string | `"kamaji-system"` | Namespace of the secret which contains CA's certificate and private key. (default: "kamaji-system") | | etcd.overrides.clientSecret.name | string | `"root-client-certs"` | Name of the secret which contains ETCD client certificates. (default: "root-client-certs") | | etcd.overrides.clientSecret.namespace | string | `"kamaji-system"` | Name of the namespace where the secret which contains ETCD client certificates is. (default: "kamaji-system") | -| etcd.overrides.endpoints | object | `{"etcd-0":"https://etcd-0.etcd.kamaji-system.svc.cluster.local","etcd-1":"https://etcd-1.etcd.kamaji-system.svc.cluster.local","etcd-2":"https://etcd-2.etcd.kamaji-system.svc.cluster.local"}` | (map) Dictionary of the endpoints for the etcd cluster's members, key is the name of the etcd server. Don't define any port, inflected from .etcd.peerApiPort value. | +| etcd.overrides.endpoints | object | `{"etcd-0":"etcd-0.etcd.kamaji-system.svc.cluster.local","etcd-1":"etcd-1.etcd.kamaji-system.svc.cluster.local","etcd-2":"etcd-2.etcd.kamaji-system.svc.cluster.local"}` | (map) Dictionary of the endpoints for the etcd cluster's members, key is the name of the etcd server. Don't define the protocol (TLS is automatically inflected), or any port, inflected from .etcd.peerApiPort value. | | etcd.peerApiPort | int | `2380` | The peer API port which servers are listening to. | | etcd.persistence.accessModes[0] | string | `"ReadWriteOnce"` | | | etcd.persistence.size | string | `"10Gi"` | | diff --git a/charts/kamaji/values.yaml b/charts/kamaji/values.yaml index 9b9a076..70bdffb 100644 --- a/charts/kamaji/values.yaml +++ b/charts/kamaji/values.yaml @@ -67,11 +67,11 @@ etcd: name: root-client-certs # -- Name of the namespace where the secret which contains ETCD client certificates is. (default: "kamaji-system") namespace: kamaji-system - # -- (map) Dictionary of the endpoints for the etcd cluster's members, key is the name of the etcd server. Don't define any port, inflected from .etcd.peerApiPort value. + # -- (map) Dictionary of the endpoints for the etcd cluster's members, key is the name of the etcd server. Don't define the protocol (TLS is automatically inflected), or any port, inflected from .etcd.peerApiPort value. endpoints: - etcd-0: https://etcd-0.etcd.kamaji-system.svc.cluster.local - etcd-1: https://etcd-1.etcd.kamaji-system.svc.cluster.local - etcd-2: https://etcd-2.etcd.kamaji-system.svc.cluster.local + etcd-0: etcd-0.etcd.kamaji-system.svc.cluster.local + etcd-1: etcd-1.etcd.kamaji-system.svc.cluster.local + etcd-2: etcd-2.etcd.kamaji-system.svc.cluster.local # -- ETCD Compaction interval (e.g. "5m0s"). (default: "0" (disabled)) compactionInterval: 0