Skip to content

Commit

Permalink
chore: cleanup default values (#3)
Browse files Browse the repository at this point in the history
  • Loading branch information
xoxys authored Sep 22, 2022
1 parent d23b1c6 commit 68c4461
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 38 deletions.
1 change: 1 addition & 0 deletions charts/owncloud/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ metadata:
{{- include "owncloud.labels" . | nindent 4 }}
annotations:
ignore-check.kube-linter.io/run-as-non-root : "ownCloud does not support non-root containers"
ignore-check.kube-linter.io/no-read-only-root-fs : "ownCloud need to write /etc/environment on startup"
spec:
{{- if not .Values.autoscaling.enabled }}
replicas: {{ .Values.replicaCount }}
Expand Down
8 changes: 4 additions & 4 deletions charts/owncloud/templates/pvc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ metadata:
name: {{ include "owncloud.fullname" . }}
spec:
accessModes:
- ReadWriteOnce
{{- toYaml .Values.persistence.owncloud.accessMode | nindent 4 }}
capacity:
storage: 100Gi
storage: {{ .Values.persistence.owncloud.size }}
nfs:
server: {{ .Values.persistence.owncloud.nfs.server }}
path: {{ .Values.persistence.owncloud.nfs.path }}
Expand All @@ -21,9 +21,9 @@ metadata:
name: {{ include "owncloud.fullname" . }}
spec:
accessModes:
- ReadWriteOnce
{{- toYaml .Values.persistence.owncloud.accessMode | nindent 4 }}
resources:
requests:
storage: 100Gi
storage: {{ .Values.persistence.owncloud.size }}
storageClassName: standard
{{- end -}}
16 changes: 9 additions & 7 deletions charts/owncloud/values-ci-testing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,18 @@ externalDatabase:
persistence:
enabled: true
owncloud:
accessMode: ReadWriteOnce
size: 8Gi
accessMode:
- ReadWriteOnce
size: 20Gi
nfs: {}

redis:
enabled: false

image:
repository: docker.io/owncloud/server
pullPolicy: IfNotPresent
tag: 10.10
pullPolicy: Always
tag: 10.11

imagePullSecrets: []
nameOverride: ""
Expand All @@ -46,14 +47,15 @@ podAnnotations: {}
podSecurityContext: {}

securityContext:
readOnlyRootFilesystem: true
readOnlyRootFilesystem: false

service:
type: LoadBalancer
port: 80

ingress:
enabled: true
annotations: {}
hosts:
- host: "owncloud.chart.example"
paths: ["/*"]
Expand All @@ -66,10 +68,10 @@ ingress:
resources:
limits:
cpu: 100m
memory: 128Mi
memory: 512Mi
requests:
cpu: 100m
memory: 128Mi
memory: 512Mi

autoscaling:
enabled: false
Expand Down
42 changes: 15 additions & 27 deletions charts/owncloud/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,19 @@ externalDatabase:
persistence:
enabled: true
owncloud:
accessMode: ReadWriteOnce
size: 8Gi
accessMode:
- ReadWriteOnce
size: 20Gi
nfs: {}

redis:
enabled: false

image:
repository: docker.io/owncloud/server
pullPolicy: IfNotPresent
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: 10.10
tag: 10.11

imagePullSecrets: []
nameOverride: ""
Expand All @@ -49,25 +50,17 @@ serviceAccount:
podAnnotations: {}

podSecurityContext: {}
# fsGroup: 2000

securityContext: {}
# capabilities:
# drop:
# - ALL
# readOnlyRootFilesystem: true
# runAsNonRoot: true
# runAsUser: 1000
securityContext:
readOnlyRootFilesystem: false

service:
type: LoadBalancer
port: 80

ingress:
enabled: true
annotations:
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
annotations: {}
hosts:
- host: "owncloud.chart.example"
paths: ["/*"]
Expand All @@ -77,24 +70,19 @@ ingress:
- "owncloud.chart.example"
secretName: owncloud

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
resources:
limits:
cpu: 100m
memory: 512Mi
requests:
cpu: 100m
memory: 512Mi

autoscaling:
enabled: false
minReplicas: 1
maxReplicas: 100
targetCPUUtilizationPercentage: 80
# targetMemoryUtilizationPercentage: 80

nodeSelector: {}

Expand Down

0 comments on commit 68c4461

Please sign in to comment.