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-monitoring
and shoot-core
charts and monitoring-related…
… logic in `Shoot` controller into `monitoring` component (gardener#8243) * Move `plutono`-related functions in dedicated file * Component boilerplate * Deploy component in shoot flow * Move deletion code into component * Move custom alerting config code into component * Move alerting rules/scrape configs computation into component * Move secrets manager handling into component * Move Prometheus chart value computation logic into component * Move Alertmanager chart value computation logic into component * Move chart and apply it from embedded file system * Move `DeleteAlertmanager` function into component package * Namespace UID and components are only known later * Cleanup `common` package * Move Prometheus-specific content of `shoot-core` chart into component * Embed `shoot-core` chart as well When we raise the minimum Kubernetes version to 1.26, we can drop all this. * Drop `utils-templates` and `utils-common` Helm charts * Address PR review feedback * Address PR review feedback
- Loading branch information
Showing
148 changed files
with
1,405 additions
and
1,510 deletions.
There are no files selected for viewing
1 change: 0 additions & 1 deletion
1
charts/gardener/controlplane/charts/application/charts/utils-common
This file was deleted.
Oops, something went wrong.
1 change: 0 additions & 1 deletion
1
charts/gardener/controlplane/charts/application/charts/utils-templates
This file was deleted.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
...trolplane/charts/application/templates/apiservice-v1alpha1-operations-gardener-cloud.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
2 changes: 1 addition & 1 deletion
2
...plane/charts/application/templates/apiservice-v1alpha1-seedmanagement-gardener-cloud.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
2 changes: 1 addition & 1 deletion
2
...ontrolplane/charts/application/templates/apiservice-v1alpha1-settings-gardener-cloud.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
2 changes: 1 addition & 1 deletion
2
...ner/controlplane/charts/application/templates/apiservice-v1beta1-core-gardener-cloud.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
2 changes: 1 addition & 1 deletion
2
.../gardener/controlplane/charts/application/templates/clusterrole-admission-controller.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
2 changes: 1 addition & 1 deletion
2
charts/gardener/controlplane/charts/application/templates/clusterrole-apiserver.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
2 changes: 1 addition & 1 deletion
2
...ts/gardener/controlplane/charts/application/templates/clusterrole-controller-manager.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
2 changes: 1 addition & 1 deletion
2
charts/gardener/controlplane/charts/application/templates/clusterrole-seed-bootstrapper.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
2 changes: 1 addition & 1 deletion
2
charts/gardener/controlplane/charts/application/templates/clusterrole-seeds.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
2 changes: 1 addition & 1 deletion
2
...er/controlplane/charts/application/templates/clusterrolebinding-admission-controller.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
2 changes: 1 addition & 1 deletion
2
...ontrolplane/charts/application/templates/clusterrolebinding-apiserver-auth-delegator.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
2 changes: 1 addition & 1 deletion
2
charts/gardener/controlplane/charts/application/templates/clusterrolebinding-apiserver.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
2 changes: 1 addition & 1 deletion
2
...ener/controlplane/charts/application/templates/clusterrolebinding-controller-manager.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
2 changes: 1 addition & 1 deletion
2
...r/controlplane/charts/application/templates/clusterrolebinding-kube-aggregator-admin.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
2 changes: 1 addition & 1 deletion
2
charts/gardener/controlplane/charts/application/templates/clusterrolebinding-scheduler.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
2 changes: 1 addition & 1 deletion
2
...dener/controlplane/charts/application/templates/clusterrolebinding-seed-bootstrapper.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
2 changes: 1 addition & 1 deletion
2
charts/gardener/controlplane/charts/application/templates/clusterrolebinding-seeds.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
2 changes: 1 addition & 1 deletion
2
...dener/controlplane/charts/application/templates/mutatingwebhook-admission-controller.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
2 changes: 1 addition & 1 deletion
2
...gardener/controlplane/charts/application/templates/rolebinding-apiserver-auth-reader.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
42 changes: 42 additions & 0 deletions
42
charts/gardener/controlplane/charts/application/templates/secret-alerting.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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,43 @@ | ||
{{- define "gardener.secret-alerting" -}} | ||
{{- range $key, $config := .Values.global.alerting }} | ||
--- | ||
apiVersion: v1 | ||
kind: Secret | ||
metadata: | ||
name: alerting-{{ $key }} | ||
namespace: garden | ||
labels: | ||
app: gardener | ||
chart: "{{ $.Chart.Name }}-{{ $.Chart.Version }}" | ||
release: "{{ $.Release.Name }}" | ||
heritage: "{{ $.Release.Service }}" | ||
gardener.cloud/role: alerting | ||
type: Opaque | ||
data: | ||
auth_type: {{ ( required ".alerting[].auth_type is required" $config.auth_type ) | b64enc }} | ||
{{- if eq $config.auth_type "smtp" }} | ||
to: {{ ( required ".alerting[].to is required" $config.to ) | b64enc }} | ||
from: {{ ( required ".alerting[].from is required" $config.from ) | b64enc }} | ||
smarthost: {{ ( required ".alerting[].smarthost is required" $config.smarthost ) | b64enc }} | ||
auth_username: {{ ( required ".alerting[].auth_username is required" $config.auth_username ) | b64enc }} | ||
auth_identity: {{ ( required ".alerting[].auth_identity is required" $config.auth_identity ) | b64enc }} | ||
auth_password: {{ ( required ".alerting[].auth_password is required" $config.auth_password ) | b64enc }} | ||
{{- end }} | ||
{{- if eq $config.auth_type "none" }} | ||
url: {{ ( required ".alerting[].url is required" $config.url ) | b64enc }} | ||
{{- end }} | ||
{{- if eq $config.auth_type "basic" }} | ||
url: {{ ( required ".alerting[].url is required" $config.url ) | b64enc }} | ||
username: {{ ( required ".alerting[].username is required" $config.username ) | b64enc }} | ||
password: {{ ( required ".alerting[].password is required" $config.password ) | b64enc }} | ||
{{- end }} | ||
{{- if eq $config.auth_type "certificate" }} | ||
url: {{ ( required ".alerting[].url is required" $config.url ) | b64enc }} | ||
ca.crt: {{ ( required ".alerting[].ca_crt is required" $config.ca_crt ) | b64enc }} | ||
tls.crt: {{ ( required ".alerting[].tls_crt is required" $config.tls_cert ) | b64enc }} | ||
tls.key: {{ ( required ".alerting[].tls_key is required" $config.tls_key ) | b64enc }} | ||
insecure_skip_verify: {{ ( required ".alerting[].insecure_skip_verify is required" $config.insecure_skip_verify ) | b64enc }} | ||
{{- end }} | ||
{{- end }} | ||
{{- end -}} | ||
{{- include "gardener.secret-alerting" . }} |
25 changes: 25 additions & 0 deletions
25
charts/gardener/controlplane/charts/application/templates/secret-default-domain.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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,26 @@ | ||
{{- define "gardener.secret-default-domain" -}} | ||
{{- range $key, $domain := .Values.global.defaultDomains }} | ||
--- | ||
apiVersion: v1 | ||
kind: Secret | ||
metadata: | ||
name: default-domain-{{ ( required ".defaultDomains[].domain is required" (replace "." "-" $domain.domain) ) }} | ||
namespace: garden | ||
labels: | ||
app: gardener | ||
chart: "{{ $.Chart.Name }}-{{ $.Chart.Version }}" | ||
release: "{{ $.Release.Name }}" | ||
heritage: "{{ $.Release.Service }}" | ||
gardener.cloud/role: default-domain | ||
annotations: | ||
dns.gardener.cloud/provider: {{ ( required ".defaultDomains[].provider is required" $domain.provider ) }} | ||
dns.gardener.cloud/domain: {{ ( required ".defaultDomains[].domain is required" $domain.domain ) }} | ||
{{- if $domain.zone }} | ||
dns.gardener.cloud/zone: {{ $domain.zone }} | ||
{{- end }} | ||
type: Opaque | ||
data: | ||
{{ toYaml $domain.credentials | indent 2 }} | ||
{{- end }} | ||
{{- end -}} | ||
{{- include "gardener.secret-default-domain" . }} |
23 changes: 23 additions & 0 deletions
23
charts/gardener/controlplane/charts/application/templates/secret-internal-domain.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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,24 @@ | ||
{{- define "gardener.secret-internal-domain" -}} | ||
--- | ||
apiVersion: v1 | ||
kind: Secret | ||
metadata: | ||
name: internal-domain-{{ ( required ".internalDomain.domain is required" (replace "." "-" .Values.global.internalDomain.domain) ) }} | ||
namespace: garden | ||
labels: | ||
app: gardener | ||
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" | ||
release: "{{ .Release.Name }}" | ||
heritage: "{{ .Release.Service }}" | ||
gardener.cloud/role: internal-domain | ||
annotations: | ||
dns.gardener.cloud/provider: {{ ( required ".internalDomain.provider is required" .Values.global.internalDomain.provider ) }} | ||
dns.gardener.cloud/domain: {{ ( required ".internalDomain.domain is required" .Values.global.internalDomain.domain ) }} | ||
{{- if .Values.global.internalDomain.zone }} | ||
dns.gardener.cloud/zone: {{ .Values.global.internalDomain.zone }} | ||
{{- end }} | ||
type: Opaque | ||
data: | ||
{{ toYaml .Values.global.internalDomain.credentials | indent 2 }} | ||
{{- end -}} | ||
{{- include "gardener.secret-internal-domain" . }} |
18 changes: 18 additions & 0 deletions
18
charts/gardener/controlplane/charts/application/templates/secret-openvpn-diffie-hellman.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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,19 @@ | ||
{{- define "gardener.secret-openvpn-diffie-hellman" -}} | ||
{{- if .Values.global.openVPNDiffieHellmanKey }} | ||
apiVersion: v1 | ||
kind: Secret | ||
metadata: | ||
name: openvpn-diffie-hellman-key | ||
namespace: garden | ||
labels: | ||
app: gardener | ||
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" | ||
release: "{{ .Release.Name }}" | ||
heritage: "{{ .Release.Service }}" | ||
gardener.cloud/role: openvpn-diffie-hellman | ||
type: Opaque | ||
data: | ||
dh2048.pem: {{ .Values.global.openVPNDiffieHellmanKey | b64enc }} | ||
{{- end }} | ||
{{- end -}} | ||
{{- include "gardener.secret-openvpn-diffie-hellman" . }} |
2 changes: 1 addition & 1 deletion
2
...ner/controlplane/charts/application/templates/validatingwebhook-admission-controller.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
Oops, something went wrong.