add/enable missing apps to sync with vintage (#636)

* add/enable missing apps to sync with vintage
giantswarm · Jun 10, 2024 · c4b7c64 · c4b7c64
1 parent 4d2597c
commit c4b7c64
Show file tree

Hide file tree

Showing 8 changed files with 179 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Add `irsa-servicemonitors` and `aws-ebs-csi-driver-servicemonitors` apps.
+
+### Changed
+
+- Set `prometheus-blackbox-exporter` and `k8s-audit-metrics` as enabled.
+
 ## [0.77.0] - 2024-06-07
 
 ### Added

diff --git a/helm/cluster-aws/Chart.lock b/helm/cluster-aws/Chart.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: cluster
   repository: https://giantswarm.github.io/cluster-catalog
-  version: 0.29.0
+  version: 0.30.1
 - name: cluster-shared
   repository: https://giantswarm.github.io/cluster-catalog
   version: 0.7.1
-digest: sha256:121c9594b0c076cd5a1a0a9ab06a33980d519614e6fb32005406e21bebebe968
-generated: "2024-05-31T09:36:25.099668049Z"
+digest: sha256:3f8917e5d334ab5e1453a3b097d8c1223b5d4f9eca2f92e5e69f0c5acbef52c2
+generated: "2024-06-07T12:41:39.329381+03:00"
diff --git a/helm/cluster-aws/Chart.yaml b/helm/cluster-aws/Chart.yaml
@@ -16,7 +16,7 @@ restrictions:
     - capa
 dependencies:
   - name: cluster
-    version: "0.29.0"
+    version: "0.30.1"
     repository: https://giantswarm.github.io/cluster-catalog
   - name: cluster-shared
     version: "0.7.1"

diff --git a/helm/cluster-aws/README.md b/helm/cluster-aws/README.md
diff --git a/helm/cluster-aws/templates/aws-ebs-csi-driver-servicemonitors-app.yaml b/helm/cluster-aws/templates/aws-ebs-csi-driver-servicemonitors-app.yaml
@@ -0,0 +1,50 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "resource.default.name" . }}-aws-ebs-csi-driver-servicemonitors-user-values
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "labels.common" . | nindent 4 }}
+---
+apiVersion: application.giantswarm.io/v1alpha1
+kind: App
+metadata:
+  name: {{ include "resource.default.name" . }}-aws-ebs-csi-driver-smons
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "labels.common" . | nindent 4 }}
+    giantswarm.io/managed-by: {{ .Chart.Name }}
+  annotations:
+    app-operator.giantswarm.io/depends-on: {{ include "resource.default.name" . }}-cert-manager
+spec:
+  catalog: default
+  name: aws-ebs-csi-driver-servicemonitors
+  # repo: giantswarm/aws-ebs-csi-driver-servicemonitors
+  version: 0.1.0
+  namespace: kube-system
+  config:
+    configMap:
+      name: {{ include "resource.default.name" . }}-cluster-values
+      namespace: {{ .Release.Namespace }}
+  {{- if .Values.global.apps.irsaServiceMonitors.values }}
+  userConfig:
+    configMap:
+      name: {{ include "resource.default.name" . }}-aws-ebs-csi-driver-servicemonitors-user-values
+      namespace: {{ .Release.Namespace }}
+  {{- end }}
+  {{- if .Values.global.apps.awsEbsCsiDriverServiceMonitors.extraConfigs }}
+  extraConfigs:
+  {{- range .Values.global.apps.awsEbsCsiDriverServiceMonitors.extraConfigs }}
+  - kind: {{ .kind }}
+    name: {{ .name }}
+    namespace: {{ .namespace | default $.Release.Namespace }}
+    priority: {{ .priority }}
+  {{- end }}
+  {{- end }}
+  kubeConfig:
+    inCluster: false
+    secret:
+      name: {{ include "resource.default.name" . }}-kubeconfig
+      namespace: {{ .Release.Namespace }}
+    context:
+      name: {{ include "resource.default.name" . }}-admin@{{ include "resource.default.name" . }}
diff --git a/helm/cluster-aws/templates/irsa-servicemonitors-app.yaml b/helm/cluster-aws/templates/irsa-servicemonitors-app.yaml
@@ -0,0 +1,50 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "resource.default.name" . }}-irsa-servicemonitors-user-values
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "labels.common" . | nindent 4 }}
+---
+apiVersion: application.giantswarm.io/v1alpha1
+kind: App
+metadata:
+  name: {{ include "resource.default.name" . }}-irsa-servicemonitors
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "labels.common" . | nindent 4 }}
+    giantswarm.io/managed-by: {{ .Chart.Name }}
+  annotations:
+    app-operator.giantswarm.io/depends-on: {{ include "resource.default.name" . }}-cert-manager
+spec:
+  catalog: default
+  name: irsa-servicemonitors
+  # repo: giantswarm/irsa-servicemonitors
+  version: 0.0.1
+  namespace: kube-system
+  config:
+    configMap:
+      name: {{ include "resource.default.name" . }}-cluster-values
+      namespace: {{ .Release.Namespace }}
+  {{- if .Values.global.apps.irsaServiceMonitors.values }}
+  userConfig:
+    configMap:
+      name: {{ include "resource.default.name" . }}-irsa-servicemonitors-user-values
+      namespace: {{ .Release.Namespace }}
+  {{- end }}
+  {{- if .Values.global.apps.irsaServiceMonitors.extraConfigs }}
+  extraConfigs:
+  {{- range .Values.global.apps.irsaServiceMonitors.extraConfigs }}
+  - kind: {{ .kind }}
+    name: {{ .name }}
+    namespace: {{ .namespace | default $.Release.Namespace }}
+    priority: {{ .priority }}
+  {{- end }}
+  {{- end }}
+  kubeConfig:
+    inCluster: false
+    secret:
+      name: {{ include "resource.default.name" . }}-kubeconfig
+      namespace: {{ .Release.Namespace }}
+    context:
+      name: {{ include "resource.default.name" . }}-admin@{{ include "resource.default.name" . }}
diff --git a/helm/cluster-aws/values.schema.json b/helm/cluster-aws/values.schema.json
@@ -292,6 +292,9 @@
                             "configTemplateName": "awsExternalDnsHelmValues",
                             "enable": true
                         },
+                        "k8sAuditMetrics": {
+                            "enable": true
+                        },
                         "k8sDnsNodeCache": {
                             "enable": true
                         },
@@ -311,6 +314,9 @@
                         "observabilityBundle": {
                             "enable": true
                         },
+                        "prometheusBlackboxExporter": {
+                            "enable": true
+                        },
                         "securityBundle": {
                             "configTemplateName": "awsSecurityBundleHelmValues",
                             "enable": true
@@ -654,6 +660,12 @@
                             "title": "AWS EBS CSI driver",
                             "description": "Configuration of aws-ebs-csi-driver-app. For all available values see https://github.com/giantswarm/aws-ebs-csi-driver-app."
                         },
+                        "awsEbsCsiDriverServiceMonitors": {
+                            "$ref": "#/$defs/app",
+                            "type": "object",
+                            "title": "AWS EBS CSI driver service monitors",
+                            "description": "Configuration of aws-ebs-csi-driver-servicemonitors. For all available values see https://github.com/giantswarm/aws-ebs-csi-driver-servicemonitors-app."
+                        },
                         "awsPodIdentityWebhook": {
                             "$ref": "#/$defs/app",
                             "type": "object",
@@ -720,6 +732,18 @@
                             "title": "external-dns",
                             "description": "Configuration of external-dns. For all available values see https://github.com/giantswarm/external-dns-app."
                         },
+                        "irsaServiceMonitors": {
+                            "$ref": "#/$defs/app",
+                            "type": "object",
+                            "title": "irsa-servicemonitors",
+                            "description": "Configuration of irsa-service-monitor. For all available values see https://github.com/giantswarm/irsa-servicemonitors-app."
+                        },
+                        "k8sAuditMetrics": {
+                            "$ref": "#/$defs/app",
+                            "type": "object",
+                            "title": "k8s-audit-metrics",
+                            "description": "Configuration of k8s-audit-metrics. For all available values see https://github.com/giantswarm/k8s-audit-metrics."
+                        },
                         "k8sDnsNodeCache": {
                             "$ref": "#/$defs/app",
                             "type": "object",
@@ -756,6 +780,12 @@
                             "title": "observability-bundle",
                             "description": "Configuration of observability-bundle. For all available values see https://github.com/giantswarm/observability-bundle."
                         },
+                        "prometheusBlackboxExporter": {
+                            "$ref": "#/$defs/app",
+                            "type": "object",
+                            "title": "prometheus-blackbox-exporter",
+                            "description": "Configuration of prometheus-blackbox-exporter. For all available values see https://github.com/giantswarm/prometheus-blackbox-exporter-app."
+                        },
                         "securityBundle": {
                             "$ref": "#/$defs/app",
                             "type": "object",

diff --git a/helm/cluster-aws/values.yaml b/helm/cluster-aws/values.yaml
@@ -27,6 +27,8 @@ cluster:
       externalDns:
         configTemplateName: awsExternalDnsHelmValues
         enable: true
+      k8sAuditMetrics:
+        enable: true
       k8sDnsNodeCache:
         enable: true
       metricsServer:
@@ -40,6 +42,8 @@ cluster:
         enable: true
       observabilityBundle:
         enable: true
+      prometheusBlackboxExporter:
+        enable: true
       securityBundle:
         configTemplateName: awsSecurityBundleHelmValues
         enable: true
@@ -244,6 +248,7 @@ global:
   apps:
     awsCloudControllerManager: {}
     awsEbsCsiDriver: {}
+    awsEbsCsiDriverServiceMonitors: {}
     awsPodIdentityWebhook: {}
     capiNodeLabeler: {}
     certExporter: {}
@@ -255,12 +260,15 @@ global:
     coreDns: {}
     etcdKubernetesResourcesCountExporter: {}
     externalDns: {}
+    irsaServiceMonitors: {}
+    k8sAuditMetrics: {}
     k8sDnsNodeCache: {}
     metricsServer: {}
     netExporter: {}
     networkPolicies: {}
     nodeExporter: {}
     observabilityBundle: {}
+    prometheusBlackboxExporter: {}
     securityBundle: {}
     teleportKubeAgent: {}
     verticalPodAutoscaler: {}