Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
Charts
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
魏国强
Charts
Commits
769b45d4
Commit
769b45d4
authored
Dec 07, 2020
by
Waqar Ahmed
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clean deployment and always roll pod in case of configuration change
parent
db0ffe9d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
92 deletions
+1
-92
test/plex/2.1.0/templates/deployment.yaml
test/plex/2.1.0/templates/deployment.yaml
+1
-81
test/plex/2.1.0/values.yaml
test/plex/2.1.0/values.yaml
+0
-11
No files found.
test/plex/2.1.0/templates/deployment.yaml
View file @
769b45d4
...
@@ -4,12 +4,6 @@ metadata:
...
@@ -4,12 +4,6 @@ metadata:
name
:
{{
include "plex.fullname" .
}}
name
:
{{
include "plex.fullname" .
}}
labels
:
labels
:
{{
- include "plex.labels" . | nindent 4
}}
{{
- include "plex.labels" . | nindent 4
}}
{{
- if .Values.deploymentAnnotations
}}
annotations
:
{{
- range $key
,
$value
:
= .Values.deploymentAnnotations
}}
{{
$key
}}:
{{
$value | quote
}}
{{
- end
}}
{{
- end
}}
spec
:
spec
:
replicas
:
1
replicas
:
1
revisionHistoryLimit
:
3
revisionHistoryLimit
:
3
...
@@ -22,63 +16,15 @@ spec:
...
@@ -22,63 +16,15 @@ spec:
metadata
:
metadata
:
labels
:
labels
:
{{
- include "plex.selectorLabels" . | nindent 8
}}
{{
- include "plex.selectorLabels" . | nindent 8
}}
{{
- if .Values.podAnnotations
}}
annotations
:
annotations
:
{{
- range $key
,
$value
:
= .Values.podAnnotations
}}
rollme
:
{{
randAlphaNum 5 | quote
}}
{{
$key
}}:
{{
$value | quote
}}
{{
- end
}}
{{
- end
}}
spec
:
spec
:
{{
- with .Values.imagePullSecrets
}}
imagePullSecrets
:
{{
- toYaml . | nindent 8
}}
{{
- end
}}
{{
- if .Values.hostNetwork
}}
{{
- if .Values.hostNetwork
}}
hostNetwork
:
{{
.Values.hostNetwork
}}
hostNetwork
:
{{
.Values.hostNetwork
}}
dnsPolicy
:
ClusterFirstWithHostNet
dnsPolicy
:
ClusterFirstWithHostNet
{{
- end
}}
{{
- end
}}
securityContext
:
{{
- toYaml .Values.podSecurityContext | nindent 8
}}
{{
- if .Values.certificate.pkcsMangler.enabled
}}
initContainers
:
# This is ugly, but it does work to create a pks file that will work with PLEX from the tls.crt and tls.key that cert-manager normally creates
{{
- if .Values.certificate.pkcsMangler.enabled
}}
-
name
:
pkcsmangler-init-container
image
:
"
{{
.Values.certificate.pkcsMangler.image.repository
}}:{{
.Values.certificate.pkcsMangler.image.tag
}}"
imagePullPolicy
:
Always
command
:
[
"
/bin/sh"
]
args
:
[
"
-c"
,
"
openssl
pkcs12
-export
-passout
pass:$(PKCSMANGLER_PFXPASSWORD)
-out
/shared/cert.pfx
-inkey
{{
.Values.certificate.pkcsMangler.certificateSecret.volume.mountPath
}}/{{
.Values.certificate.pkcsMangler.certificateSecret.keyName
}}
-in
{{
.Values.certificate.pkcsMangler.certificateSecret.volume.mountPath
}}/{{
.Values.certificate.pkcsMangler.certificateSecret.crtName
}};
chmod
0444
/shared/cert.pfx"
]
env
:
-
name
:
"
PKCSMANGLER_PFXPASSWORD"
valueFrom
:
secretKeyRef
:
name
:
{{
.Values.certificate.pkcsMangler.pfxPassword.secretName
}}
key
:
{{
.Values.certificate.pkcsMangler.pfxPassword.passwordKey
}}
volumeMounts
:
-
name
:
shared
mountPath
:
/shared
-
name
:
{{
.Values.certificate.pkcsMangler.certificateSecret.volume.name
}}
mountPath
:
{{
.Values.certificate.pkcsMangler.certificateSecret.volume.mountPath
}}
{{
- end
}}
{{
- end
}}
containers
:
containers
:
{{
- if .Values.logging.promtail.enabled
}}
-
name
:
{{
.Chart.Name
}}
-promtail
image
:
"
{{
.Values.logging.promtail.image.repository
}}:{{
.Values.logging.promtail.image.tag
}}"
imagePullPolicy
:
{{
.Values.logging.promtail.image.pullPolicy
}}
args
:
-
-config.file=/etc/promtail/promtail.yaml
volumeMounts
:
-
name
:
promtail-config
mountPath
:
/etc/promtail/promtail.yaml
subPath
:
promtail.yaml
readOnly
:
true
-
name
:
shared-logs
mountPath
:
/plex-logs
{{
- end
}}
-
name
:
{{
.Chart.Name
}}
-
name
:
{{
.Chart.Name
}}
securityContext
:
{{
- toYaml .Values.securityContext | nindent 12
}}
image
:
"
{{
.Values.image.repository
}}:{{
.Values.image.tag
}}"
image
:
"
{{
.Values.image.repository
}}:{{
.Values.image.tag
}}"
imagePullPolicy
:
{{
.Values.image.pullPolicy
}}
imagePullPolicy
:
{{
.Values.image.pullPolicy
}}
ports
:
ports
:
...
@@ -179,20 +125,6 @@ spec:
...
@@ -179,20 +125,6 @@ spec:
{{
- range $key
,
$value
:
= .Values.extraEnv
}}
{{
- range $key
,
$value
:
= .Values.extraEnv
}}
-
name
:
{{
$key
}}
-
name
:
{{
$key
}}
value
:
{{
$value
}}
value
:
{{
$value
}}
{{
- end
}}
# This is part of pkcsMangler
{{
- if .Values.certificate.pkcsMangler.enabled
}}
-
name
:
"
PKCSMANGLER_PFXINCONTAINERPATH"
value
:
"
{{.Values.certificate.pkcsMangler.pfxInContainerPath}}"
{{
- if .Values.certificate.pkcsMangler.setPlexPreferences.enabled
}}
-
name
:
"
PKCSMANGLER_PFXPASSWORD"
valueFrom
:
secretKeyRef
:
name
:
{{
.Values.certificate.pkcsMangler.pfxPassword.secretName
}}
key
:
{{
.Values.certificate.pkcsMangler.pfxPassword.passwordKey
}}
-
name
:
"
PKCSMANGLER_CUSTOMCERTDOMAIN"
value
:
"
customCertificateDomain={{.Values.certificate.pkcsMangler.setPlexPreferences.customCertificateDomain}}"
{{
- end
}}
{{
- end
}}
{{
- end
}}
readinessProbe
:
readinessProbe
:
httpGet
:
httpGet
:
...
@@ -346,15 +278,3 @@ spec:
...
@@ -346,15 +278,3 @@ spec:
path
:
promtail.yaml
path
:
promtail.yaml
{{
- end
}}
{{
- end
}}
##### VOLUMES END #####
##### VOLUMES END #####
{{
- with .Values.nodeSelector
}}
nodeSelector
:
{{
- toYaml . | nindent 8
}}
{{
- end
}}
{{
- with .Values.affinity
}}
affinity
:
{{
- toYaml . | nindent 8
}}
{{
- end
}}
{{
- with .Values.tolerations
}}
tolerations
:
{{
- toYaml . | nindent 8
}}
{{
- end
}}
test/plex/2.1.0/values.yaml
View file @
769b45d4
...
@@ -275,17 +275,6 @@ certificate:
...
@@ -275,17 +275,6 @@ certificate:
name
:
plex-certs
name
:
plex-certs
mountPath
:
/etc/plex-certs
mountPath
:
/etc/plex-certs
# Logging configuration
logging
:
promtail
:
enabled
:
false
image
:
repository
:
grafana/promtail
tag
:
1.6.0
pullPolicy
:
IfNotPresent
loki
:
url
:
http://loki.logs.svc.cluster.local:3100/loki/api/v1/push
# Probes configuration
# Probes configuration
probes
:
probes
:
liveness
:
liveness
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment