Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into s3-backup-restore-sidecar
Browse files Browse the repository at this point in the history
  • Loading branch information
@simcod
simcod committed Jan 15, 2025
2 parents 0113fa4 + 10e7af1 commit 66c8f66
Show file tree
Hide file tree
Showing 12 changed files with 142 additions and 7 deletions.
4 changes: 4 additions & 0 deletions control-plane/roles/gardener/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,14 @@ This includes the metal-stack extension provider called [gardener-extension-prov
| gardener_extension_shoot_dns_service_enabled | | If enabled, deploys the gardener-extension-shoot-dns-service |
| gardener_extension_backup_s3_enabled | | If enabled, deploys the gardener-extension-backup-s3 |
| gardener_extension_dns_powerdns_enabled | | If enabled, deploys the gardener-extension-dns-powerdns |
| gardener_extension_csi_driver_lvm_enabled | | If enabled, deploys the gardener-extension-csi-driver-lvm |
| gardener_os_controller_repo_ref | | A repo reference for deploying the [os-metal-extension](https://github.com/metal-stack/os-metal-extension/) |
| gardener_networking_cilium_repo_ref | | A repo reference for deploying the [gardener-extension-networking-cilium](https://github.com/gardener/gardener-extension-networking-cilium) |
| gardener_extension_provider_metal_repo_ref | | A repo reference for deploying the [gardener-extension-provider-metal](https://github.com/metal-stack/gardener-extension-provider-metal) |
| gardener_shoot_dns_service_repo_ref | | A repo reference for deploying the [gardener-extension-shoot-dns-service](https://github.com/gardener/gardener-extension-shoot-dns-service) |
| gardener_extension_backup_s3_repo_ref | | A repo reference for deploying the [gardener-extension-backup-s3](https://github.com/metal-stack/gardener-extension-backup-s3) |
| gardener_extension_dns_powerdns_repo_ref | | A repo reference for deploying the [gardener-extension-dns-powerdns](https://github.com/metal-stack/gardener-extension-dns-powerdns) |
| gardener_extension_csi_driver_lvm_repo_ref | | A repo reference for deploying the [gardener-extension-csi-driver-lvm](https://github.com/metal-stack/gardener-extension-csi-driver-lvm) |
| gardener_metal_admission_replicas | | Specifies the amount of metal-admission webhook replicas |
| gardener_metal_admission_vpa | | Enables the VPA for the metal-admission webhook |
| gardener_extension_provider_metal_cluster_audit_enabled | | Enables the audit functionality of the GEPM |
Expand Down Expand Up @@ -133,6 +135,8 @@ This includes the metal-stack extension provider called [gardener-extension-prov
| gardener_extension_backup_s3_image_tag | | Setting an explicit image tag for the gardener-extension-backup-s3 |
| gardener_extension_dns_powerdns_image_name | | Setting an explicit image name for the gardener-extension-dns-powerdns |
| gardener_extension_dns_powerdns_image_tag | | Setting an explicit image tag for the gardener-extension-dns-powerdns |
| gardener_extension_csi_driver_lvm_image_name | | Setting an explicit image name for the gardener-extension-csi-driver-lvm |
| gardener_extension_csi_driver_lvm_image_tag | | Setting an explicit image tag for the gardener-extension-csi-driver-lvm |

### Certificates

Expand Down
2 changes: 2 additions & 0 deletions control-plane/roles/gardener/defaults/main/extensions.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@ gardener_extension_shoot_cert_service_enabled: true
gardener_extension_shoot_dns_service_enabled: true
gardener_extension_dns_powerdns_enabled: false
gardener_extension_backup_s3_enabled: false
gardener_extension_csi_driver_lvm_enabled: false

gardener_extension_provider_metal_repo_ref: "{{ gardener_extension_provider_metal_image_tag }}"
gardener_networking_cilium_repo_ref: "gardener/gardener-extension-networking-cilium/{{ gardener_networking_cilium_image_tag }}"
gardener_os_controller_repo_ref: "{{ gardener_os_controller_image_tag }}"
gardener_shoot_dns_service_repo_ref: "gardener/gardener-extension-shoot-dns-service/{{ gardener_shoot_dns_service_image_tag }}"
gardener_extension_backup_s3_repo_ref: "metal-stack/gardener-extension-backup-s3/{{ gardener_extension_backup_s3_image_tag }}"
gardener_extension_dns_powerdns_repo_ref: "metal-stack/gardener-extension-dns-powerdns/{{ gardener_extension_dns_powerdns_image_tag }}"
gardener_extension_csi_driver_lvm_repo_ref: "metal-stack/gardener-extension-csi-driver-lvm/{{ gardener_extension_csi_driver_lvm_image_tag }}"

gardener_metal_admission_replicas: 1
gardener_metal_admission_vpa: true
Expand Down
15 changes: 15 additions & 0 deletions control-plane/roles/gardener/tasks/extensions.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,3 +129,18 @@
- controller-deployment.yaml
- controller-registration.yaml
when: gardener_extension_backup_s3_enabled

- name: "Register controller: csi-driver-lvm"
k8s:
definition: "{{ lookup('template', 'csi-driver-lvm/{{ item }}', split_lines=False) }}"
kubeconfig: "{{ gardener_kube_apiserver_kubeconfig_path }}"
apply: yes
tags: csi-driver-lvm
register: result
until: result is success
retries: 10
delay: 6
loop:
- controller-deployment.yaml
- controller-registration.yaml
when: gardener_extension_csi_driver_lvm_enabled
12 changes: 12 additions & 0 deletions control-plane/roles/gardener/templates/csi-driver-lvm/controller-deployment.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
apiVersion: core.gardener.cloud/v1
kind: ControllerDeployment
metadata:
name: csi-driver-lvm
helm:
rawChart: "{{ (lookup('url', 'https://raw.githubusercontent.com/' + gardener_extension_csi_driver_lvm_image_repo_ref + '/example/controller-registration.yaml', split_lines=False) | from_yaml_all | list)[0].helm.rawChart }}"
values:
image:
repository: {{ gardener_extension_csi_driver_lvm_image_name }}
tag: {{ gardener_extension_csi_driver_lvm_image_tag }}
pullPolicy: Always
13 changes: 13 additions & 0 deletions control-plane/roles/gardener/templates/csi-driver-lvm/controller-registration.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
apiVersion: core.gardener.cloud/v1beta1
kind: ControllerRegistration
metadata:
name: csi-driver-lvm
spec:
deployment:
policy: Always
deploymentRefs:
- name: csi-driver-lvm
resources:
- kind: Extension
type: csi-driver-lvm
2 changes: 2 additions & 0 deletions defaults/main.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ metal_stack_release:
gardener_extension_backup_s3_image_name: "docker-images.metal-stack.gardener.gardener-extension-backup-s3.name"
gardener_extension_dns_powerdns_image_tag: "docker-images.metal-stack.gardener.gardener-extension-dns-powerdns.tag"
gardener_extension_dns_powerdns_image_name: "docker-images.metal-stack.gardener.gardener-extension-dns-powerdns.name"
gardener_extension_csi_driver_lvm_image_tag: "docker-images.metal-stack.gardener.gardener-extension-csi-driver-lvm.tag"
gardener_extension_csi_driver_lvm_image_name: "docker-images.metal-stack.gardener.gardener-extension-csi-driver-lvm.name"
# kubernetes
csi_lvm_controller_image_tag: "docker-images.metal-stack.kubernetes.csi-lvm-controller.tag"
csi_lvm_controller_image_name: "docker-images.metal-stack.kubernetes.csi-lvm-controller.name"
Expand Down
14 changes: 14 additions & 0 deletions partition/roles/monitoring/blackbox-exporter/README.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# blackbox-exporter

Deploys the blackbox-exporter in a systemd-managed Docker container.

## Variables

This role uses variables from [partition-defaults](/partition). So, make sure you define them adequately as well.

| Name | Mandatory | Description |
| ----------------------------------------- | --------- | -------------------------------------------- |
| monitoring_blackbox_exporter_etc_host_dir | | The host directory for the blackbox exporter |
| monitoring_blackbox_exporter_image_name | | Image name of the blackblox exporter |
| monitoring_blackbox_exporter_image_tag | | Image tag of the blackbox exporter |
| monitoring_blackbox_exporter_port | | Port for the blackblox exporter |
12 changes: 12 additions & 0 deletions partition/roles/monitoring/ipmi-exporter/README.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# ipmi-exporter

Deploys the ipmi-exporter in a systemd-managed Docker container.

## Variables

| Name | Mandatory | Description |
| ------------------------------------- | --------- | ---------------------------------------- |
| monitoring_ipmi_exporter_etc_host_dir | | The host directory for the IPMI exporter |
| monitoring_ipmi_exporter_image_name | | Image name of the IPMI exporter |
| monitoring_ipmi_exporter_image_tag | | Image tag of the IPMI exporter |
| monitoring_ipmi_exporter_port | | Port for the IPMI exporter |
12 changes: 12 additions & 0 deletions partition/roles/monitoring/node-exporter/README.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# node-exporter

Deploys the node-exporter in a systemd-managed Docker container.

## Variables

| Name | Mandatory | Description |
| ----------------------------------- | --------- | ---------------------------------------- |
| monitoring_node_exporter_dir | | The host directory for the node exporter |
| monitoring_node_exporter_image_name | | Image name of the IPMI exporter |
| monitoring_node_exporter_image_tag | | Image tag of the IPMI exporter |
| monitoring_node_exporter_port | | Port for the IPMI exporter |
35 changes: 35 additions & 0 deletions partition/roles/monitoring/prometheus/README.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# prometheus

Deploys prometheus in a systemd-managed Docker container.

## Variables

This role uses variables from [partition-defaults](/partition). So, make sure
you define them adequately as well.

| Name | Mandatory | Description |
| ------------------------------------------------ | --------- | ----------------------------------------------------------- |
| prometheus_port | | Port for prometheus |
| prometheus_image_name | yes | Image version of the prometheus |
| prometheus_image_tag | yes | Image tag of the prometheus |
| prometheus_config_host_dir | | The host directory for prometheus configurations |
| prometheus_data_host_dir | | The host directory for prometheus data |
| prometheus_alertmanager_target | | Targets for the alertmanager |
| prometheus_alertmanager_basic_auth_username | | The username for the authentication to the alertmanager |
| prometheus_alertmanager_basic_auth_password | | The password for the authentication to the alertmanager |
| prometheus_remote_write_url | | Remote write target for prometheus |
| prometheus_frr_exporter_targets | | FRR exporter targets to scrape from |
| prometheus_metal_core_targets | | metal-core targets to scrape from |
| prometheus_node_exporter_targets | | Node exporter targets to scrape from |
| prometheus_promtail_targets | | Promtail targets to scrape from |
| prometheus_ping_targets | | Ping targets to scrape from |
| prometheus_sonic_exporter_targets | | Sonic exporter targets to scrape from |
| prometheus_blackbox_exporter_targets | | Blackbox exporter targets to scrape from |
| prometheus_lightbox_exporter_targets | | Lightbox exporter targets to scrape from |
| prometheus_lightos_smart_targets | | Lightos smart targets to scrape from |
| prometheus_ipmi_exporter_targets | | IPMI exporter targets to scrape from |
| prometheus_hosts_content | | Available hosts for prometheus |
| prometheus_blackbox_exporter_icmp_groups | | ICMP groups for the blackbox exporter |
| prometheus_blackbox_exporter_metal_api_probe_url | | metal-api probe URL for the blackbox exporter |
| prometheus_remote_write_basic_auth_username | | The username for the prometheus remote write authentication |
| prometheus_remote_write_basic_auth_password | | The password for the prometheus remote write authentication |
12 changes: 12 additions & 0 deletions partition/roles/monitoring/sonic-exporter/README.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# sonic-exporter

Deploys the sonic-exporter in a systemd-managed Docker container.

## Variables

| Name | Mandatory | Description |
| ------------------------- | --------- | -------------------------------- |
| sonic_exporter_image_name | | Image name of the sonic exporter |
| sonic_exporter_image_tag | | Image tag of the sonic exporter |
| sonic_exporter_address | | Address for the sonic exporter |
| sonic_exporter_port | | Port for the sonic exporter |
16 changes: 9 additions & 7 deletions partition/roles/promtail/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ Deploys promtail in a systemd-managed Docker container.

## Variables

| Name | Mandatory | Description |
|-----------------------------|-----------|--------------------------------------|
| promtail_config_host_dir | | The location of the promtail config |
| promtail_image_name | yes | Image version of the promtail |
| promtail_image_tag | yes | Image tag of the promtail |
| promtail_loki_push_endpoint | yes | The URL to the Loki push endpoint |
| promtail_scrape_configs | yes | A list containing the scrape configs |
| Name | Mandatory | Description |
| --------------------------------- | --------- | ------------------------------------------ |
| promtail_config_host_dir | | The location of the promtail config |
| promtail_image_name | yes | Image version of the promtail |
| promtail_image_tag | yes | Image tag of the promtail |
| promtail_loki_push_endpoint | yes | The URL to the Loki push endpoint |
| promtail_scrape_configs | yes | A list containing the scrape configs |
| promtail_loki_basic_auth_username | | The username for the client authentication |
| promtail_loki_basic_auth_password | | The password for the client authentication |

0 comments on commit 66c8f66

Please sign in to comment.