Skip to content

Commit

Permalink
fix: fix owncloud volume object (#15)
Browse files Browse the repository at this point in the history
  • Loading branch information
xoxys authored Oct 5, 2022
1 parent 79687b7 commit c4981c0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 70 deletions.
4 changes: 2 additions & 2 deletions .drone.star
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def kubernetes(ctx, config):
"name": "helm-template",
"image": "owncloudci/alpine",
"commands": [
"helm template charts/owncloud -f ci/ci-values.yaml > ci/owncloud-ci-templated.yaml",
"helm template charts/owncloud --values ci/ci-values.yaml > ci/owncloud-ci-templated.yaml",
],
"depends_on": ["helm-lint"],
},
Expand Down Expand Up @@ -166,7 +166,7 @@ def install(ctx):
"image": "owncloudci/alpine",
"commands": [
"export KUBECONFIG=kubeconfig-$${DRONE_BUILD_NUMBER}.yaml",
"helm install -f ci/ci-values.yaml --atomic --timeout 5m0s owncloud charts/owncloud/",
"helm install --values ci/ci-values.yaml --atomic --timeout 5m0s owncloud charts/owncloud/",
],
}]

Expand Down
4 changes: 2 additions & 2 deletions charts/owncloud/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -434,9 +434,9 @@ spec:
{{- toYaml .Values.resources | nindent 12 }}
volumeMounts:
- name: owncloud-data
mountPath: {{ .Values.owncloud.volume_root }}
mountPath: {{ .Values.owncloud.volume.root }}
- name: config-volume
mountPath: {{ .Values.owncloud.volume_config }}/configMap
mountPath: {{ .Values.owncloud.volume.config }}/configMap
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
Expand Down
66 changes: 0 additions & 66 deletions ci/ci-values.yaml
Original file line number Diff line number Diff line change
@@ -1,67 +1,11 @@
---
image:
repository: docker.io/owncloud/server
tag: ""
sha: ""
pullPolicy: IfNotPresent

imagePullSecrets: {}

nameOverride: ""
fullnameOverride: ""

owncloud:
domain: owncloud.chart.example
username: owncloud
password: owncloud
volume_apps: /mnt/data/apps
volume_config: /mnt/data/config
volume_files: /mnt/data/files
volume_root: /mnt/data
configExtra: {}

mariadb:
enabled: false

redis:
enabled: false

externalDatabase:
type: ""
host: ""
port: 3306
name: owncloud
user: owncloud
password: owncloud

persistence:
enabled: false

replicas: 1

serviceAccount:
create: true
annotations: {}
name: ""

podAnnotations: {}

podSecurityContext: {}

securityContext:
readOnlyRootFilesystem: false

service:
type: NodePort
port: 8080

ingress:
enabled: false
ingressClassName: ""
annotations: {}
labels: {}
tls: []

initResources:
limits:
cpu: 100m
Expand All @@ -77,13 +21,3 @@ resources:
requests:
cpu: 100m
memory: 512Mi

autoscaling:
enabled: false
minReplicas: 1
maxReplicas: 10
metrics: []

nodeSelector: {}
affinity: {}
tolerations: []

0 comments on commit c4981c0

Please sign in to comment.