forked from gardener/gardener
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move
seed-bootstrap chart and monitoring-related logic in Seed co…
…ntroller into `monitoring` component (gardener#8237) * Component boilerplate * Deploy component in seed flow * Move `fluentoperator` custom resource component creation into dedicated function * Move VPA cleanup code into component * Drop dead code * Move remaining monitoring-related code into component The chart will be moved in the next commit, accordingly the rendering logic will be adapted * Move chart and apply it from embedded file system * Address PR review feedback
- Loading branch information
Showing
57 changed files
with
510 additions
and
348 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,276 @@ | ||
| // Copyright 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package monitoring | ||
|
|
||
| import ( | ||
| "context" | ||
| "embed" | ||
| "fmt" | ||
| "path/filepath" | ||
| "strings" | ||
|
|
||
| corev1 "k8s.io/api/core/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" | ||
| "k8s.io/apimachinery/pkg/runtime/schema" | ||
| vpaautoscalingv1 "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1" | ||
| "k8s.io/utils/pointer" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
|
|
||
| v1beta1constants "github.com/gardener/gardener/pkg/apis/core/v1beta1/constants" | ||
| "github.com/gardener/gardener/pkg/client/kubernetes" | ||
| "github.com/gardener/gardener/pkg/component" | ||
| "github.com/gardener/gardener/pkg/component/hvpa" | ||
| "github.com/gardener/gardener/pkg/component/istio" | ||
| "github.com/gardener/gardener/pkg/component/kubestatemetrics" | ||
| "github.com/gardener/gardener/pkg/operation/common" | ||
| "github.com/gardener/gardener/pkg/utils" | ||
| kubernetesutils "github.com/gardener/gardener/pkg/utils/kubernetes" | ||
| secretsutils "github.com/gardener/gardener/pkg/utils/secrets" | ||
| secretsmanager "github.com/gardener/gardener/pkg/utils/secrets/manager" | ||
| ) | ||
|
|
||
| var ( | ||
| //go:embed charts/bootstrap | ||
| chart embed.FS | ||
| chartPath = filepath.Join("charts", "bootstrap") | ||
| ) | ||
|
|
||
| // Values is a set of configuration values for the monitoring components. | ||
| type Values struct { | ||
| // AlertingSMTPSecret is the alerting SMTP secret.. | ||
| AlertingSMTPSecret *corev1.Secret | ||
| // GlobalMonitoringSecret is the global monitoring secret for the garden cluster. | ||
| GlobalMonitoringSecret *corev1.Secret | ||
| // HVPAEnabled states whether HVPA is enabled or not. | ||
| HVPAEnabled bool | ||
| // ImageAlertmanager is the image of Alertmanager. | ||
| ImageAlertmanager string | ||
| // ImageAlpine is the image of Alpine. | ||
| ImageAlpine string | ||
| // ImageConfigmapReloader is the image of ConfigmapReloader. | ||
| ImageConfigmapReloader string | ||
| // ImagePrometheus is the image of Prometheus. | ||
| ImagePrometheus string | ||
| // IngressHost is the host name of Prometheus. | ||
| IngressHost string | ||
| // SeedName is the name of the seed. | ||
| SeedName string | ||
| // StorageCapacityAlertmanager is the storage capacity of Alertmanager. | ||
| StorageCapacityAlertmanager string | ||
| // StorageCapacityPrometheus is the storage capacity of Prometheus. | ||
| StorageCapacityPrometheus string | ||
| // StorageCapacityAggregatePrometheus is the storage capacity of AggregatePrometheus. | ||
| StorageCapacityAggregatePrometheus string | ||
| // WildcardCertName is name of wildcard tls certificate which is issued for the seed's ingress domain. | ||
| WildcardCertName *string | ||
| } | ||
|
|
||
| // New creates a new instance of Deployer for the monitoring components. | ||
| func New( | ||
| client client.Client, | ||
| chartApplier kubernetes.ChartApplier, | ||
| secretsManager secretsmanager.Interface, | ||
| namespace string, | ||
| values Values, | ||
| ) component.Deployer { | ||
| return &bootstrapper{ | ||
| client: client, | ||
| chartApplier: chartApplier, | ||
| namespace: namespace, | ||
| secretsManager: secretsManager, | ||
| values: values, | ||
| } | ||
| } | ||
|
|
||
| type bootstrapper struct { | ||
| client client.Client | ||
| chartApplier kubernetes.ChartApplier | ||
| namespace string | ||
| secretsManager secretsmanager.Interface | ||
| values Values | ||
| } | ||
|
|
||
| func (b *bootstrapper) Deploy(ctx context.Context) error { | ||
| if b.values.HVPAEnabled { | ||
| if err := kubernetesutils.DeleteObjects(ctx, b.client, | ||
| &vpaautoscalingv1.VerticalPodAutoscaler{ObjectMeta: metav1.ObjectMeta{Name: "prometheus-vpa", Namespace: b.namespace}}, | ||
| &vpaautoscalingv1.VerticalPodAutoscaler{ObjectMeta: metav1.ObjectMeta{Name: "aggregate-prometheus-vpa", Namespace: b.namespace}}, | ||
| ); err != nil { | ||
| return err | ||
| } | ||
| } | ||
|
|
||
| // Fetch component-specific aggregate and central monitoring configuration | ||
| var ( | ||
| aggregateScrapeConfigs = strings.Builder{} | ||
| aggregateMonitoringComponentFunctions = []component.AggregateMonitoringConfiguration{ | ||
| istio.AggregateMonitoringConfiguration, | ||
| } | ||
|
|
||
| centralScrapeConfigs = strings.Builder{} | ||
| centralCAdvisorScrapeConfigMetricRelabelConfigs = strings.Builder{} | ||
| centralMonitoringComponentFunctions = []component.CentralMonitoringConfiguration{ | ||
| hvpa.CentralMonitoringConfiguration, | ||
| kubestatemetrics.CentralMonitoringConfiguration, | ||
| } | ||
| ) | ||
|
|
||
| for _, componentFn := range aggregateMonitoringComponentFunctions { | ||
| aggregateMonitoringConfig, err := componentFn() | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| for _, config := range aggregateMonitoringConfig.ScrapeConfigs { | ||
| aggregateScrapeConfigs.WriteString(fmt.Sprintf("- %s\n", utils.Indent(config, 2))) | ||
| } | ||
| } | ||
|
|
||
| for _, componentFn := range centralMonitoringComponentFunctions { | ||
| centralMonitoringConfig, err := componentFn() | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| for _, config := range centralMonitoringConfig.ScrapeConfigs { | ||
| centralScrapeConfigs.WriteString(fmt.Sprintf("- %s\n", utils.Indent(config, 2))) | ||
| } | ||
|
|
||
| for _, config := range centralMonitoringConfig.CAdvisorScrapeConfigMetricRelabelConfigs { | ||
| centralCAdvisorScrapeConfigMetricRelabelConfigs.WriteString(fmt.Sprintf("- %s\n", utils.Indent(config, 2))) | ||
| } | ||
| } | ||
|
|
||
| // Monitoring resource values | ||
| monitoringResources := map[string]interface{}{ | ||
| "prometheus": map[string]interface{}{}, | ||
| "aggregate-prometheus": map[string]interface{}{}, | ||
| } | ||
|
|
||
| if b.values.HVPAEnabled { | ||
| for resource := range monitoringResources { | ||
| currentResources, err := kubernetesutils.GetContainerResourcesInStatefulSet(ctx, b.client, kubernetesutils.Key(b.namespace, resource)) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if len(currentResources) != 0 && currentResources["prometheus"] != nil { | ||
| monitoringResources[resource] = map[string]interface{}{ | ||
| "prometheus": currentResources["prometheus"], | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // AlertManager configuration | ||
| alertManagerConfig := map[string]interface{}{ | ||
| "storage": b.values.StorageCapacityAlertmanager, | ||
| } | ||
|
|
||
| if b.values.AlertingSMTPSecret != nil { | ||
| emailConfig := map[string]interface{}{ | ||
| "to": string(b.values.AlertingSMTPSecret.Data["to"]), | ||
| "from": string(b.values.AlertingSMTPSecret.Data["from"]), | ||
| "smarthost": string(b.values.AlertingSMTPSecret.Data["smarthost"]), | ||
| "auth_username": string(b.values.AlertingSMTPSecret.Data["auth_username"]), | ||
| "auth_identity": string(b.values.AlertingSMTPSecret.Data["auth_identity"]), | ||
| "auth_password": string(b.values.AlertingSMTPSecret.Data["auth_password"]), | ||
| } | ||
| alertManagerConfig["enabled"] = true | ||
| alertManagerConfig["emailConfigs"] = []map[string]interface{}{emailConfig} | ||
| } else { | ||
| alertManagerConfig["enabled"] = false | ||
| if err := common.DeleteAlertmanager(ctx, b.client, b.namespace); err != nil { | ||
| return err | ||
| } | ||
| } | ||
|
|
||
| var ( | ||
| vpaGK = schema.GroupKind{Group: "autoscaling.k8s.io", Kind: "VerticalPodAutoscaler"} | ||
| hvpaGK = schema.GroupKind{Group: "autoscaling.k8s.io", Kind: "Hvpa"} | ||
| issuerGK = schema.GroupKind{Group: "certmanager.k8s.io", Kind: "ClusterIssuer"} | ||
|
|
||
| applierOptions = kubernetes.CopyApplierOptions(kubernetes.DefaultMergeFuncs) | ||
| retainStatusInformation = func(new, old *unstructured.Unstructured) { | ||
| // Apply status from old Object to retain status information | ||
| new.Object["status"] = old.Object["status"] | ||
| } | ||
| ) | ||
|
|
||
| applierOptions[vpaGK] = retainStatusInformation | ||
| applierOptions[hvpaGK] = retainStatusInformation | ||
| applierOptions[issuerGK] = retainStatusInformation | ||
|
|
||
| var ingressTLSSecretName string | ||
| if b.values.WildcardCertName != nil { | ||
| ingressTLSSecretName = *b.values.WildcardCertName | ||
| } else { | ||
| ingressTLSSecret, err := b.secretsManager.Generate(ctx, &secretsutils.CertificateSecretConfig{ | ||
| Name: "aggregate-prometheus-tls", | ||
| CommonName: "prometheus", | ||
| Organization: []string{"gardener.cloud:monitoring:ingress"}, | ||
| DNSNames: []string{b.values.IngressHost}, | ||
| CertType: secretsutils.ServerCert, | ||
| Validity: pointer.Duration(v1beta1constants.IngressTLSCertificateValidity), | ||
| SkipPublishingCACertificate: true, | ||
| }, secretsmanager.SignedByCA(v1beta1constants.SecretNameCASeed)) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| ingressTLSSecretName = ingressTLSSecret.Name | ||
| } | ||
|
|
||
| values := kubernetes.Values(map[string]interface{}{ | ||
| "global": map[string]interface{}{ | ||
| "ingressClass": v1beta1constants.SeedNginxIngressClass, | ||
| "images": map[string]string{ | ||
| "alertmanager": b.values.ImageAlertmanager, | ||
| "alpine": b.values.ImageAlpine, | ||
| "configmap-reloader": b.values.ImageConfigmapReloader, | ||
| "prometheus": b.values.ImagePrometheus, | ||
| }, | ||
| }, | ||
| "prometheus": map[string]interface{}{ | ||
| "resources": monitoringResources["prometheus"], | ||
| "storage": b.values.StorageCapacityPrometheus, | ||
| "additionalScrapeConfigs": centralScrapeConfigs.String(), | ||
| "additionalCAdvisorScrapeConfigMetricRelabelConfigs": centralCAdvisorScrapeConfigMetricRelabelConfigs.String(), | ||
| }, | ||
| "aggregatePrometheus": map[string]interface{}{ | ||
| "resources": monitoringResources["aggregate-prometheus"], | ||
| "storage": b.values.StorageCapacityAggregatePrometheus, | ||
| "seed": b.values.SeedName, | ||
| "hostName": b.values.IngressHost, | ||
| "secretName": ingressTLSSecretName, | ||
| "additionalScrapeConfigs": aggregateScrapeConfigs.String(), | ||
| }, | ||
| "alertmanager": alertManagerConfig, | ||
| "hvpa": map[string]interface{}{ | ||
| "enabled": b.values.HVPAEnabled, | ||
| }, | ||
| "istio": map[string]interface{}{ | ||
| "enabled": true, | ||
| }, | ||
| "ingress": map[string]interface{}{ | ||
| "authSecretName": b.values.GlobalMonitoringSecret.Name, | ||
| }, | ||
| }) | ||
|
|
||
| return b.chartApplier.ApplyFromEmbeddedFS(ctx, chart, chartPath, b.namespace, "monitoring", values, applierOptions) | ||
| } | ||
|
|
||
| func (b *bootstrapper) Destroy(ctx context.Context) error { | ||
| return nil | ||
| } |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
...itoring/templates/clusterrolebinding.yaml → ...itoring/templates/clusterrolebinding.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
...rts/monitoring/templates/statefulset.yaml → ...rts/monitoring/templates/statefulset.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
...regate-prometheus/clusterrolebinding.yaml → ...regate-prometheus/clusterrolebinding.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...mplates/aggregate-prometheus/ingress.yaml → ...mplates/aggregate-prometheus/ingress.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
...tes/aggregate-prometheus/statefulset.yaml → ...tes/aggregate-prometheus/statefulset.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
Oops, something went wrong.