diff --git a/portal/base/kustomization.yaml b/portal/base/kustomization.yaml index 062ca04..e7cb7f8 100644 --- a/portal/base/kustomization.yaml +++ b/portal/base/kustomization.yaml @@ -1,5 +1,4 @@ resources: -- portal-pvc.yml - portal-deployment.yml - portal-ingress.yml - portal-namespace.yml diff --git a/portal/base/portal-deployment.yml b/portal/base/portal-deployment.yml index 42386f1..6d24ea1 100644 --- a/portal/base/portal-deployment.yml +++ b/portal/base/portal-deployment.yml @@ -18,31 +18,13 @@ spec: labels: app: portal-node spec: - volumes: - - name: init-config - persistentVolumeClaim: - claimName: init-config containers: - name: portal - image: docker.sunet.se/drive/portal:0.1.0-4 + image: docker.sunet.se/drive/portal:0.1.0-5 imagePullPolicy: Always - volumeMounts: - - name: init-config - mountPath: /config - subPath: config - readOnly: true resources: {} - initContainers: - - image: docker.sunet.se/drive/portal:0.1.0-4 - name: init-config - volumeMounts: - - name: init-config - mountPath: /config - subPath: config - readOnly: false env: - name: DRIVE_DOMAIN value: "https://drive.test.sunet.se" - command: ["/bin/bash", "-c", "/app/metadata.py > /config/config.yaml"] strategy: {} status: {} diff --git a/portal/base/portal-pvc.yml b/portal/base/portal-pvc.yml deleted file mode 100644 index bcf0528..0000000 --- a/portal/base/portal-pvc.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: init-config -spec: - storageClassName: csi-sc-cinderplugin - accessModes: - - ReadWriteMany - resources: - requests: - storage: 1Gi diff --git a/portal/overlays/test/portal-deployment.yml b/portal/overlays/test/portal-deployment.yml index 6b8e33f..1d3cd0f 100644 --- a/portal/overlays/test/portal-deployment.yml +++ b/portal/overlays/test/portal-deployment.yml @@ -10,7 +10,7 @@ metadata: spec: template: spec: - initContainers: + containers: - env: - name: DRIVE_DOMAIN value: "https://drive.test.sunet.se"