add ability to specify container images and tags

kubealex · Nov 21, 2022 · 3fffd3c · 3fffd3c
1 parent dc5b9ac
commit 3fffd3c
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -113,6 +113,8 @@ The CR is quite simple to configure, and I tried to keep the number of parameter
 | Config path | Meaning | Default | 
 | ------------ | ------------ | ------------ |
 | sonarr.enabled | Flag if you want to enable sonarr | true | 
+| sonarr.container.image | The image used by the container | docker.io/linuxserver/sonarr | 
+| sonarr.container.tag | The tag used by the container | null | 
 | sonarr.container.port | The port in use by the container | 8989 | 
 | sonarr.service.type | The kind of Service (ClusterIP/NodePort/LoadBalancer) | ClusterIP |
 | sonarr.service.port | The port assigned to the service | 8989 |
@@ -130,6 +132,8 @@ The CR is quite simple to configure, and I tried to keep the number of parameter
 | Config path | Meaning | Default | 
 | ------------ | ------------ | ------------ |
 | radarr.enabled | Flag if you want to enable radarr | true | 
+| radarr.container.image | The image used by the container | docker.io/linuxserver/radarr | 
+| radarr.container.tag | The tag used by the container | null | 
 | radarr.container.port | The port in use by the container | 7878 | 
 | radarr.service.type | The kind of Service (ClusterIP/NodePort/LoadBalancer) | ClusterIP |
 | radarr.service.port | The port assigned to the service | 7878 |
@@ -147,6 +151,8 @@ The CR is quite simple to configure, and I tried to keep the number of parameter
 | Config path | Meaning | Default | 
 | ------------ | ------------ | ------------ |
 | jackett.enabled | Flag if you want to enable jackett | true | 
+| jackett.container.image | The image used by the container | docker.io/linuxserver/jackett | 
+| jackett.container.tag | The tag used by the container | null | 
 | jackett.container.port | The port in use by the container | 9117 | 
 | jackett.service.type | The kind of Service (ClusterIP/NodePort/LoadBalancer) | ClusterIP |
 | jackett.service.port | The port assigned to the service | 9117 |
@@ -164,6 +170,8 @@ The CR is quite simple to configure, and I tried to keep the number of parameter
 | Config path | Meaning | Default | 
 | ------------ | ------------ | ------------ |
 | transmission.enabled | Flag if you want to enable transmission | true | 
+| transmission.container.image | The image used by the container | docker.io/linuxserver/transmission | 
+| transmission.container.tag | The tag used by the container | null | 
 | transmission.container.port.utp | The port in use by the container | 9091 | 
 | transmission.container.port.peer | The port in use by the container for peer connection | 51413 | 
 | transmission.service.utp.type | The kind of Service (ClusterIP/NodePort/LoadBalancer) for transmission itself | ClusterIP |
@@ -190,6 +198,8 @@ The CR is quite simple to configure, and I tried to keep the number of parameter
 | Config path | Meaning | Default | 
 | ------------ | ------------ | ------------ |
 | sabnzbd.enabled | Flag if you want to enable sabnzbd | true | 
+| sabnzbd.container.image | The image used by the container | docker.io/linuxserver/sabnzbd | 
+| sabnzbd.container.tag | The tag used by the container | null | 
 | sabnzbd.container.port.http | The port in use by the container | 8080 | 
 | sabnzbd.container.port.https | The port in use by the container for peer connection | 9090 | 
 | sabnzbd.service.http.type | The kind of Service (ClusterIP/NodePort/LoadBalancer) for sabnzbd itself | ClusterIP |

diff --git a/helm-charts/k8s-mediaserver/templates/jackett-resources.yml b/helm-charts/k8s-mediaserver/templates/jackett-resources.yml
@@ -64,7 +64,7 @@ spec:
           envFrom:
             - configMapRef:
                 name: jackett-config
-          image: docker.io/linuxserver/jackett:{{ .Values.general.image_tag }}
+          image: "{{ .Values.jackett.container.image }}:{{ .Values.jackett.container.tag | default .Values.general.image_tag }}"
           imagePullPolicy: Always
           readinessProbe:
             tcpSocket:

diff --git a/helm-charts/k8s-mediaserver/templates/plex-resources.yml b/helm-charts/k8s-mediaserver/templates/plex-resources.yml
@@ -42,7 +42,7 @@ spec:
           envFrom:
             - configMapRef:
                 name: plex-config
-          image: "docker.io/linuxserver/plex:{{ .Values.general.image_tag }}"
+          image: "{{ .Values.plex.container.image }}:{{ .Values.plex.container.tag | default .Values.general.image_tag }}"
           imagePullPolicy: Always
           readinessProbe:
             tcpSocket:

diff --git a/helm-charts/k8s-mediaserver/templates/radarr-resources.yml b/helm-charts/k8s-mediaserver/templates/radarr-resources.yml
@@ -65,7 +65,7 @@ spec:
           envFrom:
             - configMapRef:
                 name: radarr-config
-          image: "docker.io/linuxserver/radarr:{{ .Values.general.image_tag }}"
+          image: "{{ .Values.radarr.container.image }}:{{ .Values.radarr.container.tag | default .Values.general.image_tag }}"
           imagePullPolicy: Always
           readinessProbe:
             tcpSocket:

diff --git a/helm-charts/k8s-mediaserver/templates/sabnzbd-resources.yml b/helm-charts/k8s-mediaserver/templates/sabnzbd-resources.yml
@@ -367,7 +367,7 @@ spec:
           envFrom:
             - configMapRef:
                 name: sabnzbd-config
-          image: "docker.io/linuxserver/sabnzbd:{{ .Values.general.image_tag }}"
+          image: "{{ .Values.sabnzbd.container.image }}:{{ .Values.sabnzbd.container.tag | default .Values.general.image_tag }}"
           imagePullPolicy: Always
           readinessProbe:
             tcpSocket:

diff --git a/helm-charts/k8s-mediaserver/templates/sonarr-resources.yml b/helm-charts/k8s-mediaserver/templates/sonarr-resources.yml
@@ -64,7 +64,7 @@ spec:
           envFrom:
             - configMapRef:
                 name: sonarr-config
-          image: "docker.io/linuxserver/sonarr:{{ .Values.general.image_tag }}"
+          image: "{{ .Values.sonarr.container.image }}:{{ .Values.sonarr.container.tag | default .Values.general.image_tag }}"
           imagePullPolicy: Always
           readinessProbe:
             tcpSocket:

diff --git a/helm-charts/k8s-mediaserver/templates/transmission-resources.yml b/helm-charts/k8s-mediaserver/templates/transmission-resources.yml
@@ -131,7 +131,7 @@ spec:
           envFrom:
             - configMapRef:
                 name: transmission-config
-          image: "docker.io/linuxserver/transmission:{{ .Values.general.image_tag }}"
+          image: "{{ .Values.transmission.container.image }}:{{ .Values.transmission.container.tag | default .Values.general.image_tag }}"
           imagePullPolicy: Always
           readinessProbe:
             tcpSocket:

diff --git a/helm-charts/k8s-mediaserver/values.yaml b/helm-charts/k8s-mediaserver/values.yaml
@@ -33,6 +33,7 @@ general:
 sonarr:
   enabled: true
   container: 
+    image: docker.io/linuxserver/sonarr
     nodeSelector: {}
     port: 8989
   service:
@@ -54,6 +55,7 @@ sonarr:
 radarr:
   enabled: true
   container: 
+    image: docker.io/linuxserver/radarr
     nodeSelector: {}
     port: 7878
   service:
@@ -75,6 +77,7 @@ radarr:
 jackett:
   enabled: true
   container: 
+    image: docker.io/linuxserver/jackett
     nodeSelector: {}
     port: 9117
   service:
@@ -95,6 +98,7 @@ jackett:
 transmission:
   enabled: true
   container: 
+    image: docker.io/linuxserver/transmission
     nodeSelector: {}
     port: 
       utp: 9091
@@ -130,6 +134,7 @@ transmission:
 sabnzbd:
   enabled: true
   container: 
+    image: docker.io/linuxserver/sabnzbd
     nodeSelector: {}
     port: 
       http: 8080
@@ -161,6 +166,7 @@ plex:
   claim: "CHANGEME"
   replicaCount: 1
   container: 
+    image: docker.io/linuxserver/plex
     nodeSelector: {}
     port: 32400
   service: