Merge pull request #6 from HomeDevopsLab/multiple-ingresses

Release 2.3.0

Author: kkrolikowski

CHANGELOG.md

@@ -1,21 +1,41 @@
 # Changelog
 
+## [2.3.0] - 2024-08-05
+
+### Changed
+
+- removed liveness probes
+- redefined startup probes
+
+### Added
+
+- private container registries support (imagePullSecrets)
+- support of multiple ingresses to single deployment
+
 ## [2.2.0] - 2023-08-11
+
 ### Added
+
 - option to run containers with additional command and args.
 
 ## [2.1.0] - 2023-07-27
+
 ### Added
-- replaced strict TCP protocol family in ports specification with variable: protocol which allows to decide which protocol is needed
 
+- replaced strict TCP protocol family in ports specification with variable: protocol which allows to decide which protocol is needed
 
 ## [2.0.0] - 2023-07-21
+
 ### Added
+
 - ability to use nodeSelector function
 
 ## [1.0.3] - 2023-06-05
+
 ### Chaged
+
 - increased failure threshold
+
 ## [1.0.2] - 2023-05-25
 
 ### Fixed

chart/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.2.0
+version: 2.3.0
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.

chart/templates/deployment.yaml

@@ -62,25 +62,17 @@ spec:
               protocol: TCP
             {{- end }}
           {{- if .Values.startupProbes.enabled }}
-          {{- $livenessPort := 80 }}
-          {{- range .Values.services }}
-          {{- if eq .name "http" }}
-          {{- $livenessPort = .targetPort }}
-          {{- end }}
-          {{- end }}
-          livenessProbe:
-            httpGet:
-              path: /
-              port: {{ $livenessPort }}
-            failureThreshold: 10
-            periodSeconds: 10
           startupProbe:
             httpGet:
               path: /
-              port: {{ $livenessPort }}
+              port: {{ .Values.startupProbes.port | default 80 }}
             failureThreshold: 30
             periodSeconds: 10
           {{- end }}
+      {{ if .Values.image.registrySecret }}
+      imagePullSecrets:
+      - name: {{ .Values.image.registrySecret }}
+      {{ end }}
       nodeSelector:
       {{- with .Values.nodeSelector }}
         {{- toYaml . | nindent 8 }}

chart/templates/imagerepository.yaml

@@ -7,5 +7,9 @@ metadata:
   namespace: flux-system
 spec:
   image: {{ .Values.image.repository }}
+  {{ if .Values.image.registrySecret }}
+  secretRef:
+    name: {{ .Values.image.registrySecret }}
+  {{- end }}
   interval: 1m0s
 {{- end -}}

chart/templates/ingress.yaml

@@ -1,43 +1,37 @@
 {{- if .Values.ingress.enabled -}}
-{{- $svcPort := 0 -}}
-{{- range .Values.services -}}
-{{- if eq .name "http" -}}
-{{- $svcPort = .servicePort -}}
-{{- else -}}
-{{- $svcPort = "80" -}}
-{{- end -}}
-{{- end -}}
+{{- range .Values.ingress.hosts }}
+{{- $subdomain := .name | splitList "." | first -}}
+{{- $ReleaseName := printf "%s-%s" $.Release.Name $subdomain -}}
+---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ .Release.Name }}
+  name: {{ $ReleaseName }}
   namespace: default
-  {{- if .Values.ingress.ssl }}
+  {{- if $.Values.ingress.ssl }}
   annotations:
     kubernetes.io/ingress.class: traefik
     cert-manager.io/cluster-issuer: letsencrypt
     traefik.ingress.kubernetes.io/router.middlewares: default-redirect-https@kubernetescrd
   {{- end }}
 spec:
   rules:
-    {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
+    - host: {{ .name }}
       http:
         paths:
           - path: /
             pathType: Prefix
             backend:
               service:
-                name: {{ $.Release.Name }}-http-svc
+                name: {{ $ReleaseName }}
                 port:
-                  number: {{ $svcPort }}
-    {{- end }}
-  {{- if .Values.ingress.ssl }}
+                  number: {{ .servicePort }}
+  {{- if $.Values.ingress.ssl }}
   tls:
-  {{- range .Values.ingress.tls }}
-    - secretName: {{ $.Release.Name }}-tls
+    - secretName: {{ $ReleaseName }}-tls
       hosts:
-        - {{ .hosts | first  }}
+        - {{ .name }}
   {{- end }}
+  {{ printf "\n" }}
   {{- end }}
   {{- end -}}

chart/templates/service.yaml

@@ -5,14 +5,10 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ $.Release.Name }}-{{ .name }}-svc
+  name: "{{ $.Release.Name }}-{{ .name }}"
   namespace: default
 spec:
-  {{- if eq .name "http" }}
-  type: ClusterIP
-  {{- else }}
-  type: LoadBalancer
-  {{- end }}
+  type: {{ .type }}
   ports:
     - name: {{ .name }}
       protocol: {{ .protocol }}

chart/test_values.yaml

@@ -1,5 +1,6 @@
 replicaCount: 1
 image:
+  registrySecret: gitlab-registry
   imagePolicy: enabled
   repository: devkrolikowski/swiss-army-knife
   tag: 0.3.0 # {"$imagepolicy": "flux-system:helper:tag"}
@@ -14,8 +15,8 @@ resources:
   requests:
     memory: "1024Mi"
     cpu: "1"
-ingress:
-  enabled: false
+# ingress:
+#   enabled: false
 volumes:
   enabled: true
   mountPath: 
@@ -25,4 +26,28 @@ volumes:
       server: lab-storage.lan
       path: /volume1/storagelab
 nodeSelector:
-  kubernetes.io/arch: arm64
+  kubernetes.io/arch: arm64
+services:
+  - name: http
+    type: ClusterIP
+    protocol: 'TCP'
+    servicePort: 80
+    targetPort: 80
+  - name: ssh
+    type: LoadBalancer
+    protocol: 'TCP'
+    servicePort: 2223
+    targetPort: 22
+  - name: registry
+    type: ClusterIP
+    protocol: 'TCP'
+    servicePort: 5050
+    targetPort: 5050
+ingress:
+  enabled: true
+  ssl: true
+  hosts:
+    - name: gitlab.angrybits.pl
+      servicePort: 80
+    - name: registry.lab.angrybits.pl
+      servicePort: 5050

chart/values.yaml

@@ -9,6 +9,7 @@ image:
   tag: ""
   command: []
   args: []
+  registrySecret: ""
 env: {}
 resources:
   limits: