Enable using a single values file for all mla charts (#114)

* [alertmanager-proxy] Initial test suite * [alertmanager-proxy] Prefix values with alertmanagerProxy * [mla-secrets] add initial tests * [mla-secrets] prefix values with mlaSecrets * [mla-secrets] Update tests
kubermatic · May 12, 2022 · 8383ba4 · 8383ba4
1 parent dfe9645
commit 8383ba4
Show file tree

Hide file tree

Showing 16 changed files with 679 additions and 136 deletions.
diff --git a/charts/alertmanager-proxy/templates/authzserver-deployment.yaml b/charts/alertmanager-proxy/templates/authzserver-deployment.yaml
@@ -20,7 +20,7 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: alertmanager-authz-server
-  replicas: {{ .Values.alertmanagerAuthzServer.replicas }}
+  replicas: {{ .Values.alertmanagerProxy.authz.replicas }}
   strategy:
     rollingUpdate:
       maxSurge: 25%
@@ -36,18 +36,18 @@ spec:
       serviceAccountName: alertmanager-authz-server
       containers:
         - name: authz-server
-          image: '{{ .Values.alertmanagerAuthzServer.image.repository }}:{{ .Values.alertmanagerAuthzServer.image.tag }}'
+          image: '{{ .Values.alertmanagerProxy.authz.image.repository }}:{{ .Values.alertmanagerProxy.authz.image.tag }}'
           ports:
             - containerPort: 50051
           command:
             - /alertmanager-authorization-server
           args:
             - -log-debug=true
           resources:
-{{ toYaml .Values.alertmanagerAuthzServer.resources | indent 12 }}
+{{ toYaml .Values.alertmanagerProxy.authz.resources | indent 12 }}
       nodeSelector:
-{{ toYaml .Values.alertmanagerAuthzServer.nodeSelector | indent 8 }}
+{{ toYaml .Values.alertmanagerProxy.authz.nodeSelector | indent 8 }}
       affinity:
-{{ toYaml .Values.alertmanagerAuthzServer.affinity | indent 8 }}
+{{ toYaml .Values.alertmanagerProxy.authz.affinity | indent 8 }}
       tolerations:
-{{ toYaml .Values.alertmanagerAuthzServer.tolerations | indent 8 }}
+{{ toYaml .Values.alertmanagerProxy.authz.tolerations | indent 8 }}
diff --git a/charts/alertmanager-proxy/templates/proxy-configmap.yaml b/charts/alertmanager-proxy/templates/proxy-configmap.yaml
@@ -135,8 +135,8 @@ data:
             - endpoint:
                 address:
                   socket_address:
-                    address: {{ .Values.alertmanagerProxy.backendAddress }}
-                    port_value: {{ .Values.alertmanagerProxy.backendPort }}
+                    address: {{ .Values.alertmanagerProxy.proxy.backendAddress }}
+                    port_value: {{ .Values.alertmanagerProxy.proxy.backendPort }}
 
       - name: ext-authz
         type: STRICT_DNS

diff --git a/charts/alertmanager-proxy/templates/proxy-deployment.yaml b/charts/alertmanager-proxy/templates/proxy-deployment.yaml
@@ -20,7 +20,7 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: alertmanager-proxy
-  replicas: {{ .Values.alertmanagerProxy.replicas }}
+  replicas: {{ .Values.alertmanagerProxy.proxy.replicas }}
   strategy:
     rollingUpdate:
       maxSurge: 25%
@@ -39,7 +39,7 @@ spec:
     spec:
       containers:
         - name: envoy
-          image: '{{ .Values.alertmanagerProxy.image.repository }}:{{ .Values.alertmanagerProxy.image.tag }}'
+          image: '{{ .Values.alertmanagerProxy.proxy.image.repository }}:{{ .Values.alertmanagerProxy.proxy.image.tag }}'
           ports:
             - containerPort: 8080
               name: proxy
@@ -60,14 +60,14 @@ spec:
             - name:  envoy-config
               mountPath: /etc/envoy
           resources:
-{{ toYaml .Values.alertmanagerProxy.resources | indent 12 }}
+{{ toYaml .Values.alertmanagerProxy.proxy.resources | indent 12 }}
       volumes:
         - name: envoy-config
           configMap:
             name: alertmanager-proxy-config
       nodeSelector:
-{{ toYaml .Values.alertmanagerProxy.nodeSelector | indent 8 }}
+{{ toYaml .Values.alertmanagerProxy.proxy.nodeSelector | indent 8 }}
       affinity:
-{{ toYaml .Values.alertmanagerProxy.affinity | indent 8 }}
+{{ toYaml .Values.alertmanagerProxy.proxy.affinity | indent 8 }}
       tolerations:
-{{ toYaml .Values.alertmanagerProxy.tolerations | indent 8 }}
+{{ toYaml .Values.alertmanagerProxy.proxy.tolerations | indent 8 }}
diff --git a/charts/alertmanager-proxy/test/default.yaml b/charts/alertmanager-proxy/test/default.yaml
@@ -0,0 +1,13 @@
+# Copyright 2021 The Kubermatic Kubernetes Platform contributors.
+#
+# 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.