charts/open-meteo-service/templates/_helpers.tpl

@@ -25,12 +25,3 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- define "open-meteo-service.grafanaFullname" -}}
 {{- printf "%s-grafana" (include "open-meteo-service.fullname" .) | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
-
-{{/*
-Selector labels for API component
-*/}}
-{{- define "open-meteo-service.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "open-meteo-service.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-app.kubernetes.io/component: api
-{{- end -}}

charts/open-meteo-service/templates/app-deployment.yaml

@@ -2,29 +2,21 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "open-meteo-service.fullname" . }}
-  annotations:
-    argocd.argoproj.io/sync-options: Replace=true,Force=true
-    argocd.argoproj.io/sync-wave: "1"
   labels:
     {{- include "open-meteo-service.labels" . | nindent 4 }}
-    app.kubernetes.io/component: api
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      {{- include "open-meteo-service.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/name: {{ include "open-meteo-service.name" . }}
+      app.kubernetes.io/instance: {{ .Release.Name }}
   template:
     metadata:
       labels:
         {{- include "open-meteo-service.labels" . | nindent 8 }}
-        app.kubernetes.io/component: api
       annotations:
         {{- toYaml .Values.podAnnotations | nindent 8 }}
     spec:
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
       containers:
         - name: {{ include "open-meteo-service.name" . }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"

charts/open-meteo-service/templates/grafana-ingress.yaml

@@ -1,33 +0,0 @@
-{{- if and .Values.grafana.enabled .Values.grafana.ingress.enabled }}
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: {{ include "open-meteo-service.grafanaFullname" . }}
-  {{- if .Values.grafana.ingress.className }}
-  annotations:
-    kubernetes.io/ingress.class: {{ .Values.grafana.ingress.className }}
-  {{- end }}
-spec:
-  {{- if .Values.grafana.ingress.className }}
-  ingressClassName: {{ .Values.grafana.ingress.className }}
-  {{- end }}
-  rules:
-    {{- range .Values.grafana.ingress.hosts }}
-    - host: {{ .host }}
-      http:
-        paths:
-          {{- range .paths }}
-          - path: {{ .path }}
-            pathType: {{ .pathType }}
-            backend:
-              service:
-                name: {{ include "open-meteo-service.grafanaFullname" $ }}
-                port:
-                  number: {{ $.Values.grafana.service.port }}
-          {{- end }}
-    {{- end }}
-  {{- if .Values.grafana.ingress.tls }}
-  tls:
-    {{- toYaml .Values.grafana.ingress.tls | nindent 4 }}
-  {{- end }}
-{{- end }}

charts/open-meteo-service/templates/prometheus-ingress.yaml

@@ -1,33 +0,0 @@
-{{- if and .Values.prometheus.enabled .Values.prometheus.ingress.enabled }}
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: {{ include "open-meteo-service.prometheusFullname" . }}
-  {{- if .Values.prometheus.ingress.className }}
-  annotations:
-    kubernetes.io/ingress.class: {{ .Values.prometheus.ingress.className }}
-  {{- end }}
-spec:
-  {{- if .Values.prometheus.ingress.className }}
-  ingressClassName: {{ .Values.prometheus.ingress.className }}
-  {{- end }}
-  rules:
-    {{- range .Values.prometheus.ingress.hosts }}
-    - host: {{ .host }}
-      http:
-        paths:
-          {{- range .paths }}
-          - path: {{ .path }}
-            pathType: {{ .pathType }}
-            backend:
-              service:
-                name: {{ include "open-meteo-service.prometheusFullname" $ }}
-                port:
-                  number: {{ $.Values.prometheus.service.port }}
-          {{- end }}
-    {{- end }}
-  {{- if .Values.prometheus.ingress.tls }}
-  tls:
-    {{- toYaml .Values.prometheus.ingress.tls | nindent 4 }}
-  {{- end }}
-{{- end }}

charts/open-meteo-service/templates/service.yaml

@@ -4,7 +4,6 @@ metadata:
   name: {{ include "open-meteo-service.fullname" . }}
   labels:
     {{- include "open-meteo-service.labels" . | nindent 4 }}
-    app.kubernetes.io/component: api
 spec:
   type: {{ .Values.service.type }}
   ports:
@@ -13,4 +12,5 @@ spec:
       protocol: TCP
       name: http
   selector:
-    {{- include "open-meteo-service.selectorLabels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "open-meteo-service.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}

charts/open-meteo-service/values.yaml

@@ -49,15 +49,6 @@ prometheus:
   service:
     type: ClusterIP
     port: 9090
-  ingress:
-    enabled: false
-    className: ""
-    hosts:
-      - host: prometheus.local
-        paths:
-          - path: /
-            pathType: Prefix
-    tls: []
   persistence:
     enabled: false
     accessModes:
@@ -76,15 +67,6 @@ grafana:
     port: 3000
   adminUser: admin
   adminPassword: admin
-  ingress:
-    enabled: false
-    className: ""
-    hosts:
-      - host: grafana.local
-        paths:
-          - path: /
-            pathType: Prefix
-    tls: []
   persistence:
     enabled: false
     accessModes:

manifests/open-meteo-service/values.yaml

@@ -2,18 +2,14 @@ replicaCount: 1
 
 image:
   repository: harbor.dvirlabs.com/my-apps/open-meteo-service
-  tag: "1.0.3"
+  tag: "1.0.0"
-  pullPolicy: IfNotPresent
-
-imagePullSecrets:
-  - name: harbor-regcred
 
 service:
   type: ClusterIP
   port: 8000
 
 ingress:
-  enabled: true
+  enabled: false
   className: "traefik"
   hosts:
     - host: open-meteo.dvirlabs.com
@@ -52,15 +48,6 @@ prometheus:
   service:
     type: ClusterIP
     port: 9090
-  ingress:
-    enabled: true
-    className: "traefik"
-    hosts:
-      - host: open-meteo-prometheus.dvirlabs.com
-        paths:
-          - path: /
-            pathType: Prefix
-    tls: []
   persistence:
     enabled: false
     accessModes:
@@ -79,15 +66,6 @@ grafana:
     port: 3000
   adminUser: admin
   adminPassword: admin
-  ingress:
-    enabled: true
-    className: "traefik"
-    hosts:
-      - host: open-meteo-grafana.dvirlabs.com
-        paths:
-          - path: /
-            pathType: Prefix
-    tls: []
   persistence:
     enabled: false
     accessModes: