diff --git a/blazegraph.yaml b/blazegraph.yaml index b6a67f6a0b4feacd5c29a59b46453d402b8a3dca..5dc10f892c14d9da2f21f9f8371bcf8ad318d172 100644 --- a/blazegraph.yaml +++ b/blazegraph.yaml @@ -25,6 +25,7 @@ metadata: tier: blazegrah name: blazegraph-claim0 spec: + storageClassName: standard accessModes: - ReadWriteOnce resources: @@ -62,7 +63,7 @@ spec: - containerPort: 8080 resources: {} volumeMounts: - - mountPath: /blazegraph-data + - mountPath: /data/blazegraph-data name: blazegraph-claim0 restartPolicy: Always serviceAccountName: "" diff --git a/elasticsearch.yaml b/elasticsearch.yaml index d4aaea0a60365f3a9565f394f138842a67410459..55dc54dab9ec19b074356d1e82ba2fb929a81f7e 100644 --- a/elasticsearch.yaml +++ b/elasticsearch.yaml @@ -24,7 +24,9 @@ metadata: tier: elasticsearch name: elasticsearch-loadbalancer spec: - type: LoadBalancer + type: NodePort + externalIPs: + - 10.6.10.9 selector: app: fdp tier: elasticsearch @@ -64,6 +66,7 @@ metadata: tier: elasticsearch name: elasticsearch-claim0 spec: + storageClassName: standard accessModes: - ReadWriteOnce resources: diff --git a/ingress.yml b/ingress.yml index cb3b443fb381bc872bc6753fde1761e2737d122d..b3dd24f104bf0cca6ea6e5c3c2f35fbc473f8d7b 100644 --- a/ingress.yml +++ b/ingress.yml @@ -1,7 +1,7 @@ -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: lb-ingress-ctl + name: ingress-ffds annotations: ingress.kubernetes.io/rewrite-target: / spec: @@ -10,19 +10,31 @@ spec: http: paths: - path: /api + pathType: Prefix backend: - serviceName: ffds-register-api - servicePort: 80 + service: + name: ffds-register-api + port: + number: 80 - path: / + pathType: Prefix backend: - serviceName: fdp-api - servicePort: 80 + service: + name: fdp-api + port: + number: 80 - path: /app + pathType: Prefix backend: - serviceName: fdp-client - servicePort: 80 + service: + name: fdp-client + port: + number: 80 - path: /es + pathType: Prefix backend: - serviceName: elasticsearch-loadbalancer - servicePort: 9200 + service: + name: elasticsearch-loadbalancer + port: + number: 9200 diff --git a/mongo.yaml b/mongo.yaml index 081d2e79055e0cf11036fd3fd7602ec250ebb3ca..33231ef0f1742b9a015af09b9ddf345324cdedf7 100644 --- a/mongo.yaml +++ b/mongo.yaml @@ -24,6 +24,7 @@ metadata: tier: mongo name: mongo-claim0 spec: + storageClassName: standard accessModes: - ReadWriteOnce resources: diff --git a/start_cots.sh b/start_cots.sh index e927729a437aa1532d75306589eb4480775d34e7..743cc400206c93cc0e20f81e256a0b2895d6b7b0 100755 --- a/start_cots.sh +++ b/start_cots.sh @@ -22,7 +22,8 @@ # THE SOFTWARE. # -kubectl apply -f ingress.yml +kubectl apply -f storageclass.yml +kubectl apply -f volumepv.yml kubectl apply -f mongo.yaml kubectl apply -f blazegraph.yaml kubectl apply -f elasticsearch.yaml diff --git a/stop_cots.sh b/stop_cots.sh index e919c0e642a3744feca0b9b1043a8f75b9dad14e..379cccdb144f8284dc29263a88949d57768d4f78 100755 --- a/stop_cots.sh +++ b/stop_cots.sh @@ -23,8 +23,8 @@ # - - +kubectl delete -f storageclass.yml +kubectl delete -f volumepv.yml kubectl delete -f mongo.yaml kubectl delete -f blazegraph.yaml kubectl delete -f elasticsearch.yaml diff --git a/storageclass.yml b/storageclass.yml new file mode 100644 index 0000000000000000000000000000000000000000..f308c8d33937670190cccc3bd2cc4de78b12f1c5 --- /dev/null +++ b/storageclass.yml @@ -0,0 +1,7 @@ +apiVersion: storage.k8s.io/v1 +kind: StorageClass +metadata: + name: standard +provisioner: kubernetes.io/no-provisioner +volumeBindingMode: WaitForFirstConsumer + diff --git a/volumepv.yml b/volumepv.yml new file mode 100644 index 0000000000000000000000000000000000000000..01fbd9fe448e8fc2340ebd4d3c29276a2e82441a --- /dev/null +++ b/volumepv.yml @@ -0,0 +1,74 @@ +apiVersion: v1 +kind: PersistentVolume +metadata: + name: data-pv1 +spec: + capacity: + storage: 1Gi + accessModes: + - ReadWriteOnce + persistentVolumeReclaimPolicy: Retain + volumeMode: Filesystem + storageClassName: standard + local: + path: /data/1 + nodeAffinity: + required: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/hostname + operator: In + values: + - sandbox9.cines.fr + + +--- + +apiVersion: v1 +kind: PersistentVolume +metadata: + name: data-pv2 +spec: + capacity: + storage: 1Gi + accessModes: + - ReadWriteOnce + persistentVolumeReclaimPolicy: Retain + volumeMode: Filesystem + storageClassName: standard + local: + path: /data/2 + nodeAffinity: + required: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/hostname + operator: In + values: + - sandbox9.cines.fr + +--- + + +apiVersion: v1 +kind: PersistentVolume +metadata: + name: data-pv3 +spec: + capacity: + storage: 1Gi + accessModes: + - ReadWriteOnce + persistentVolumeReclaimPolicy: Retain + volumeMode: Filesystem + storageClassName: standard + local: + path: /data/3 + nodeAffinity: + required: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/hostname + operator: In + values: + - sandbox9.cines.fr