Skip to content
This repository has been archived by the owner on Apr 25, 2023. It is now read-only.

Commit

Permalink
Merge pull request #1310 from armandgrillet/service-labels
Browse files Browse the repository at this point in the history 
chore: Add labels to service
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot authored Oct 23, 2020
2 parents 1b421d6 + 5dd36e7 commit 513f5e7
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 9 deletions.
17 changes: 9 additions & 8 deletions charts/kubefed/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,24 +103,25 @@ chart and their default values.
| controllermanager.image | Name of the KubeFed image. | kubefed |
| controllermanager.tag | Tag of the KubeFed image. | latest |
| controllermanager.imagePullPolicy | Image pull policy. | IfNotPresent |
| controllermanager.commonTolerations | Tolerations for all the pods. | [] |
| controllermanager.commonNodeSelector | Node selector for all the pods. | {} |
| controllermanager.commonTolerations | Tolerations for all the pods. | [] |
| controllermanager.commonNodeSelector | Node selector for all the pods. | {} |
| controllermanager.featureGates.PushReconciler | Push reconciler feature. | true |
| controllermanager.featureGates.SchedulerPreferences | Scheduler preferences feature. | true |
| controllermanager.featureGates.CrossClusterServiceDiscovery | Cross cluster service discovery feature. | false |
| controllermanager.featureGates.FederatedIngress | Federated ingress feature. | false |
| controllermanager.featureGates.CrossClusterServiceDiscovery | Cross cluster service discovery feature. | false |
| controllermanager.featureGates.FederatedIngress | Federated ingress feature. | false |
| controllermanager.clusterAvailableDelay | Time to wait before reconciling on a healthy cluster. | 20s |
| controllermanager.clusterUnavailableDelay | Time to wait before giving up on an unhealthy cluster. | 60s |
| controllermanager.leaderElectLeaseDuration | The maximum duration that a leader can be stopped before it is replaced by another candidate. | 15s |
| controllermanager.leaderElectRenewDeadline | The interval between attempts by the acting master to renew a leadership slot before it stops leading. This must be less than or equal to `controllermanager.LeaderElectLeaseDuration. | 10s |
| controllermanager.leaderElectRetryPeriod | The duration the clients should wait between attempting acquisition and renewal of a leadership. | 5s |
| controllermanager.leaderElectResourceLock | The type of resource object that is used for locking during leader election. Supported options are `configmaps` and `endpoints`. | configmaps |
| controllermanager.clusterHealthCheckPeriod | How often to monitor the cluster health. | 10s |
| controllermanager.clusterHealthCheckPeriod | How often to monitor the cluster health. | 10s |
| controllermanager.clusterHealthCheckFailureThreshold | Minimum consecutive failures for the cluster health to be considered failed after having succeeded. | 3 |
| controllermanager.clusterHealthCheckSuccessThreshold | Minimum consecutive successes for the cluster health to be considered successful after having failed. | 1 |
| controllermanager.clusterHealthCheckTimeout | Duration after which the cluster health check times out. | 3s |
| controllermanager.syncController.adoptResources | Whether to adopt pre-existing resource in member clusters. | Enabled |
| global.scope | Whether the KubeFed namespace will be the only target for the control plane. | Cluster |
| controllermanager.clusterHealthCheckTimeout | Duration after which the cluster health check times out. | 3s |
| controllermanager.syncController.adoptResources | Whether to adopt pre-existing resource in member clusters. | Enabled |
| controllermanager.service.labels | Kubernetes labels attached to the controller manager's services | {} |
| global.scope | Whether the KubeFed namespace will be the only target for the control plane. | Cluster |

Specify each parameter using the `--set key=value[,key=value]` argument to
`helm install`.
Expand Down
8 changes: 8 additions & 0 deletions charts/kubefed/charts/controllermanager/templates/service.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ kind: Service
metadata:
name: kubefed-admission-webhook
namespace: {{ .Release.Namespace }}
{{- if .Values.service.labels }}
labels:
{{ toYaml .Values.service.labels | indent 4 }}
{{- end }}
spec:
selector:
kubefed-admission-webhook: "true"
Expand All @@ -15,6 +19,10 @@ kind: Service
metadata:
name: kubefed-controller-manager-metrics-service
namespace: {{ .Release.Namespace }}
{{- if .Values.service.labels }}
labels:
{{ toYaml .Values.service.labels | indent 4 }}
{{- end }}
annotations:
prometheus.io/port: "9090"
prometheus.io/scheme: http
Expand Down
5 changes: 4 additions & 1 deletion charts/kubefed/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,13 @@ controllermanager:
certManager:
enabled: false

service:
labels: {}

## Configuration global values for all charts
##
global:
## The scope of the the kubefed control plane. Supported options
## The scope of the the kubefed control plane. Supported options
## are `Cluster` (watch cluster-scoped resources and resources in
## all namespaces) and `Namespaced` (only watch resources in the
## kubefed system namespace). If unset, will default to `Cluster`.
Expand Down

0 comments on commit 513f5e7

Please sign in to comment.