refactor chart, so each container will be treated as one pod

kahnwong · Apr 13, 2024 · 1e07f6b · 1e07f6b
1 parent 8510a65
commit 1e07f6b
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 123 deletions.
diff --git a/kubernetes/charts/base/chart/Chart.yaml b/kubernetes/charts/base/chart/Chart.yaml
@@ -4,4 +4,4 @@ name: base
 description: A Helm chart for Kubernetes
 
 type: application
-version: 0.1.0
+version: 0.2.0
diff --git a/kubernetes/charts/base/chart/templates/autoscaler.yaml b/kubernetes/charts/base/chart/templates/autoscaler.yaml
diff --git a/...arts/base/chart/templates/deployment.yaml → ...harts/base/chart/templates/container.yaml b/...arts/base/chart/templates/deployment.yaml → ...harts/base/chart/templates/container.yaml
@@ -1,5 +1,5 @@
 apiVersion: apps/v1
-kind: Deployment
+kind: {{ .Values.kind }} # Deployment or StatefulSet
 metadata:
   name: {{ template "name" . }}
   labels:
@@ -18,11 +18,11 @@ spec:
         app.kubernetes.io/instance: {{ template "name" . }}
         app.kubernetes.io/name: {{ template "name" . }}
     spec:
-      {{ if .Values.deployments.initContainers }}
+      {{ if .Values.initContainers }}
       initContainers: {{ toYaml .Values.deployments.initContainers | default list | nindent 8 }}
       {{ end }}
       containers:
-        {{ range .Values.deployments.containers }}
+        {{ range .Values.containers }}
           - name:  {{ .name }}
             image: "{{ .repository }}:{{ .tag }}"
             {{ if .command }}
@@ -40,10 +40,15 @@ spec:
             {{ end }}
             {{ if not (eq .healthcheck false)}}
             livenessProbe:
+              {{ if not (eq .scheme "tcp")}}
               httpGet:
                 path: {{ .livenessProbePath | default "/" }}
                 port: {{ .port }}
                 scheme: HTTP
+              {{ else }}
+              tcpSocket:
+                port: {{ .port }}
+              {{ end }}
             {{ end }}
             securityContext: {{ toYaml .securityContext | default list | nindent 14 }}
             args: {{ .args | default list | toYaml | nindent 14 }}
@@ -53,4 +58,4 @@ spec:
             volumeMounts: {{ toYaml .volumeMounts | default list | nindent 14 }}
         {{ end }}
       imagePullSecrets: {{ toYaml .Values.imagePullSecrets | default list | nindent 8 }}
-      volumes: {{ toYaml .Values.deployments.volumes | default list | nindent 8 }}
+      volumes: {{ toYaml .Values.volumes | default list | nindent 8 }}
diff --git a/kubernetes/charts/base/chart/templates/deployment-service.yaml b/kubernetes/charts/base/chart/templates/deployment-service.yaml
diff --git a/kubernetes/charts/base/chart/templates/ingress.yaml b/kubernetes/charts/base/chart/templates/ingress.yaml
@@ -1,5 +1,5 @@
 ---
-{{ if .Values.deployments.ingress }}
+{{ if .Values.ingress }}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
@@ -11,10 +11,10 @@ spec:
   ingressClassName: nginx
   tls:
   - hosts:
-    - {{ .Values.deployments.ingress.host }}
+    - {{ .Values.ingress.host }}
     secretName: {{ template "name" . }}-tls
   rules:
-    - host: {{ .Values.deployments.ingress.host }}
+    - host: {{ .Values.ingress.host }}
       http:
         paths:
           - path: /
@@ -23,5 +23,5 @@ spec:
               service:
                 name: {{ template "name" . }}
                 port:
-                  number: {{ .Values.deployments.service.port }}
+                  number: {{ .Values.service.port }}
 {{ end }}
diff --git a/kubernetes/charts/base/chart/templates/service.yaml b/kubernetes/charts/base/chart/templates/service.yaml
@@ -0,0 +1,22 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "name" . }}
+spec:
+  {{ if (eq .Values.kind "Deployment")}}
+  type: NodePort
+  {{ end }}
+  selector:
+    app.kubernetes.io/name: {{ template "name" . }}
+  {{ if .Values.service.port }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: {{ .Values.service.port }}
+      {{ if .Values.service.nodePort }}
+      nodePort: {{ .Values.service.nodePort }}
+      {{ end }}
+  {{ end }}
+  {{ if .Values.service.ports }}
+  ports: {{ .Values.service.ports | default list | toYaml | nindent 4 }}
+  {{ end }}
diff --git a/kubernetes/charts/base/chart/templates/statefulset-service.yaml b/kubernetes/charts/base/chart/templates/statefulset-service.yaml
diff --git a/kubernetes/charts/base/chart/templates/statefulset.yaml b/kubernetes/charts/base/chart/templates/statefulset.yaml
diff --git a/kubernetes/deployments/examples/caddy.yaml b/kubernetes/deployments/examples/caddy.yaml
@@ -1,23 +1,23 @@
 ---
+kind: Deployment
 name: caddy
 replicaCount: 1
 
-deployments:
-  containers:
-    - name: caddy
-      repository: caddy
-      tag: latest
-      port: 80
-      resources:
-        limits:
-          cpu: "1"
-          memory: 512Mi
-        requests:
-          cpu: "0.25"
-          memory: 64Mi
-  service:
+containers:
+  - name: caddy
+    repository: caddy
+    tag: latest
     port: 80
-    nodePort: 30049
+    resources:
+      limits:
+        cpu: "1"
+        memory: 512Mi
+      requests:
+        cpu: "0.25"
+        memory: 64Mi
+service:
+  port: 80
+  nodePort: 30049
 
-  # ingress:
-  #   host: foo.example.com
+#ingress:
+#  host: foo.example.com