update notes, default values, new TLS configuration.

Kocoji · May 4, 2024 · f70be04 · f70be04
1 parent 40ce7a5
commit f70be04
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 11 deletions.
diff --git a/charts/registry/Chart.yaml b/charts/registry/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: 0.1.2
+version: 0.1.3
 
 # 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

diff --git a/charts/registry/templates/NOTES.txt b/charts/registry/templates/NOTES.txt
@@ -0,0 +1,7 @@
+Congratulated! Your registry server is hosted at:
+http{{ if $.Values.registry.tls.enabled }}s{{ end }}://{{ $.Values.registry.host | default "registry.local" }}
+
+You have to update your Hosts/DNS to make it works.
+
+After that, you can now use: docker login {{ $.Values.registry.host | default "registry.local" }} 
+then push a new image to it. Cheers
diff --git a/charts/registry/templates/deployment.yaml b/charts/registry/templates/deployment.yaml
@@ -110,7 +110,7 @@ spec:
         livenessProbe:
           tcpSocket:
             port: 6379
-        -readinessProbe:
+        readinessProbe:
           tcpSocket:
             port: 6379
 {{- end }}
diff --git a/charts/registry/templates/ingress.yaml b/charts/registry/templates/ingress.yaml
@@ -10,10 +10,20 @@ kind: Ingress
 metadata:
   name: {{ $fullName }}-ingress
   annotations:
-    nginx.ingress.kubernetes.io/proxy-body-size: {{.Values.registry.maxUploadSize | squote}}
+    nginx.ingress.kubernetes.io/proxy-body-size: {{.Values.registry.maxUploadSize | default "30m" | squote}}
   labels:
     name: {{ $fullName }}-ingress
 spec:
+  {{- if .Values.registry.tls.enabled }}
+  tls:
+  - hosts:
+    - {{ .Values.registry.host  | default "registry.local" | quote }}
+    {{- if not .Values.registry.tls.secretName }}
+    secretName: {{ $fullName }}-tls
+    {{- else -}}
+    secretName: {{ .Values.registry.tls.secretName }}
+    {{ end -}}
+  {{- end }}
   rules:
   - host: {{ .Values.registry.host | default "registry.local" | quote }}
     http:

diff --git a/charts/registry/templates/secret.yaml b/charts/registry/templates/secret.yaml
@@ -5,5 +5,19 @@ metadata:
   name: {{ $fullName}}-basic-auth
 type: kubernetes.io/basic-auth
 data:
-  username: {{ .Values.registry.username | default "YWRtaW4K" | b64enc }} 
-  password: {{ .Values.registry.password | default "YWRtaW4K" | b64enc }}
+  username: {{ .Values.registry.username | default "admin" | b64enc }} 
+  password: {{ .Values.registry.password | default "admin" | b64enc }}
+
+---
+{{- if not .Values.registry.tls.secretName }}
+{{- if .Values.registry.tls.enabled }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ $fullName}}-tls
+type: kubernetes.io/tls
+data:
+  tls.crt: {{ .Values.registry.tls.cert | b64enc }} 
+  tls.key: {{ .Values.registry.tls.key | b64enc }} 
+{{- end}}
+{{- end}}
diff --git a/charts/registry/values.yaml b/charts/registry/values.yaml
@@ -1,15 +1,25 @@
-redis:
-  enabled: true
+redis: {}
+  # enabled: true
   # replicaCount: 1
   # memoryLimit: 2Gi
   # cpuLimit: "1"
 
-registry:
-  replicaCount: 1
+registry: 
+  # replicaCount: 1
   # username: 
   # password: 
-  maxUploadSize: 30m # maximum upload file
-  host: registry.local
+  # maxUploadSize: 30m # maximum upload file
+  # host: registry.local
   # garbageCron: "* * * * *" # set the time to run docker image garbage collection, default is run daily at 00:00 AM
   # memoryLimit: 2Gi
   # cpuLimit: "1"
+  tls: {}
+  #   enabled: true
+  #   secretName: ""
+  #   cert: |
+  #     -----BEGIN CERTIFICATE-----
+  #     -----END CERTIFICATE-----
+  #   key: | 
+  #     -----BEGIN PRIVATE KEY-----
+  #     -----END PRIVATE KEY-----
+