From 36b3fd542148188f5b66fdb995ad34c0e9dc8c0f Mon Sep 17 00:00:00 2001 From: qinghui wang Date: Tue, 15 Dec 2020 13:15:41 +0800 Subject: [PATCH 1/3] optimize chart readme --- charts/kubefed/README.md | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/charts/kubefed/README.md b/charts/kubefed/README.md index ada0a5e624..dfc93a31b7 100644 --- a/charts/kubefed/README.md +++ b/charts/kubefed/README.md @@ -24,7 +24,7 @@ group](https://groups.google.com/forum/#!forum/kubernetes-sig-multicluster). ## Prerequisites -- Kubernetes 1.13+ +- Kubernetes 1.16+ - Helm 3.2+ ## Installing the Chart @@ -98,14 +98,19 @@ chart and their default values. | Parameter | Description | Default | | ------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------| | controllermanager.enabled | Specifies whether to enable the controller manager in KubeFed. | true | -| controllermanager.replicaCount | Number of replicas for KubeFed controller manager. | 2 | -| controllermanager.repository | Repo of the KubeFed image. | quay.io/kubernetes-multicluster | -| controllermanager.image | Name of the KubeFed image. | kubefed | -| controllermanager.tag | Tag of the KubeFed image. | latest | -| controllermanager.imagePullPolicy | Image pull policy. | IfNotPresent | | controllermanager.imagePullSecrets | Image pull secrets. | [] | controllermanager.commonTolerations | Tolerations for all the pods. | [] | | controllermanager.commonNodeSelector | Node selector for all the pods. | {} | +| controllermanager.controller.repository | Repo of the KubeFed image. | quay.io/kubernetes-multicluster | +| controllermanager.controller.image | Name of the KubeFed image. | kubefed | +| controllermanager.controller.tag | Tag of the KubeFed image. | canary | +| controllermanager.controller.replicaCount | Number of replicas for KubeFed controller manager. | 2 | +| controllermanager.controller.imagePullPolicy | Image pull policy. | IfNotPresent | +| controllermanager.webhook.repository | Repo of the KubeFed image. | quay.io/kubernetes-multicluster | +| controllermanager.webhook.image | Name of the KubeFed image. | kubefed | +| controllermanager.webhook.tag | Tag of the KubeFed image. | canary | +| controllermanager.controller.replicaCount | Number of replicas for KubeFed controller manager. | 1 | +| controllermanager.controller.imagePullPolicy | Image pull policy. | IfNotPresent | | controllermanager.featureGates.PushReconciler | Push reconciler feature. | true | | controllermanager.featureGates.SchedulerPreferences | Scheduler preferences feature. | true | | controllermanager.featureGates.CrossClusterServiceDiscovery | Cross cluster service discovery feature. | false | From 208f8db7e7f3d5eed18e8ff428007f34c8dd1988 Mon Sep 17 00:00:00 2001 From: qinghui wang Date: Wed, 16 Dec 2020 00:10:36 +0800 Subject: [PATCH 2/3] webhook image fix --- charts/kubefed/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/kubefed/README.md b/charts/kubefed/README.md index dfc93a31b7..c2ca86d465 100644 --- a/charts/kubefed/README.md +++ b/charts/kubefed/README.md @@ -109,8 +109,8 @@ chart and their default values. | controllermanager.webhook.repository | Repo of the KubeFed image. | quay.io/kubernetes-multicluster | | controllermanager.webhook.image | Name of the KubeFed image. | kubefed | | controllermanager.webhook.tag | Tag of the KubeFed image. | canary | -| controllermanager.controller.replicaCount | Number of replicas for KubeFed controller manager. | 1 | -| controllermanager.controller.imagePullPolicy | Image pull policy. | IfNotPresent | +| controllermanager.webhook.replicaCount | Number of replicas for KubeFed controller manager. | 1 | +| controllermanager.webhook.imagePullPolicy | Image pull policy. | IfNotPresent | | controllermanager.featureGates.PushReconciler | Push reconciler feature. | true | | controllermanager.featureGates.SchedulerPreferences | Scheduler preferences feature. | true | | controllermanager.featureGates.CrossClusterServiceDiscovery | Cross cluster service discovery feature. | false | From 48e5f87ef7c59a8929c6a1217bb8dd115bb5ab98 Mon Sep 17 00:00:00 2001 From: qinghui wang Date: Wed, 16 Dec 2020 00:16:38 +0800 Subject: [PATCH 3/3] fix webhook chart --- charts/kubefed/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/charts/kubefed/README.md b/charts/kubefed/README.md index c2ca86d465..ff626e7946 100644 --- a/charts/kubefed/README.md +++ b/charts/kubefed/README.md @@ -109,7 +109,6 @@ chart and their default values. | controllermanager.webhook.repository | Repo of the KubeFed image. | quay.io/kubernetes-multicluster | | controllermanager.webhook.image | Name of the KubeFed image. | kubefed | | controllermanager.webhook.tag | Tag of the KubeFed image. | canary | -| controllermanager.webhook.replicaCount | Number of replicas for KubeFed controller manager. | 1 | | controllermanager.webhook.imagePullPolicy | Image pull policy. | IfNotPresent | | controllermanager.featureGates.PushReconciler | Push reconciler feature. | true | | controllermanager.featureGates.SchedulerPreferences | Scheduler preferences feature. | true |