suppression ingress par default

wreed4 · May 13, 2018 · 20ebb41 · 20ebb41
1 parent 77b2329
commit 20ebb41
Show file tree

Hide file tree

Showing 27 changed files with 129 additions and 128 deletions.
diff --git a/jackett-0.1.0.tgz b/jackett-0.1.0.tgz
diff --git a/jackett/Chart.yaml b/jackett/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-description: A Jackett HELM chart for Kubernetes
+appVersion: "1.0"
+description: Jackett - shut:p
 name: jackett
 version: 0.1.0
-icon: https://bananaspliff.github.io/helm-charts/jackett/logo/jackett.png
diff --git a/jackett/logo/jackett.png b/jackett/logo/jackett.png
diff --git a/jackett/templates/deployment.yaml b/jackett/templates/deployment.yaml
@@ -20,9 +20,7 @@ spec:
         release: {{ .Release.Name }}
     spec:
       volumes:
-      - name: myvolume
-        persistentVolumeClaim:
-          claimName: myvolume-{{default "default" .Release.Namespace}}
+{{ toYaml .Values.volumes | indent 6 }}
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
@@ -40,12 +38,7 @@ spec:
               path: /
               port: http
           volumeMounts:
-            - name: myvolume
-              mountPath: "/config"
-              subPath: "configs/{{ template "jackett.fullname" . }}"
-            - name: myvolume
-              mountPath: "/downloads"
-              subPath: "downloads/{{ default "jackett" .Values.subDomain }}"
+{{ toYaml .Values.volumeMounts | indent 12 }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
     {{- with .Values.nodeSelector }}

diff --git a/jackett/templates/ingress.yaml b/jackett/templates/ingress.yaml
@@ -1,6 +1,5 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "jackett.fullname" . -}}
-{{- $servicePort := .Values.service.port -}}
 {{- $ingressPath := .Values.ingress.path -}}
 apiVersion: extensions/v1beta1
 kind: Ingress
@@ -16,16 +15,24 @@ metadata:
 {{ toYaml . | indent 4 }}
 {{- end }}
 spec:
+{{- if .Values.ingress.tls }}
   tls:
+  {{- range .Values.ingress.tls }}
     - hosts:
-      - {{ default "jackett" .Values.subDomain }}.{{default "default" .Release.Namespace}}.{{ .Values.domain }}
-      secretName: {{ default "jackett" .Values.subDomain }}-{{default "default" .Release.Namespace}}-{{ .Values.domain }}-tls
+      {{- range .hosts }}
+        - {{ . }}
+      {{- end }}
+      secretName: {{ .secretName }}
+  {{- end }}
+{{- end }}
   rules:
-    - host: {{ default "jackett" .Values.subDomain }}.{{default "default" .Release.Namespace}}.{{ .Values.domain }}
+  {{- range .Values.ingress.hosts }}
+    - host: {{ . }}
       http:
         paths:
           - path: {{ $ingressPath }}
             backend:
               serviceName: {{ $fullName }}
               servicePort: http
+  {{- end }}
 {{- end }}
diff --git a/jackett/templates/service.yaml b/jackett/templates/service.yaml
@@ -11,7 +11,7 @@ spec:
   type: {{ .Values.service.type }}
   ports:
     - port: {{ .Values.service.port }}
-      targetPort: http
+      targetPort: 9117
       protocol: TCP
       name: http
   selector:

diff --git a/jackett/values.yaml b/jackett/values.yaml
@@ -1,13 +1,6 @@
-# Default values for jackett.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
 
 replicaCount: 1
 
-domain: bananaspliff.org
-
-#subDomain: jackett #(default : jackett.<<namespace>>.<<domain>>)
-
 image:
   repository: linuxserver/jackett
   tag: latest
@@ -18,27 +11,35 @@ service:
   port: 80
 
 ingress:
-  enabled: true
+  enabled: false
   annotations:
     kubernetes.io/ingress.class: nginx
     kubernetes.io/tls-acme: "true"
   path: /
+  hosts:
+    - jackett.bananaspliff.org
+  tls:
+   - secretName: jackett-bananaspliff-org
+     hosts:
+       - jackett.bananaspliff.org
+
+volumes:
+  - name: myvolume
+    persistentVolumeClaim:
+      claimName: myvolume
+
+volumeMounts:
+  - name: myvolume
+    mountPath: "/config"
+    subPath: "configs/jackett"
+  - name: myvolume
+    mountPath: "/downloads"
+    subPath: "downloads/jackett"
 
 resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #  cpu: 100m
-  #  memory: 128Mi
-  # requests:
-  #  cpu: 100m
-  #  memory: 128Mi
 
 nodeSelector: {}
 
 tolerations: []
 
 affinity: {}
-
diff --git a/myvolume-0.1.0.tgz b/myvolume-0.1.0.tgz
diff --git a/myvolume/templates/pvc.yaml b/myvolume/templates/pvc.yaml
@@ -1,7 +1,7 @@
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: myvolume-{{default "default" .Release.Namespace}}
+  name: {{ .Values.volumeName }}
 spec:
   storageClassName: {{ .Values.storageClass }}
   accessModes:

diff --git a/myvolume/values.yaml b/myvolume/values.yaml
@@ -4,6 +4,8 @@
 
 storageClass: bananaspliff-nfs
 
+volumeName: myvolume
+
 storage: 512Gi
 
 # WARNING !!! removing the package causes the physical removal of the volume

diff --git a/radarr-0.1.0.tgz b/radarr-0.1.0.tgz
diff --git a/radarr/Chart.yaml b/radarr/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-description: A Radarr HELM chart for Kubernetes
+appVersion: "1.0"
+description: Radarr - Automatic downloader for movies :)
 name: radarr
 version: 0.1.0
-icon: https://bananaspliff.github.io/helm-charts/radarr/logo/radarr.png
diff --git a/radarr/logo/radarr.png b/radarr/logo/radarr.png
diff --git a/radarr/templates/deployment.yaml b/radarr/templates/deployment.yaml
@@ -20,9 +20,7 @@ spec:
         release: {{ .Release.Name }}
     spec:
       volumes:
-      - name: myvolume
-        persistentVolumeClaim:
-          claimName: myvolume-{{default "default" .Release.Namespace}}
+{{ toYaml .Values.volumes | indent 6 }}
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
@@ -40,15 +38,7 @@ spec:
               path: /
               port: http
           volumeMounts:
-            - name: myvolume
-              mountPath: "/config"
-              subPath: "configs/{{ template "radarr.fullname" . }}"
-            - name: myvolume
-              mountPath: "/downloads"
-              subPath: "downloads/{{ default "radarr" .Values.subDomain }}"
-            - name: myvolume
-              mountPath: "/movies"
-              subPath: "medias/movies"
+{{ toYaml .Values.volumeMounts | indent 12 }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
     {{- with .Values.nodeSelector }}

diff --git a/radarr/templates/ingress.yaml b/radarr/templates/ingress.yaml
@@ -1,6 +1,5 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "radarr.fullname" . -}}
-{{- $servicePort := .Values.service.port -}}
 {{- $ingressPath := .Values.ingress.path -}}
 apiVersion: extensions/v1beta1
 kind: Ingress
@@ -16,16 +15,24 @@ metadata:
 {{ toYaml . | indent 4 }}
 {{- end }}
 spec:
+{{- if .Values.ingress.tls }}
   tls:
+  {{- range .Values.ingress.tls }}
     - hosts:
-      - {{ default "radarr" .Values.subDomain }}.{{default "default" .Release.Namespace}}.{{ .Values.domain }}
-      secretName: {{ default "radarr" .Values.subDomain }}-{{default "default" .Release.Namespace}}-{{ .Values.domain }}-tls
+      {{- range .hosts }}
+        - {{ . }}
+      {{- end }}
+      secretName: {{ .secretName }}
+  {{- end }}
+{{- end }}
   rules:
-    - host: {{ default "radarr" .Values.subDomain }}.{{default "default" .Release.Namespace}}.{{ .Values.domain }}
+  {{- range .Values.ingress.hosts }}
+    - host: {{ . }}
       http:
         paths:
           - path: {{ $ingressPath }}
             backend:
               serviceName: {{ $fullName }}
               servicePort: http
+  {{- end }}
 {{- end }}
diff --git a/radarr/templates/service.yaml b/radarr/templates/service.yaml
@@ -11,7 +11,7 @@ spec:
   type: {{ .Values.service.type }}
   ports:
     - port: {{ .Values.service.port }}
-      targetPort: http
+      targetPort: 7878
       protocol: TCP
       name: http
   selector:

diff --git a/radarr/values.yaml b/radarr/values.yaml
@@ -1,13 +1,6 @@
-# Default values for radarr.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
 
 replicaCount: 1
 
-domain: bananaspliff.org
-
-#subDomain: radarr #(default : radarr.<<namespace>>.<<domain>>)
-
 image:
   repository: linuxserver/radarr
   tag: latest
@@ -18,27 +11,38 @@ service:
   port: 80
 
 ingress:
-  enabled: true
+  enabled: false
   annotations:
     kubernetes.io/ingress.class: nginx
     kubernetes.io/tls-acme: "true"
   path: /
+  hosts:
+    - radarr.bananaspliff.org
+  tls:
+   - secretName: radarr-bananaspliff-org
+     hosts:
+       - radarr.bananaspliff.org
+
+volumes:
+  - name: myvolume
+    persistentVolumeClaim:
+      claimName: myvolume
+
+volumeMounts:
+  - name: myvolume
+    mountPath: "/config"
+    subPath: "configs/radarr"
+  - name: myvolume
+    mountPath: "/downloads"
+    subPath: "downloads/radarr"
+  - name: myvolume
+    mountPath: "/movies"
+    subPath: "medias/movies"
 
 resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #  cpu: 100m
-  #  memory: 128Mi
-  # requests:
-  #  cpu: 100m
-  #  memory: 128Mi
 
 nodeSelector: {}
 
 tolerations: []
 
 affinity: {}
-
diff --git a/sftp-0.1.0.tgz b/sftp-0.1.0.tgz
diff --git a/sftp/templates/deployment.yaml b/sftp/templates/deployment.yaml
@@ -20,9 +20,7 @@ spec:
         release: {{ .Release.Name }}
     spec:
       volumes:
-      - name: myvolume
-        persistentVolumeClaim:
-          claimName: myvolume-{{default "default" .Release.Namespace}}
+{{ toYaml .Values.volumes | indent 6 }}
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
@@ -35,6 +33,8 @@ spec:
           volumeMounts:
             - name: myvolume
               mountPath: "/home/{{default "default" .Release.Namespace}}"
+          volumeMounts:
+{{ toYaml .Values.volumeMounts | indent 12 }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
     {{- with .Values.nodeSelector }}

diff --git a/sftp/values.yaml b/sftp/values.yaml
@@ -1,6 +1,3 @@
-# Default values for sftp.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
 
 image:
   repository: atmoz/sftp
@@ -12,17 +9,16 @@ service:
   type: NodePort
   port: 22
 
+volumes:
+  - name: myvolume
+    persistentVolumeClaim:
+      claimName: myvolume
+
+volumeMounts:
+  - name: myvolume
+    mountPath: "/home/banane"
+
 resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #  cpu: 100m
-  #  memory: 128Mi
-  # requests:
-  #  cpu: 100m
-  #  memory: 128Mi
 
 nodeSelector: {}
 

diff --git a/sonarr-0.1.0.tgz b/sonarr-0.1.0.tgz
diff --git a/sonarr/Chart.yaml b/sonarr/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-description: A Sonarr HELM chart for Kubernetes
+appVersion: "1.0"
+description: Sonarr - Automatic downloader for movies :)
 name: sonarr
 version: 0.1.0
-icon: https://bananaspliff.github.io/helm-charts/sonarr/logo/sonarr.png
diff --git a/sonarr/logo/sonarr.png b/sonarr/logo/sonarr.png
diff --git a/sonarr/templates/deployment.yaml b/sonarr/templates/deployment.yaml
@@ -20,9 +20,7 @@ spec:
         release: {{ .Release.Name }}
     spec:
       volumes:
-      - name: myvolume
-        persistentVolumeClaim:
-          claimName: myvolume-{{default "default" .Release.Namespace}}
+{{ toYaml .Values.volumes | indent 6 }}
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
@@ -40,15 +38,7 @@ spec:
               path: /
               port: http
           volumeMounts:
-            - name: myvolume
-              mountPath: "/config"
-              subPath: "configs/{{ template "sonarr.fullname" . }}"
-            - name: myvolume
-              mountPath: "/downloads"
-              subPath: "downloads/{{ default "sonarr" .Values.subDomain }}"
-            - name: myvolume
-              mountPath: "/tv"
-              subPath: "medias/series"
+{{ toYaml .Values.volumeMounts | indent 12 }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
     {{- with .Values.nodeSelector }}