Skip to content

Pre1.3.3 #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jafar390 wants to merge 22 commits into
base: dkube-installer-1.3.4
Choose a base branch
from
Open

Pre1.3.3 #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
6e16964
logstash and filebeat changes
mak-454 Aug 19, 2019
b7bf0bb
removing tolerations
mak-454 Aug 19, 2019
06189b1
correcting command
mak-454 Aug 19, 2019
910b32c
adding config maps
mak-454 Aug 20, 2019
ef3098f
d3api worker and master
mak-454 Aug 20, 2019
439433b
watcher sidecar for master api
mak-454 Aug 20, 2019
c21e78a
separate componenets
mak-454 Aug 22, 2019
629e43c
removing dkubetools
mak-454 Aug 22, 2019
e03d61f
post request chnage
mak-454 Aug 22, 2019
b396940
build related changes
mak-454 Aug 22, 2019
0359fb7
logstash and filebeat changes
mak-454 Aug 19, 2019
765f09c
removing tolerations
mak-454 Aug 19, 2019
95e6f00
d3api worker and master
mak-454 Aug 20, 2019
7a0402f
watcher sidecar for master api
mak-454 Aug 20, 2019
4cb2001
separate componenets
mak-454 Aug 22, 2019
f14beef
removing dkubetools
mak-454 Aug 22, 2019
10780c1
post request chnage
mak-454 Aug 22, 2019
5664c4f
build related changes
mak-454 Aug 22, 2019
0eaa354
rebase conflicts
mak-454 Sep 11, 2019
92b9f0f
resolving rebase conflicts
mak-454 Sep 11, 2019
f8aca17
resolving rebase conflicts-2
mak-454 Sep 11, 2019
3c4e5eb
dkube workerpod name change
mak-454 Sep 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
263 changes: 175 additions & 88 deletions ksonnet/dkube/daemonset.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,37 @@
{
all(params):: [
$.parts(params.namespace).dkubeExt(params.tag, params.dkubeExtImage, params.dkubeDockerSecret, params.minioSecretKey, params.nfsServer),
$.parts(params.namespace).filebeat(params.tag),
$.parts(params.namespace).dkubeWorker(params.tag, params.dkubeApiServerImage, params.dkubeApiServerAddr, params.dkubeMountPath, params.dkubeApiServerAddr, params.rdmaEnabled, params.dkubeDockerSecret, params.minioSecretKey, params.nfsServer, params.dkubeRegistry, params.dkubeRegistryUname, params.dkubeRegistryPasswd, params.dkubeExtImage)
],
parts(namespace):: {
dkubeExt(tag, dkubeExtImage,dkubeDockerSecret, minioSecretKey, nfsServer):: {
"apiVersion": "extensions/v1beta1",
"kind": "DaemonSet",
"metadata": {
"labels": {
"app": "dkube-ext"
},
"name": "dkube-ext-" + tag,
"namespace": "dkube"
},
"spec": {
"imagePullSecrets": [
{
"name": dkubeDockerSecret
}
],
"selector": {
"matchLabels": {
"app": "dkube-ext"
}
},
"template": {
"metadata": {
"labels": {
"app": "dkube-ext"
}
},
"spec": {
"affinity": {
dkubeWorker(tag, apiServerImage, apiServerAddr, mountPath, dkubeApiServerAddr, isRdmaEnabled, dkubeDockerSecret, minioSecretKey, nfsServer, dkubeRegistry, dkubeRegistryUname, dkubeRegistryPasswd, dkubeExtImage):: {
local dkubeApiServerAddrArray = std.split(dkubeApiServerAddr, ":"),
local dkubeApiServerPort = std.parseInt(dkubeApiServerAddrArray[std.length(dkubeApiServerAddrArray)-1]),

"apiVersion": "extensions/v1beta1",
"kind": "DaemonSet",
"metadata": {
"labels": {
"app": "dkube-worker"
},
"name": "dkube-d3api-worker-" + tag,
"namespace": namespace,
},
"spec": {
"selector": {
"matchLabels": {
"app": "dkube-worker"
}
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"app": "dkube-worker"
}
},
"spec": {
"affinity": {
"nodeAffinity": {
"requiredDuringSchedulingIgnoredDuringExecution": {
"nodeSelectorTerms": [
Expand All @@ -48,67 +47,157 @@
}
}
},
"containers": [
{
"env": [
{
"name": "MYNODENAME",
"valueFrom": {
"fieldRef": {
"apiVersion": "v1",
"fieldPath": "spec.nodeName"
}
}
}
],
"image": dkubeExtImage,
"imagePullPolicy": "IfNotPresent",
"name": "dkube-ext",
"securityContext": {
"privileged": true
},
"ports": [
{
"containerPort": 9401,
"name": "http-metrics",
"protocol": "TCP"
}
],
"volumeMounts": [
{
"mountPath": "/usr/local/nvidia/lib64",
"name": "nvidia-lib"
}
]
}
],
"dnsConfig": {
"options": [
"containers": [
{
"name": "single-request-reopen"
"env": [
{
"name": "DKUBE_MOUNT_PATH",
"value": mountPath
},
{
"name": "DKUBE_REGISTRY",
"value": dkubeRegistry
},
{
"name": "DKUBE_REGISTRY_UNAME",
"value": dkubeRegistryUname
},
{
"name": "DKUBE_REGISTRY_PASSWD",
"value": dkubeRegistryPasswd
},
{
"name": "DKUBE_SERVICE_ACCOUNT",
"value": "dkube"
},
{
"name": "RDMA_ENABLED",
"value": std.toString(isRdmaEnabled)
},
{
"name": "NFS_SERVER",
"value": nfsServer
},
{
"name": "DKUBE_APISERVER_ROLE",
"value": "worker"
},
],
"image": apiServerImage,
"imagePullPolicy": "IfNotPresent",
"name": "dkube-d3api",
"ports": [
{
"containerPort": dkubeApiServerPort,
"name": "dkube-d3api",
"protocol": "TCP"
}
],
"resources": {},
"securityContext": {
"procMount": "Default",
"runAsUser": 0
},
"terminationMessagePath": "/dev/termination-log",
"terminationMessagePolicy": "File",
"volumeMounts": [
{
"mountPath": mountPath,
"name": "store"
},
{
"mountPath": "/var/run/docker.sock",
"name": "docker"
},
{
"mountPath": "/var/log/dkube",
"name": "dkube-logs"
}
]
},
{
"name": "timeout",
"value": "30"
"env": [
{
"name": "MYNODENAME",
"valueFrom": {
"fieldRef": {
"fieldPath": "spec.nodeName"
}
}
}
],
"image": dkubeExtImage,
"imagePullPolicy": "IfNotPresent",
"name": "dkube-ext",
"securityContext": {
"privileged": true
},
"ports": [
{
"containerPort": 9401,
"name": "http-metrics",
"protocol": "TCP"
}
],
"volumeMounts": [
{
"mountPath": "/usr/local/nvidia/lib64",
"name": "nvidia-lib"
}
]
}
],
"dnsConfig": {
"options": [
{
"name": "single-request-reopen"
},
{
"name": "timeout",
"value": "30"
}
]
},
"dnsPolicy": "ClusterFirst",
"imagePullSecrets": [
{
"name": dkubeDockerSecret
}
],
"restartPolicy": "Always",
"serviceAccount": "dkube",
"serviceAccountName": "dkube",
"volumes": [
{
"nfs": {
"server": nfsServer,
"path": "/dkube"
},
"name": "store"
},
{
"nfs": {
"path": "/dkube/system/logs/dkube",
"server": nfsServer
},
"name": "dkube-logs"
},
{
"hostPath": {
"path": "/var/run/docker.sock",
},
"name": "docker"
},
{
"hostPath": {
"path": "/usr/lib64/nvidia"
},
"name": "nvidia-lib"
}
]
},
"imagePullSecrets": [
{
"name": dkubeDockerSecret
}
],
"volumes": [
{
"hostPath": {
"path": "/usr/lib64/nvidia"
},
"name": "nvidia-lib"
}
]
}
}
}
}
},
},
},
filebeat(tag):: {
"apiVersion": "extensions/v1beta1",
Expand Down Expand Up @@ -165,8 +254,6 @@
"securityContext": {
"runAsUser": 0
},
"terminationMessagePath": "/dev/termination-log",
"terminationMessagePolicy": "File",
"volumeMounts": [
{
"mountPath": "/mnt/root",
Expand Down
Loading