feat: adiciona metric server no eks e kustomize

M4th3ux · Dec 6, 2023 · 309f575 · 309f575
1 parent 18ac652
commit 309f575
Show file tree

Hide file tree

Showing 18 changed files with 160 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -8,6 +8,10 @@ EKSCTL_CONFIG := configs/eksctl/config.yaml
 KUBERNETES_LINT_CONFIG := configs/kubelinter/kubelinter-config.yaml
 DOCKER_LINT_CONFIG := configs/hadolint/hadolint-config.yaml
 
+METRICS_SERVER_RELEASE := metrics-server
+METRICS_SERVER_NAMESPACE := kube-system
+METRICS_SERVER_CHART_VALUES_EKS := configs/helm/metric-server/values-eks.yml
+
 INGRESS_RELEASE := ingress-nginx
 INGRESS_NAMESPACE := ingress-nginx
 INGRESS_CHART_VALUES_EKS := configs/helm/ingress-nginx-controller/values-eks.yaml
@@ -23,8 +27,10 @@ KUBE_PROMETHEUS_STACK_CHART_LOCAL_VALUES := configs/helm/kube-prometheus-stack/v
 KUBE_PROMETHEUS_STACK_CHART_EKS_VALUES := configs/helm/kube-prometheus-stack/values-eks.yml
 
 GIROPOPS_SENHAS_ROOT := giropops-senhas
-GIROPOPS_SENHAS_MANIFESTS := ${GIROPOPS_SENHAS_ROOT}/manifests
+GIROPOPS_SENHAS_LOCAL := ${GIROPOPS_SENHAS_ROOT}/manifests/overlays/kind
+GIROPOPS_SENHAS_EKS := ${GIROPOPS_SENHAS_ROOT}/manifests/overlays/eks
 GIROPOPS_SENHAS_DOCKERFILE := ${GIROPOPS_SENHAS_ROOT}/Dockerfile
+GIROPOPS_SENHAS_NAMESPACE := giropops-senhas
 
 ##------------------------------------------------------------------------
 ##                      Carrega .env
@@ -80,6 +86,24 @@ delete-ingress-eks:						# Realiza a deleção do ingress no EKS
 	helm uninstall ${INGRESS_RELEASE} -n ${INGRESS_NAMESPACE}
 	kubectl delete ns ${INGRESS_NAMESPACE}
 
+##------------------------------------------------------------------------
+##                    Comandos do Metrics Server
+##------------------------------------------------------------------------
+deploy-metrics-server:					# Realiza a instalação do Metrics Server no EKS
+	helm repo add metrics-server https://kubernetes-sigs.github.io/metrics-server/
+	helm repo update
+	helm upgrade -i ${METRICS_SERVER_RELEASE} -n ${METRICS_SERVER_NAMESPACE} metrics-server/metrics-server \
+		--values ${METRICS_SERVER_CHART_VALUES_EKS} \
+		--wait \
+		--atomic \
+		--debug \
+		--timeout 3m \
+		--create-namespace
+
+delete-metrics-server:					# Remove a instalação do Metrics Server no EKS
+	helm uninstall ${METRICS_SERVER_RELEASE} -n ${METRICS_SERVER_NAMESPACE}
+	kubectl delete ns ${METRICS_SERVER_CHART_VALUES_EKS}
+
 ##------------------------------------------------------------------------
 ##                    Comandos do Redis
 ##------------------------------------------------------------------------
@@ -167,21 +191,26 @@ push-image-dockerhub-ci:    			# Realiza o push da imagem para o Dockerhub - Som
 	docker push ${DOCKERHUB_USERNAME}/giropops-senhas-python-chainguard:${GIROPOPS_SENHAS_TAG}
 	cosign sign --yes --rekor-url "https://rekor.sigstore.dev/" ${DOCKERHUB_USERNAME}/giropops-senhas-python-chainguard:${GIROPOPS_SENHAS_TAG}
 
-deploy-giropops-senhas:			# Realiza a instalação do Giropops
-	kubectl apply -f ${GIROPOPS_SENHAS_MANIFESTS}
+deploy-giropops-senhas-kind:			# Realiza a instalação do Giropops no Kind
+	kubectl create ns ${GIROPOPS_SENHAS_NAMESPACE} || echo "Namespace já existe"
+	kubectl apply -k ${GIROPOPS_SENHAS_LOCAL}
+
+deploy-giropops-senhas-eks:			   # Realiza a instalação do Giropops no EKS
+	kubectl create ns ${GIROPOPS_SENHAS_NAMESPACE} || echo "Namespace já existe"
+	kubectl apply -k ${GIROPOPS_SENHAS_EKS}
 
 update-giropops-senhas-image: 			# Realiza o update da image no deployment
 	kubectl set image -n giropops-senhas deployment/giropops-senhas giropops-senhas=${DOCKERHUB_USERNAME}/giropops-senhas-python-chainguard:${GIROPOPS_SENHAS_TAG}
 	kubectl rollout restart -n giropops-senhas deployment giropops-senhas 
 
-deploy-giropops-senhas-local:  			# Realiza deploy no EKS
+deploy-giropops-senhas-local:  			# Realiza deploy no Kind
 	$(MAKE) set-context-kind
-	$(MAKE) deploy-giropops-senhas
+	$(MAKE) deploy-giropops-senhas-kind
 	$(MAKE) update-giropops-senhas-image
 
 deploy-giropops-senhas-aws:  			# Realiza deploy no EKS
 	$(MAKE) set-context-eks
-	$(MAKE) deploy-giropops-senhas
+	$(MAKE) deploy-giropops-senhas-eks
 	$(MAKE) update-giropops-senhas-image
 
 delete-giropops-senhas:					# Remove a instalação do Giropops
@@ -210,6 +239,19 @@ deploy-infra-aws:						# Sobe a infra completa na AWS
 	$(MAKE) deploy-ingress-eks
 	$(MAKE) deploy-kube-prometheus-stack-eks
 	$(MAKE) deploy-redis-eks
+	$(MAKE) deploy-metrics-server
+
+##------------------------------------------------------------------------
+##                     Comandos de cleanup
+##------------------------------------------------------------------------
+clean-local:							# Clean do ambiente local
+	$(MAKE) set-context-kind
+	$(MAKE) delete-kind-cluster
+
+clean-aws:								# Clean do ambiente na AWS
+	$(MAKE) set-context-eks
+	$(MAKE) drop-pdb
+	$(MAKE) delete-eks-cluster
 
 ##------------------------------------------------------------------------
 ##                     Stress Test
@@ -218,6 +260,13 @@ deploy-infra-aws:						# Sobe a infra completa na AWS
 start-loadtest:		        			# Executa loadtest usando K6 enviando os resultados para o Prometheus
 	k6 run -o experimental-prometheus-rw --tag testid=exec-$(shell date +"%d-%m-%y:%T") loadtest/generate-keys.js
 
+##------------------------------------------------------------------------
+##                     Utils
+##------------------------------------------------------------------------
+.PHONY: drop-pdb						# Dropa os PDBs do cluster
+drop-pdb:
+	bash scripts/drop-pdb.sh
+
 ##------------------------------------------------------------------------
 ##                     Helper
 ##------------------------------------------------------------------------

diff --git a/README.md b/README.md
@@ -128,11 +128,8 @@ Ele iniciará o stress-test da aplicação usando como base o scrit [generate-ke
 
 ## ToDos e Refinos
 
-- [ ] Criar targets de clean;
-- [ ] Deploy to Metric Server na AWS;
-- [ ] Converter giropops-senhas pra kustomize e ajustar o make-targets;
+- [ ] Ajustar overlays do giropops-senhas;
 - [ ] Ajustar os values dos helm charts (ingress, images e resources);
 - [ ] Ajustar lint no CI que tá quebrando
-- [ ] Organizar GitHub Actions;
 - [ ] Teste geral de todos os targets;
 - [ ] Update da documentação.
diff --git a/configs/helm/metric-server/.gitkeep b/configs/helm/metric-server/.gitkeep
diff --git a/configs/helm/metric-server/values-eks.yml b/configs/helm/metric-server/values-eks.yml
@@ -0,0 +1,49 @@
+# Default values for metrics-server.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+image:
+  repository: cgr.dev/chainguard/metrics-server
+  tag: "latest"
+  pullPolicy: IfNotPresent
+
+replicas: 3
+
+updateStrategy:
+  type: RollingUpdate
+  rollingUpdate:
+    maxSurge: 0
+    maxUnavailable: 1
+
+podDisruptionBudget:
+  enabled: true
+  minAvailable: 1
+
+addonResizer:
+  enabled: false
+  image:
+    repository: registry.k8s.io/autoscaling/addon-resizer
+    tag: 1.8.19
+  resources:
+    requests:
+      cpu: 40m
+      memory: 25Mi
+    limits:
+      cpu: 40m
+      memory: 25Mi
+  nanny:
+    cpu: 0m
+    extraCpu: 1m
+    memory: 0Mi
+    extraMemory: 2Mi
+    minClusterSize: 100
+    pollPeriod: 300000
+    threshold: 5
+
+metrics:
+  enabled: true
+
+serviceMonitor:
+  enabled: true
+  interval: 1m
+  scrapeTimeout: 10s
diff --git a/giropops-senhas/manifests/0. namespace.yml b/giropops-senhas/manifests/0. namespace.yml
diff --git a/giropops-senhas/manifests/1. configmap.yml → giropops-senhas/manifests/base/configmap.yml b/giropops-senhas/manifests/1. configmap.yml → giropops-senhas/manifests/base/configmap.yml
diff --git a/giropops-senhas/manifests/3. deployment.yml → ...pops-senhas/manifests/base/deployment.yml b/giropops-senhas/manifests/3. deployment.yml → ...pops-senhas/manifests/base/deployment.yml
diff --git a/giropops-senhas/manifests/7. hpa.yml → giropops-senhas/manifests/base/hpa.yml b/giropops-senhas/manifests/7. hpa.yml → giropops-senhas/manifests/base/hpa.yml
diff --git a/giropops-senhas/manifests/5. ingress.yml → giropops-senhas/manifests/base/ingress.yml b/giropops-senhas/manifests/5. ingress.yml → giropops-senhas/manifests/base/ingress.yml
@@ -5,7 +5,7 @@ metadata:
   namespace: giropops-senhas
 spec:
   rules:
-  - host: giropops-senhas.kubernetes.docker.internal
+  - host: giropops-senhas.svc.cluster.local
     http:
       paths:
       - path: /

diff --git a/giropops-senhas/manifests/base/kustomization.yml b/giropops-senhas/manifests/base/kustomization.yml
@@ -0,0 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- configmap.yml
+- serviceaccount.yml
+- deployment.yml
+- service.yml
+- ingress.yml
+- service-monitor.yml
+- hpa.yml
diff --git a/...s-senhas/manifests/6. service-monitor.yml → ...senhas/manifests/base/service-monitor.yml b/...s-senhas/manifests/6. service-monitor.yml → ...senhas/manifests/base/service-monitor.yml
diff --git a/giropops-senhas/manifests/4. service.yml → giropops-senhas/manifests/base/service.yml b/giropops-senhas/manifests/4. service.yml → giropops-senhas/manifests/base/service.yml
diff --git a/...ps-senhas/manifests/2. serviceaccount.yml → ...-senhas/manifests/base/serviceaccount.yml b/...ps-senhas/manifests/2. serviceaccount.yml → ...-senhas/manifests/base/serviceaccount.yml
diff --git a/giropops-senhas/manifests/overlays/eks/ingress.yml b/giropops-senhas/manifests/overlays/eks/ingress.yml
@@ -0,0 +1,8 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: giropops-senhas
+  namespace: giropops-senhas
+spec:
+  rules:
+  - host: giropops-senhas.aws-cluster.com.br
diff --git a/giropops-senhas/manifests/overlays/eks/kustomization.yml b/giropops-senhas/manifests/overlays/eks/kustomization.yml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../../base
+
+patches:
+- path: ingress.yml
diff --git a/giropops-senhas/manifests/overlays/kind/ingress.yml b/giropops-senhas/manifests/overlays/kind/ingress.yml
@@ -0,0 +1,8 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: giropops-senhas
+  namespace: giropops-senhas
+spec:
+  rules:
+  - host: giropops-senhas.kubernetes.docker.internal
diff --git a/giropops-senhas/manifests/overlays/kind/kustomization.yml b/giropops-senhas/manifests/overlays/kind/kustomization.yml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../../base
+
+patches:
+- path: ingress.yml
diff --git a/scripts/drop-pdb.sh b/scripts/drop-pdb.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+NAMESPACE_LIST=($(kubectl get ns --no-headers | awk -F" " '{print $1}'))
+
+for NAMESPACE in "${NAMESPACE_LIST[@]}"
+do
+    echo "Checando PDB no namespace ${NAMESPACE}"
+    PDB_LIST=($(kubectl get pdb -n ${NAMESPACE} --no-headers | awk -F" " '{print $1}'))
+    for PDB in "${PDB_LIST[@]}"
+    do  
+        echo "Deletando PDB ${PDB} do namespace ${NAMESPACE}"
+        kubectl delete pdb ${PDB} -n ${NAMESPACE}
+    done
+done
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ metadata: @@
       namespace: giropops-senhas
     spec:
       rules:
-      - host: giropops-senhas.kubernetes.docker.internal
+      - host: giropops-senhas.svc.cluster.local
         http:
           paths:
           - path: /
@@ Expand Down @@