updates

Hansel-Christopher · Apr 28, 2024 · 70f6e9c · 70f6e9c
1 parent 19705e1
commit 70f6e9c
Show file tree

Hide file tree

Showing 6 changed files with 186 additions and 48 deletions.
diff --git a/charts/build-push-chart.sh b/charts/build-push-chart.sh
@@ -0,0 +1,13 @@
+CHART_DIR="$1"
+VERSION=$(grep 'version:' $CHART_DIR/Chart.yaml | cut -d ':' -f 2 | tr -d ' ')
+
+# Validate version
+if [ -z "$VERSION" ]; then
+  echo "Version not found in Chart.yaml"
+  exit 1
+fi
+
+helm package service-chart
+helm push service-chart-$VERSION.tgz oci://registry-1.docker.io/hanselchristopher001
+
+rm service-chart-$VERSION.tgz
diff --git a/charts/service-chart/README.md b/charts/service-chart/README.md
@@ -14,15 +14,19 @@ A Helm chart for Kubernetes
 | autoscaling.minReplicas | int | `1` |  |
 | autoscaling.triggers.memory.value | string | `"80"` |  |
 | containerPort | int | `5000` |  |
+| deploymentAnnotations | object | `{}` |  |
 | fullnameOverride | string | `""` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"hanselchristopher001/password-generator"` |  |
 | image.tag | string | `"v1.0.0"` |  |
 | ingress.annotations | object | `{}` |  |
 | ingress.className | string | `"nginx"` |  |
 | ingress.enabled | bool | `false` |  |
-| ingress.hosts[0].paths[0].path | string | `"/"` |  |
-| ingress.hosts[0].paths[0].pathType | string | `"ImplementationSpecific"` |  |
+| ingress.hosts[0].host | string | `"localhost"` |  |
+| ingress.hosts[0].paths[0].path | string | `"/generate-passwords"` |  |
+| ingress.hosts[0].paths[0].pathType | string | `"Prefix"` |  |
+| ingress.hosts[0].paths[1].path | string | `"/"` |  |
+| ingress.hosts[0].paths[1].pathType | string | `"Prefix"` |  |
 | ingress.tls | list | `[]` |  |
 | nodeSelector | object | `{}` |  |
 | pdb.maxUnavailable | int | `1` |  |
@@ -40,7 +44,10 @@ A Helm chart for Kubernetes
 | probes.startup.path | string | `"/"` |  |
 | probes.startup.periodSeconds | int | `20` |  |
 | replicaCount | int | `3` |  |
-| resources | object | `{}` |  |
+| resources.limits.cpu | string | `"200m"` |  |
+| resources.limits.memory | string | `"512Mi"` |  |
+| resources.requests.cpu | string | `"100m"` |  |
+| resources.requests.memory | string | `"256Mi"` |  |
 | service.port | int | `80` |  |
 | service.type | string | `"ClusterIP"` |  |
 | serviceMonitor.enabled | bool | `true` |  |

diff --git a/charts/service-chart/templates/pdb.yaml b/charts/service-chart/templates/pdb.yaml
@@ -3,7 +3,7 @@ kind: PodDisruptionBudget
 metadata:
   name: {{ include "service-chart.fullname" . }}
   labels:
-    {{- include "service-chart.standardLabels" . }}
+    {{- include "service-chart.standardLabels" . | nindent 4 }}
 spec:
   maxUnavailable: {{ .Values.pdb.maxUnavailable | default 1 }}
   selector:

diff --git a/charts/service-chart/templates/rollout.yaml b/charts/service-chart/templates/rollout.yaml
@@ -4,6 +4,10 @@ metadata:
   name: {{ include "service-chart.fullname" . }}
   labels:
     {{- include "service-chart.standardLabels" . | nindent 4 }}
+  annotations:
+{{- if .Values.deploymentAnnotations }}
+{{ toYaml .Values.deploymentAnnotations | indent 4 }}
+{{- end }}
 spec:
 {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
@@ -19,8 +23,7 @@ spec:
   template:
     metadata:
       labels:
-        app: {{ include "service-chart.name" . }}
-        release: {{ .Release.Name }}
+        {{- include "service-chart.selectorLabels" . | nindent 8 }}
     spec:
       containers:
         - name: {{ .Chart.Name }}

diff --git a/charts/service-chart/values-test.yaml b/charts/service-chart/values-test.yaml
@@ -0,0 +1,104 @@
+fullnameOverride: "example-app"
+
+deploymentAnnotations: {}
+  # example: "annotation"
+
+replicaCount: 1
+
+resources:
+  requests:
+    cpu: "100m"
+    memory: "256Mi"
+  limits:
+    cpu: "200m"
+    memory: "512Mi"
+
+pdb:
+  maxUnavailable: 1
+
+image:
+  repository: hanselchristopher001/password-generator
+  pullPolicy: IfNotPresent
+  tag: "v1.0.0"
+
+nodeSelector: {}
+affinity: {}
+tolerations: {}
+
+probes:
+  liveness:
+    enabled: true
+    path: "/"
+    initialDelaySeconds: 30
+    periodSeconds: 10
+  readiness:
+    enabled: true
+    path: "/"
+    initialDelaySeconds: 20
+    periodSeconds: 5
+  startup:
+    enabled: true
+    path: "/"
+    initialDelaySeconds: 30
+    periodSeconds: 20
+    failureThreshold: 10
+
+service:
+  type: ClusterIP
+  port: 80
+
+containerPort: 5000
+
+ingress:
+  enabled: false
+  className: "nginx"
+  annotations: {}
+  hosts:
+    - host: localhost
+      paths:
+        - path: /generate-passwords
+          pathType: Prefix
+        - path: /
+          pathType: Prefix
+  tls: []
+
+autoscaling:
+  enabled: false
+  minReplicas: 1
+  maxReplicas: 10
+  triggers:
+    memory:
+      value: "80"
+
+serviceMonitor:
+  enabled: true
+
+topologySpreadConstraints:
+  # - maxSkew: 1
+  #   topologyKey: kubernetes.io/hostname
+  #   whenUnsatisfiable: ScheduleAnyway
+  #   labelSelector:
+  #     matchExpressions:
+  #     - key: disktype
+  #       operator: In
+  #       values:
+  #       - ssd
+  # - maxSkew: 1
+  #   topologyKey: topology.kubernetes.io/zone
+  #   whenUnsatisfiable: ScheduleAnyway
+  #   labelSelector:
+  #     matchExpressions:
+  #     - key: disktype
+  #       operator: In
+  #       values:
+  #       - ssd
+
+# affinity:
+#   nodeAffinity:
+#     requiredDuringSchedulingIgnoredDuringExecution:
+#       nodeSelectorTerms:
+#       —matchExpressions:
+#         —key: "disktype"
+#           operator: "In"
+#           values:
+#           — ssd
diff --git a/charts/service-chart/values.yaml b/charts/service-chart/values.yaml
@@ -1,56 +1,26 @@
 fullnameOverride: ""
 
+deploymentAnnotations: {}
+  # example: "annotation"
+
 replicaCount: 3
 
-autoscaling:
-  enabled: false
-  minReplicas: 1
-  maxReplicas: 10
-  triggers:
-    memory:
-      value: "80"
+resources:
+  requests:
+    cpu: "100m"
+    memory: "256Mi"
+  limits:
+    cpu: "200m"
+    memory: "512Mi"
 
 pdb:
   maxUnavailable: 1
 
-topologySpreadConstraints:
-  # - maxSkew: 1
-  #   topologyKey: kubernetes.io/hostname
-  #   whenUnsatisfiable: ScheduleAnyway
-  #   labelSelector:
-  #     matchExpressions:
-  #     - key: disktype
-  #       operator: In
-  #       values:
-  #       - ssd
-  # - maxSkew: 1
-  #   topologyKey: topology.kubernetes.io/zone
-  #   whenUnsatisfiable: ScheduleAnyway
-  #   labelSelector:
-  #     matchExpressions:
-  #     - key: disktype
-  #       operator: In
-  #       values:
-  #       - ssd
-
-# affinity:
-#   nodeAffinity:
-#     requiredDuringSchedulingIgnoredDuringExecution:
-#       nodeSelectorTerms:
-#       —matchExpressions:
-#         —key: "disktype"
-#           operator: "In"
-#           values:
-#           — ssd
-
-
 image:
   repository: hanselchristopher001/password-generator
   pullPolicy: IfNotPresent
   tag: "v1.0.0"
 
-resources: {}
-
 nodeSelector: {}
 affinity: {}
 tolerations: {}
@@ -84,10 +54,51 @@ ingress:
   className: "nginx"
   annotations: {}
   hosts:
-    - paths:
+    - host: localhost
+      paths:
+        - path: /generate-passwords
+          pathType: Prefix
         - path: /
-          pathType: ImplementationSpecific
+          pathType: Prefix
   tls: []
 
+autoscaling:
+  enabled: false
+  minReplicas: 1
+  maxReplicas: 10
+  triggers:
+    memory:
+      value: "80"
+
 serviceMonitor:
   enabled: true
+
+topologySpreadConstraints:
+  # - maxSkew: 1
+  #   topologyKey: kubernetes.io/hostname
+  #   whenUnsatisfiable: ScheduleAnyway
+  #   labelSelector:
+  #     matchExpressions:
+  #     - key: disktype
+  #       operator: In
+  #       values:
+  #       - ssd
+  # - maxSkew: 1
+  #   topologyKey: topology.kubernetes.io/zone
+  #   whenUnsatisfiable: ScheduleAnyway
+  #   labelSelector:
+  #     matchExpressions:
+  #     - key: disktype
+  #       operator: In
+  #       values:
+  #       - ssd
+
+# affinity:
+#   nodeAffinity:
+#     requiredDuringSchedulingIgnoredDuringExecution:
+#       nodeSelectorTerms:
+#       —matchExpressions:
+#         —key: "disktype"
+#           operator: "In"
+#           values:
+#           — ssd