Merge branch 'metrics_addon' into 'master'

Initial Metrics Addon - disabled by default

Closes #1187

See merge request platform-one/big-bang/bigbang!1738

.gitlab-ci.yml

@@ -2,4 +2,3 @@ include:
   - project: 'platform-one/big-bang/pipeline-templates/pipeline-templates'
     ref: master
     file: '/pipelines/bigbang.yaml'
-

chart/templates/metrics-server/gitrepository.yaml

+{{- if .Values.addons.metricsServer.enabled  }}
+apiVersion: source.toolkit.fluxcd.io/v1beta1
+kind: GitRepository
+metadata:
+  name: metrics-server
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: metrics-server
+    app.kubernetes.io/component: "cluster-utilities"
+    {{- include "commonLabels" . | nindent 4}}
+spec:
+  interval: {{ .Values.flux.interval }}
+  url: {{ .Values.addons.metricsServer.git.repo }}
+  ref:
+    {{- include "validRef" .Values.addons.metricsServer.git | nindent 4 }}
+  {{ include "gitIgnore" . }}
+  {{- include "gitCreds" . | nindent 2 }}
+{{- end }}

chart/templates/metrics-server/helmrelease.yaml

+{{- $fluxSettingsMetrics := merge .Values.addons.metricsServer.flux .Values.flux -}}
+{{- if .Values.addons.metricsServer.enabled }}
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: metrics-server
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: metrics-server
+    app.kubernetes.io/component: "cluster-utilities"
+    {{- include "commonLabels" . | nindent 4}}
+spec:
+  releaseName: metrics-server
+  targetNamespace: metrics-server
+  chart:
+    spec:
+      chart: {{ .Values.addons.metricsServer.git.path }}
+      interval: 5m
+      sourceRef:
+        kind: GitRepository
+        name: metrics-server
+        namespace: {{ .Release.Namespace }}
+
+  {{- toYaml $fluxSettingsMetrics | nindent 2 }}
+
+  {{- if .Values.addons.metricsServer.postRenderers }}
+  postRenderers:
+  {{ toYaml .Values.addons.metricsServer.postRenderers | nindent 4 }}
+  {{- end }}
+
+  valuesFrom:
+    - name: {{ .Release.Name }}-metrics-values
+      kind: Secret
+      valuesKey: "common"
+    - name: {{ .Release.Name }}-metrics-values
+      kind: Secret
+      valuesKey: "defaults"
+    - name: {{ .Release.Name }}-metrics-values
+      kind: Secret
+      valuesKey: "overlays"
+
+  {{- if or .Values.istio.enabled .Values.monitoring.enabled }}
+  dependsOn:
+    {{- if .Values.istio.enabled }}
+    - name: istio
+      namespace: {{ .Release.Namespace }}
+    {{- end }}
+    {{- if .Values.monitoring.enabled }}
+    - name: monitoring
+      namespace: {{ .Release.Namespace }}
+    {{- end }}
+  {{- end }}
+{{- end }}
\ No newline at end of file

chart/templates/metrics-server/imagepullsecret.yaml

+{{- if .Values.addons.metricsServer.enabled }}
+{{- if ( include "imagePullSecret" . ) }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: private-registry
+  namespace: metrics-server
+  labels:
+    app.kubernetes.io/name: metrics-server
+    app.kubernetes.io/component: "cluster-utilities"
+    {{- include "commonLabels" . | nindent 4}}
+type: kubernetes.io/dockerconfigjson
+data:
+  .dockerconfigjson: {{ template "imagePullSecret" . }}
+{{- end }}
+{{- end }}
\ No newline at end of file

chart/templates/metrics-server/namespace.yaml

+{{- if .Values.addons.metricsServer.enabled }}
+apiVersion: v1
+kind: Namespace
+metadata:
+  labels:
+    app.kubernetes.io/name: metrics-server
+    app.kubernetes.io/component: "cluster-utilities"
+    {{- include "commonLabels" . | nindent 4}}
+    istio-injection: {{ dig "istio" "injection" "enabled" .Values.addons.metricsServer }}
+  name: metrics-server
+{{- end }}
\ No newline at end of file

chart/templates/metrics-server/values.yaml

+{{- if .Values.addons.metricsServer.enabled }}
+{{- include "values-secret" (dict "root" $ "package" .Values.addons.metricsServer "name" "metrics" "defaults" (include "bigbang.defaults.metrics" .)) }}
+{{- end }}
+
+{{- define "bigbang.defaults.metrics" -}}
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
+domain: {{ $domainName }}
+
+istio:
+  enabled: {{ .Values.istio.enabled }}
+  injection: {{ ternary "enabled" "disabled" .Values.istio.enabled }}
+
+metrics:
+  enabled: {{ .Values.monitoring.enabled }}
+
+serviceMonitor:
+  enabled: {{ .Values.monitoring.enabled }}
+  dashboards:
+    namespace: monitoring
+
+# Default to 2 replicas for HA
+replicas: 2
+
+networkPolicies:
+  enabled: {{ .Values.networkPolicies.enabled }}
+  controlPlaneCidr: {{ .Values.networkPolicies.controlPlaneCidr }}
+
+{{- end }}

chart/values.yaml

@@ -1361,3 +1361,23 @@ addons:
 
     # -- Post Renderers.  See docs/postrenders.md
     postRenderers: []
+
+  # ----------------------------------------------------------------------------------------------------------------------
+  # Metrics Server
+  #
+  metricsServer:
+    # -- Toggle deployment of metrics server.
+    enabled: false
+    git:
+      repo: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/metrics-server.git
+      path: "./chart"
+      tag: "3.8.0-bb.2"
+
+    # -- Flux reconciliation overrides specifically for the metrics server Package
+    flux: {}
+
+    # -- Values to passthrough to the metrics server chart: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/metrics-server.git
+    values: {}
+
+    # -- Post Renderers.  See docs/postrenders.md
+    postRenderers: []

tests/rke2-test-values.yaml

@@ -450,3 +450,4 @@ addons:
           cpu: 100m
           memory: 256Mi
         limits: null
+        
\ No newline at end of file

tests/test-values.yaml

@@ -1400,3 +1400,8 @@ addons:
           artifacts: true
           envs:
             cypress_vault_url: "https://vault.bigbang.dev"
+
+  metricsServer:
+    enabled: false
+    values:
+      replicas: 1