fix: update Helm chart dependencies and remove unused configurations

aneoconsulting · Jan 28, 2025 · f98ba9f · f98ba9f
1 parent 2e95121
commit f98ba9f
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 136 deletions.
diff --git a/charts/armonik/Chart.yaml b/charts/armonik/Chart.yaml
@@ -60,22 +60,14 @@ dependencies:
     version: 4.5.2
     repository: https://charts.bitnami.com/bitnami
     condition: node-exporter.enabled
-  - name: metrics-server
-    version: 3.12.2
-    repository: https://kubernetes-sigs.github.io/metrics-server/
-    condition: metrics-server.enabled
+  - name: kube-state-metrics
+    version: 4.3.4
+    repository: https://charts.bitnami.com/bitnami
+    condition: kube-state-metrics.enabled
   - name: cluster-autoscaler
     version: 9.45.0
     repository: https://kubernetes.github.io/autoscaler
     condition: cluster-autoscaler.enabled
-  - name: aws-node-termination-handler
-    version: 0.21.0
-    repository: https://aws.github.io/eks-charts
-    condition: termination-handler.enabled
-  - name: aws-efs-csi-driver
-    version: 3.1.3
-    repository: https://kubernetes-sigs.github.io/aws-efs-csi-driver/
-    condition: efs-csi-driver.enabled
   - name: chaos-mesh
     version: 2.7.0
     repository: https://charts.chaos-mesh.org

diff --git a/charts/armonik/charts/ingress/templates/admin-gui.yaml b/charts/armonik/charts/ingress/templates/admin-gui.yaml
@@ -11,11 +11,6 @@ spec:
     matchLabels:
       app: "armonik"
       service: "admin-gui"
-  strategy:
-    rollingUpdate:
-      maxSurge: {{ .Values.adminGui.strategy.rollingUpdate.maxSurge }}
-      maxUnavailable: {{ .Values.adminGui.strategy.rollingUpdate.maxUnavailable }}
-    type: {{ .Values.adminGui.strategy.type }}
   template:
     metadata:
       labels:

diff --git a/charts/armonik/charts/ingress/templates/ingress.yaml b/charts/armonik/charts/ingress/templates/ingress.yaml
@@ -7,18 +7,11 @@ metadata:
   name: ingress
   namespace: {{ .Values.namespace }}
 spec:
-  progressDeadlineSeconds: {{ .Values.ingress.progressDeadlineSeconds }}
   replicas: {{ .Values.ingress.replicaCount }}
-  revisionHistoryLimit: {{ .Values.ingress.revisionHistoryLimit }}
   selector:
     matchLabels:
       app: "armonik"
       service: "ingress"
-  strategy:
-    rollingUpdate:
-      maxSurge: {{ .Values.ingress.strategy.rollingUpdate.maxSurge }}
-      maxUnavailable: {{ .Values.ingress.strategy.rollingUpdate.maxUnavailable }}
-    type: {{ .Values.ingress.strategy.type }}
   template:
     metadata:
       labels:

diff --git a/charts/armonik/charts/ingress/values.yaml b/charts/armonik/charts/ingress/values.yaml
@@ -3,61 +3,17 @@ namespace: "armonik"
 app:
   name: my-app
   version: 1.0.0
-
-imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 
-serviceAccount:
-  # Specifies whether a service account should be created
-  create: true
-  # Automatically mount a ServiceAccount's API credentials?
-  automount: true
-  # Annotations to add to the service account
-  annotations: {}
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: ""
-
-podAnnotations: {}
-podLabels: {}
-
-podSecurityContext: {}
-  # fsGroup: 2000
-
-securityContext: {}
-  # capabilities:
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
 ingress:
   replicaCount: 1
   className: ""
-  annotations: {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
-  hosts:
-    - host: chart-example.local
-      paths:
-        - path: /
-          pathType: ImplementationSpecific
   tls: []
   #  - secretName: chart-example-tls
   #    hosts:
   #      - chart-example.local
-  revisionHistoryLimit: 10
-  progressDeadlineSeconds: 600
-
-  strategy:
-    type: RollingUpdate
-    rollingUpdate:
-      maxUnavailable: 25%
-      maxSurge: 25%
-
-  image: "nginxinc/nginx-unprivileged:1.27.0-alpine-slim"
+  image: "nginxinc/nginx-unprivileged:1.27.3"
   imagePullPolicy: IfNotPresent
   ports:
   - containerPort: 8080
@@ -134,9 +90,8 @@ ingress:
 
     server {
         listen 8080;
-        listen [::]:8080;
-        listen 9080 http2;
-        listen [::]:9080 http2;
+        listen 9080;
+        http2 on;
 
         sendfile on;
         resolver kube-dns.kube-system ipv6=off;
@@ -184,7 +139,7 @@ ingress:
 
 
 
-        set $seq_upstream http://seq.armonik.svc.cluster.local:80;
+        set $seq_upstream http://seq:80;
         location = /seq {
             rewrite ^ $scheme://$http_host/seq/ permanent;
         }
@@ -199,9 +154,9 @@ ingress:
         }
         set $grafana_upstream http://grafana.armonik.svc.cluster.local:80;
         location = /grafana {
-            rewrite ^ $scheme://$http_host/grafana/ permanent;
+            rewrite ^ $scheme://$http_host/grafana/login permanent;
         }
-        location /grafana/ {
+        location /grafana {
             rewrite  ^/grafana/(.*)  /$1 break;
             proxy_set_header Host $http_host;
             proxy_pass $grafana_upstream$uri$is_args$args;
@@ -227,22 +182,12 @@ ingress:
 ###########################################################
 adminGui:
   name: admin-gui
-  replicaCount: 1
-
-  strategy:
-    rollingUpdate:
-      maxSurge: 25%
-      maxUnavailable: 25%
-    type: RollingUpdate
-
   image: "armonik_admin_app:0.13.3"
   imagePullPolicy: IfNotPresent
-
   ports:
   - containerPort: 1080
     name: app-port
     protocol: TCP
-
   resources:
     limits:
       cpu: "1"
@@ -279,7 +224,6 @@ adminGui:
       service: "admin-gui"
     sessionAffinity: None
 
-
 autoscaling:
   enabled: false
   minReplicas: 1

diff --git a/charts/armonik/values-aws.yaml b/charts/armonik/values-aws.yaml
@@ -94,19 +94,6 @@ mongodb:
     replicaset:
       existingSecret: mongodb-crt
 
-################## RABBITMQ ##################
-rabbitmq:
-  enabled: false
-  fullnameOverride: "rabbitmq"
-
-################## TERMINATION- ##################
-termination-handler:
-  enabled: false
-
-################## EFS-CSI ##################
-efs-csi-driver:
-  enabled: false
-
 ################## CHAOS-MASH ##################
 chaos-mesh:
   enabled: false
@@ -126,23 +113,6 @@ keda:
       operator: Equal
       value: monitoring
 
-################## NODE-EXPORTER ##################
-node-exporter:
-  enabled: true
-  fullnameOverride: "node-exporter"
-
-################## METRICS-SERVER ##################
-metrics-server:
-  enabled: true
-  fullnameOverride: "metrics-server"
-  nodeSelector:
-    service: monitoring
-  tolerations:
-    - effect: NoSchedule
-      key: service
-      operator: Equal
-      value: monitoring
-
 ################## CLUSTER-AUTOSCALER ##################
 cluster-autoscaler:
   enabled: false

diff --git a/charts/armonik/values.yaml b/charts/armonik/values.yaml
@@ -88,19 +88,6 @@ mongodb:
     replicaset:
       existingSecret: mongodb-crt
 
-################## RABBITMQ ##################
-rabbitmq:
-  enabled: false
-  fullnameOverride: "rabbitmq"
-
-################## TERMINATION- ##################
-termination-handler:
-  enabled: false
-
-################## EFS-CSI ##################
-efs-csi-driver:
-  enabled: false
-
 ################## CHAOS-MASH ##################
 chaos-mesh:
   enabled: false
@@ -115,13 +102,13 @@ keda:
   #nodeSelector: {monitoring}
 
 ################## NODE-EXPORTER ##################
-node-exporter:
-  enabled: true
-  fullnameOverride: "node-exporter"
+kube-state-metrics:
+  enabled: false
+  fullnameOverride: "kube-state-metrics"
 
 ################## METRICS-SERVER ##################
 metrics-server:
-  enabled: true
+  enabled: false
   fullnameOverride: "metrics-server"
   #nodeSelector: {"monitoring"}
 
@@ -144,14 +131,14 @@ grafana:
     enabled: true
     hosts: 
     - grafana.local
+    #path: /grafana
   grafana.ini:
       server:
-        domain: localhost
+        domain: grafana.local
         root_url: http://grafana.{{ .Release.Namespace }}.svc.cluster.local
-        serve_from_sub_path: false
+        serve_from_sub_path: true
       anonymous:
         enabled: true
-  createconfigmap: true
   dashboardProviders:
     dashboardproviders.yaml:
       apiVersion: 1
@@ -262,6 +249,10 @@ prometheus:
           - targets: ["metrics-exporter.{{ .Release.Namespace }}.svc.cluster.local:9419"]
             labels:
               namespace: "armonik"
+
+      - job_name: 'kube-state-metrics'
+        static_configs:
+          - targets: ['kube-state-metrics.{{ .Release.Namespace }}.svc.cluster.local:8080']
 
       - job_name: "mongodb-metrics-exporter"
         static_configs: