Commit 34743bdd authored by Tigran Mkrtchyan's avatar Tigran Mkrtchyan
Browse files

dcache: use rpm based image

parent 87547a35
Pipeline #29837 failed with stages
in 6 minutes and 45 seconds
......@@ -34,12 +34,56 @@ spec:
apiVersion: v1
kind: Service
metadata:
name: dcache-pool-svc
name: dcache-pool-a-svc
labels:
app: dcache-pool
app: dcache-pool-a
spec:
selector:
app: dcache-pool
app: dcache-pool-a
ports:
# movers
- name: nfs-mover
port: 32049
targetPort: 32049
- name: xroot-mover
port: 31094
targetPort: 31094
- name: http-mover
port: 38080
targetPort: 38080
---
apiVersion: v1
kind: Service
metadata:
name: dcache-pool-b-svc
labels:
app: dcache-pool-b
spec:
selector:
app: dcache-pool-b
ports:
# movers
- name: nfs-mover
port: 32049
targetPort: 32049
- name: xroot-mover
port: 31094
targetPort: 31094
- name: http-mover
port: 38080
targetPort: 38080
---
apiVersion: v1
kind: Service
metadata:
name: dcache-pool-c-svc
labels:
app: dcache-pool-c
spec:
selector:
app: dcache-pool-c
ports:
# movers
- name: nfs-mover
......@@ -71,6 +115,8 @@ data:
chimerashell.db.password = ${chimera.db.password}
chimerashell.db.name = ${chimera.db.name}
dcache.java.options.extra=-Dorg.dcache.net.localaddresses=dcache-door-svc
[core]
[core/poolmanager]
......@@ -86,7 +132,7 @@ data:
nfs.domain=dcache.org
nfs.enable.portmap=false
nfs.namespace-cache.size=8192
nfs.export.file=${dcache.home}/etc/exports
nfs.export.file=/etc/dcache/exports
[core/gplazma]
......@@ -107,17 +153,55 @@ data:
frontend.authn.protocol=http
frontend.authz.anonymous-operations=FULL
dcache-k8s-pool: |-
dcache-k8s-pool-A: |-
dcache.broker.scheme = satellite
pool.tags=hostname=${host.name}
pool.mover.xrootd.security.tls.mode=OFF
dcache.java.options.extra=-Dorg.dcache.net.localaddresses=dcache-pool-a-svc
[pool]
[${host.name}]
[pool/pool]
[${host.name}/pool]
pool.name=pool-A
pool.path=/pool
pool.path=/mnt
pool.mover.nfs.port.min=32049
pool.mover.nfs.port.max=32049
pool.mover.xrootd.port.min=31094
pool.mover.xrootd.port.max=31094
pool.mover.http.port.min=38080
pool.mover.http.port.max=38080
dcache-k8s-pool-B: |-
dcache.broker.scheme = satellite
pool.tags=hostname=${host.name}
pool.mover.xrootd.security.tls.mode=OFF
dcache.java.options.extra=-Dorg.dcache.net.localaddresses=dcache-pool-b-svc
[${host.name}]
[${host.name}/pool]
pool.name=pool-B
pool.path=/mnt
pool.mover.nfs.port.min=32049
pool.mover.nfs.port.max=32049
pool.mover.xrootd.port.min=31094
pool.mover.xrootd.port.max=31094
pool.mover.http.port.min=38080
pool.mover.http.port.max=38080
dcache-k8s-pool-C: |-
dcache.broker.scheme = satellite
pool.tags=hostname=${host.name}
pool.mover.xrootd.security.tls.mode=OFF
dcache.java.options.extra=-Dorg.dcache.net.localaddresses=dcache-pool-c-svc
[${host.name}]
[${host.name}/pool]
pool.name=pool-C
pool.path=/mnt
pool.mover.nfs.port.min=32049
pool.mover.nfs.port.max=32049
pool.mover.xrootd.port.min=31094
......@@ -132,14 +216,19 @@ data:
dcache.kafka.bootstrap-servers=kafka-svc:9092
dcache.enable.kafka = true
dcache.layout=dcache-k8s
dcache.authn.vomsdir=/mnt
webdav.redirect.allow-https=false
pool.enable.encrypted-transfers=false
00-init.sh: |-
/opt/dcache/bin/dcache database update
/opt/dcache/bin/chimera mkdir /testbase || true
/opt/dcache/bin/chimera chmod 0777 /testbase || true
/opt/dcache/bin/chimera mkdir /data || true
/opt/dcache/bin/chimera chmod 0777 /data || true
/usr/bin/dcache database update
/usr/bin/chimera mkdir /testbase || true
/usr/bin/chimera chmod 0777 /testbase || true
/usr/bin/chimera mkdir /data || true
/usr/bin/chimera chmod 0777 /data || true
export: |-
/data *(rw,no_root_squash)
---
#
......@@ -148,42 +237,32 @@ data:
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: dcache-pool
name: dcache-pool-a
spec:
selector:
matchLabels:
app: dcache-pool
app: dcache-pool-a
replicas: 1
serviceName: dcache-pool-service
template:
metadata:
labels:
app: dcache-pool
app: dcache-pool-a
spec:
containers:
- name: dcache-pool
image: dcache/dcache:8.1.0a
command: ["/run.sh", "pool"]
image: dcache/dcache-test:8.1a
command: ["/run.sh", "dcache-pool-svc-A"]
env:
- name: JAVA_ARGS
value: -Dorg.dcache.net.localaddresses=dcache-pool-svc
readinessProbe:
tcpSocket:
port: 32049
initialDelaySeconds: 10
timeoutSeconds: 5
livenessProbe:
tcpSocket:
port: 32049
initialDelaySeconds: 10
timeoutSeconds: 5
- name: AUTOCA_URL
value: https://ci.dcache.org:8083/
volumeMounts:
- name: dcache-config
mountPath: /opt/dcache/etc/dcache.conf
mountPath: /etc/dcache/dcache.conf
subPath: dcache.conf
readOnly: true
- name: dcache-layout
mountPath: /opt/dcache/etc/layouts/dcache-k8s.conf
mountPath: /etc/dcache/layouts/dcache-k8s.conf
subPath: dcache-k8s.conf
readOnly: true
volumes:
......@@ -197,7 +276,105 @@ spec:
configMap:
name: dcache-k8s-config
items:
- key: "dcache-k8s-pool"
- key: "dcache-k8s-pool-A"
path: "dcache-k8s.conf"
---
#
# dCache containers
#
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: dcache-pool-b
spec:
selector:
matchLabels:
app: dcache-pool-b
replicas: 1
serviceName: dcache-pool-service
template:
metadata:
labels:
app: dcache-pool-b
spec:
containers:
- name: dcache-pool
image: dcache/dcache-test:8.1a
command: ["/run.sh", "dcache-pool-svc-B"]
env:
- name: AUTOCA_URL
value: https://ci.dcache.org:8083/
volumeMounts:
- name: dcache-config
mountPath: /etc/dcache/dcache.conf
subPath: dcache.conf
readOnly: true
- name: dcache-layout
mountPath: /etc/dcache/layouts/dcache-k8s.conf
subPath: dcache-k8s.conf
readOnly: true
volumes:
- name: dcache-config
configMap:
name: dcache-k8s-config
items:
- key: "dcache.conf"
path: "dcache.conf"
- name: dcache-layout
configMap:
name: dcache-k8s-config
items:
- key: "dcache-k8s-pool-B"
path: "dcache-k8s.conf"
---
#
# dCache containers
#
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: dcache-pool-c
spec:
selector:
matchLabels:
app: dcache-pool-c
replicas: 1
serviceName: dcache-pool-service
template:
metadata:
labels:
app: dcache-pool-c
spec:
containers:
- name: dcache-pool
image: dcache/dcache-test:8.1b
command: ["/run.sh", "dcache-pool-svc-C"]
env:
- name: AUTOCA_URL
value: https://ci.dcache.org:8083/
volumeMounts:
- name: dcache-config
mountPath: /etc/dcache/dcache.conf
subPath: dcache.conf
readOnly: true
- name: dcache-layout
mountPath: /etc/dcache/layouts/dcache-k8s.conf
subPath: dcache-k8s.conf
readOnly: true
volumes:
- name: dcache-config
configMap:
name: dcache-k8s-config
items:
- key: "dcache.conf"
path: "dcache.conf"
- name: dcache-layout
configMap:
name: dcache-k8s-config
items:
- key: "dcache-k8s-pool-C"
path: "dcache-k8s.conf"
---
......@@ -221,11 +398,11 @@ spec:
spec:
containers:
- name: dcache-door
image: dcache/dcache:8.1.0a
command: ["/run.sh", "core"]
image: dcache/dcache-test:8.1b
command: ["/run.sh", "dcache-door-svc"]
env:
- name: JAVA_ARGS
value: -Dorg.dcache.net.localaddresses=dcache-door-svc
- name: AUTOCA_URL
value: https://ci.dcache.org:8083/
readinessProbe:
tcpSocket:
port: 2049
......@@ -238,17 +415,22 @@ spec:
timeoutSeconds: 5
volumeMounts:
- name: dcache-config
mountPath: /opt/dcache/etc/dcache.conf
mountPath: /etc/dcache/dcache.conf
subPath: dcache.conf
readOnly: true
- name: dcache-layout
mountPath: /opt/dcache/etc/layouts/dcache-k8s.conf
mountPath: /etc/dcache/layouts/dcache-k8s.conf
subPath: dcache-k8s.conf
readOnly: true
- name: init-scripts
mountPath: /dcache.init.d/00-init.sh
subPath: 00-init.sh
readOnly: true
- name: exports
mountPath: /etc/dcache/exports
subPath: exports
readOnly: true
volumes:
- name: dcache-config
configMap:
......@@ -268,4 +450,10 @@ spec:
items:
- key: "00-init.sh"
path: "00-init.sh"
- name: exports
configMap:
name: dcache-k8s-config
items:
- key: "export"
path: "exports"
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment