diff --git a/deploy/asapo_helm_chart/asapo/templates/authorizer-deployment.yaml b/deploy/asapo_helm_chart/asapo/templates/authorizer-deployment.yaml index 5d10a256e51adb58a5e78e030d77be6839094ead..2d6afedcbd95a95e98c142d9c17ff2b0ce08dd5e 100644 --- a/deploy/asapo_helm_chart/asapo/templates/authorizer-deployment.yaml +++ b/deploy/asapo_helm_chart/asapo/templates/authorizer-deployment.yaml @@ -25,13 +25,25 @@ spec: name: authorizer-config - secret: name: auth-secret + - name: shared-volume-offline + persistentVolumeClaim: + claimName: asapo-offline-pv + - name: shared-volume-online + persistentVolumeClaim: + claimName: asapo-online-pv containers: - name: authorizer - image: "yakser/asapo-authorizer-dev:develop.19.09-210-gd2bfa78" + image: "yakser/asapo-authorizer-dev:{{ .Values.common.asapoVersionTag }}" command: ["/asapo-authorizer"] args: ["-config", "/etc/authorizer/authorizer.json"] ports: - containerPort: 5007 volumeMounts: - - name: all-in-one - mountPath: "/etc/authorizer" + - mountPath: "/etc/authorizer" + name: all-in-one + - mountPath: {{ .Values.common.offlineDir }} + name: shared-volume-offline + - mountPath: {{ .Values.common.onlineDir }} + name: shared-volume-online + + diff --git a/deploy/asapo_helm_chart/asapo/templates/authorizer-ingress.yaml b/deploy/asapo_helm_chart/asapo/templates/authorizer-ingress.yaml index 05ab95cee6cda1198473465f69f26624c90fe325..e4bccfc531fc173b69b6c9f979ec747ff45a02fd 100644 --- a/deploy/asapo_helm_chart/asapo/templates/authorizer-ingress.yaml +++ b/deploy/asapo_helm_chart/asapo/templates/authorizer-ingress.yaml @@ -11,7 +11,7 @@ spec: - host: "*.desy.de" http: paths: - - path: /authorizer(/|$)(.*) + - path: /{{ .Release.Namespace }}/authorizer(/|$)(.*) backend: serviceName: authorizer servicePort: 5007 diff --git a/deploy/asapo_helm_chart/asapo/templates/storage.yaml b/deploy/asapo_helm_chart/asapo/templates/storage.yaml new file mode 100644 index 0000000000000000000000000000000000000000..391c2b4e942d0fc0d733abf48345aa2c032db0f8 --- /dev/null +++ b/deploy/asapo_helm_chart/asapo/templates/storage.yaml @@ -0,0 +1,23 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: asapo-offline-pv +spec: + storageClassName: nfs-storage + accessModes: + - ReadWriteMany + resources: + requests: + storage: 5Gi +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: asapo-online-pv +spec: + storageClassName: nfs-storage + accessModes: + - ReadWriteMany + resources: + requests: + storage: 5Gi \ No newline at end of file diff --git a/deploy/asapo_helm_chart/asapo/values.yaml b/deploy/asapo_helm_chart/asapo/values.yaml index 93881838d848daf35cc7046354ac28a3b98cb64f..acf26a0b2711b50b0b42c46fec8f7debe372d015 100644 --- a/deploy/asapo_helm_chart/asapo/values.yaml +++ b/deploy/asapo_helm_chart/asapo/values.yaml @@ -2,6 +2,7 @@ authorizer: replicaCount: 1 common: - authSecret: "blabla" - offlineDir: "/test_offline1" + authSecret: "12ljzgneasfd" + offlineDir: "/test_offline" onlineDir: "/test_online" + asapoVersionTag: "develop.20.03-10-g06dc0be" \ No newline at end of file