Skip to content

Commit

Permalink
Add some required changes after gardener version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
plkokanov committed Jul 10, 2024
1 parent e26d373 commit 7bc3d95
Show file tree
Hide file tree
Showing 4 changed files with 150 additions and 125 deletions.
7 changes: 3 additions & 4 deletions example/controller-registration.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
---
apiVersion: core.gardener.cloud/v1beta1
apiVersion: core.gardener.cloud/v1
kind: ControllerDeployment
metadata:
name: extension-shoot-rsyslog-relp
type: helm
providerConfig:
chart: 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
helm:
rawChart: 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
values:
image: europe-docker.pkg.dev/gardener-project/public/gardener/extensions/shoot-rsyslog-relp:v0.6.0-dev
---
Expand Down
14 changes: 7 additions & 7 deletions pkg/controller/lifecycle/monitoring.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ func deployMonitoringConfig(ctx context.Context, c client.Client, namespace stri
ScrapeTimeout: ptr.To(monitoringv1.Duration("30s")),
Scheme: ptr.To("HTTPS"),
// This is needed because the kubelets' certificates are not are generated for a specific pod IP
TLSConfig: &monitoringv1.SafeTLSConfig{InsecureSkipVerify: true},
TLSConfig: &monitoringv1.SafeTLSConfig{InsecureSkipVerify: ptr.To(true)},
Authorization: &monitoringv1.SafeAuthorization{Credentials: &corev1.SecretKeySelector{
LocalObjectReference: corev1.LocalObjectReference{Name: "shoot-access-prometheus-shoot"},
Key: "token",
Expand All @@ -124,18 +124,18 @@ func deployMonitoringConfig(ctx context.Context, c client.Client, namespace stri
Key: "token",
}},
// This is needed because we do not fetch the correct cluster CA bundle right now
TLSConfig: &monitoringv1.SafeTLSConfig{InsecureSkipVerify: true},
TLSConfig: &monitoringv1.SafeTLSConfig{InsecureSkipVerify: ptr.To(true)},
FollowRedirects: ptr.To(true),
}},
RelabelConfigs: []*monitoringv1.RelabelConfig{
RelabelConfigs: []monitoringv1.RelabelConfig{
{
Action: "replace",
Replacement: "rsyslog-metrics",
Replacement: ptr.To("rsyslog-metrics"),
TargetLabel: "job",
},
{
TargetLabel: "type",
Replacement: "shoot",
Replacement: ptr.To("shoot"),
},
{
SourceLabels: []monitoringv1.LabelName{"__meta_kubernetes_service_name", "__meta_kubernetes_endpoint_port_name"},
Expand All @@ -156,13 +156,13 @@ func deployMonitoringConfig(ctx context.Context, c client.Client, namespace stri
},
{
TargetLabel: "__address__",
Replacement: "kube-apiserver:443",
Replacement: ptr.To("kube-apiserver:443"),
},
{
SourceLabels: []monitoringv1.LabelName{"__meta_kubernetes_pod_name", "__meta_kubernetes_pod_container_port_number"},
Regex: `(.+);(.+)`,
TargetLabel: "__metrics_path__",
Replacement: "/api/v1/namespaces/kube-system/pods/${1}:${2}/proxy/metrics",
Replacement: ptr.To("/api/v1/namespaces/kube-system/pods/${1}:${2}/proxy/metrics"),
},
},
MetricRelabelConfigs: monitoringutils.StandardMetricRelabelConfig("rsyslog_.+"),
Expand Down
8 changes: 4 additions & 4 deletions skaffold.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ deploy:
profiles:
- name: remote-extension
patches:
- op: add
path: /deploy/helm/releases/0/setValues
value:
global.vpa.enabled: false
- op: add
path: /deploy/helm/releases/0/setValues
value:
global.vpa.enabled: false
Loading

0 comments on commit 7bc3d95

Please sign in to comment.