From 6fe96b363dc5e30d702b7c9e2bafb3945f1e84c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=97=AA=D1=94=CE=BD=CE=B9=CE=B7=20=E1=97=B7=CF=85=D0=BD?=
 =?UTF-8?q?=CA=9F?= <onedr0p@users.noreply.github.com>
Date: Fri, 10 Sep 2021 12:51:25 -0400
Subject: [PATCH] Migrate to metrics-server helm chart (#74)

* Create metrics-server-charts.yaml

* Update kustomization.yaml

* Update kustomization.yaml

* Create helm-release.yaml

* Update helm-release.yaml

* Update helm-release.yaml
---
 .../metrics-server/helm-release.yaml          | 24 ++++++++++++++++++
 .../metrics-server/kustomization.yaml         | 25 +------------------
 .../charts/helm/kustomization.yaml            |  1 +
 .../charts/helm/metrics-server-charts.yaml    | 10 ++++++++
 4 files changed, 36 insertions(+), 24 deletions(-)
 create mode 100644 cluster/apps/kube-system/metrics-server/helm-release.yaml
 create mode 100644 cluster/base/flux-system/charts/helm/metrics-server-charts.yaml

diff --git a/cluster/apps/kube-system/metrics-server/helm-release.yaml b/cluster/apps/kube-system/metrics-server/helm-release.yaml
new file mode 100644
index 00000000..6f267d6c
--- /dev/null
+++ b/cluster/apps/kube-system/metrics-server/helm-release.yaml
@@ -0,0 +1,24 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: metrics-server
+  namespace: kube-system
+spec:
+  interval: 5m
+  chart:
+    spec:
+      # renovate: registryUrl=https://kubernetes-sigs.github.io/metrics-server/
+      chart: metrics-server
+      version: 3.5.0
+      sourceRef:
+        kind: HelmRepository
+        name: metrics-server-charts
+        namespace: flux-system
+      interval: 5m
+  values:
+    args:
+      - --kubelet-insecure-tls
+      - --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname
+      - --kubelet-use-node-status-port
+      - --metric-resolution=15s
diff --git a/cluster/apps/kube-system/metrics-server/kustomization.yaml b/cluster/apps/kube-system/metrics-server/kustomization.yaml
index dd4c19eb..2fa2de20 100644
--- a/cluster/apps/kube-system/metrics-server/kustomization.yaml
+++ b/cluster/apps/kube-system/metrics-server/kustomization.yaml
@@ -2,27 +2,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - github.com/kubernetes-sigs/metrics-server/manifests/base?ref=v0.5.0
-images:
-  - name: gcr.io/k8s-staging-metrics-server/metrics-server
-    newName: k8s.gcr.io/metrics-server/metrics-server
-    newTag: v0.5.0
-patchesStrategicMerge:
-  - |-
-    apiVersion: apps/v1
-    kind: Deployment
-    metadata:
-      name: metrics-server
-      namespace: kube-system
-    spec:
-      template:
-        spec:
-          containers:
-            - name: metrics-server
-              args:
-                - --cert-dir=/tmp
-                - --secure-port=443
-                - --kubelet-use-node-status-port
-                - --metric-resolution=15s
-                - --kubelet-insecure-tls
-                - --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname
+  - helm-release.yaml
diff --git a/cluster/base/flux-system/charts/helm/kustomization.yaml b/cluster/base/flux-system/charts/helm/kustomization.yaml
index 9528560a..b504779f 100644
--- a/cluster/base/flux-system/charts/helm/kustomization.yaml
+++ b/cluster/base/flux-system/charts/helm/kustomization.yaml
@@ -12,6 +12,7 @@ resources:
   - jetstack-charts.yaml
   - k8s-at-home-charts.yaml
   - metallb-charts.yaml
+  - metrics-server-charts.yaml
   - minecraft-server-charts.yaml
   - minio-charts.yaml
   - nfs-subdir-external-provisioner-charts.yaml
diff --git a/cluster/base/flux-system/charts/helm/metrics-server-charts.yaml b/cluster/base/flux-system/charts/helm/metrics-server-charts.yaml
new file mode 100644
index 00000000..065e18b0
--- /dev/null
+++ b/cluster/base/flux-system/charts/helm/metrics-server-charts.yaml
@@ -0,0 +1,10 @@
+---
+apiVersion: source.toolkit.fluxcd.io/v1beta1
+kind: HelmRepository
+metadata:
+  name: metrics-server-charts
+  namespace: flux-system
+spec:
+  interval: 1h
+  url: https://kubernetes-sigs.github.io/metrics-server
+  timeout: 3m