diff options
| author | Kevin Wang <kevinwzf0126@gmail.com> | 2020-03-06 09:58:08 +0800 |
|---|---|---|
| committer | Kevin Wang <kevinwzf0126@gmail.com> | 2020-03-06 10:21:59 +0800 |
| commit | 84679ad5be22b543036023f3038b9731c880717a (patch) | |
| tree | ed9eecdfac6be5f3ca712501ea8cc9238843087d /build | |
| parent | fix cloudcore config (diff) | |
| download | kubeedge-84679ad5be22b543036023f3038b9731c880717a.tar.gz | |
update Dockerfile and cloudcore deployment
Signed-off-by: Kevin Wang <kevinwzf0126@gmail.com>
Diffstat (limited to 'build')
| -rw-r--r-- | build/cloud/05-configmap.yaml | 2 | ||||
| -rw-r--r-- | build/cloud/07-deployment.yaml | 12 | ||||
| -rw-r--r-- | build/cloud/Dockerfile | 4 |
3 files changed, 10 insertions, 8 deletions
diff --git a/build/cloud/05-configmap.yaml b/build/cloud/05-configmap.yaml index c9161ffe7..566396220 100644 --- a/build/cloud/05-configmap.yaml +++ b/build/cloud/05-configmap.yaml @@ -16,7 +16,7 @@ data: modules: cloudhub: nodeLimit: 10 - tlsCAFile: /etc/kubeedge/certs/rootCA.crt + tlsCAFile: /etc/kubeedge/ca/rootCA.crt tlsCertFile: /etc/kubeedge/certs/edge.crt tlsPrivateKeyFile: /etc/kubeedge/certs/edge.key unixsocket: diff --git a/build/cloud/07-deployment.yaml b/build/cloud/07-deployment.yaml index dd78c0f28..87d63be2b 100644 --- a/build/cloud/07-deployment.yaml +++ b/build/cloud/07-deployment.yaml @@ -35,10 +35,9 @@ spec: memory: 512Mi volumeMounts: - name: conf - mountPath: /etc/kubeedge/config/cloudcore.yaml - subPath: cloudcore.yaml + mountPath: /etc/kubeedge/config - name: certs - mountPath: /etc/kubeedge/certs + mountPath: /etc/kubeedge restartPolicy: Always serviceAccount: cloudcore serviceAccountName: cloudcore @@ -49,3 +48,10 @@ spec: - name: certs secret: secretName: cloudcore + items: + - key: edge.crt + path: certs/edge.crt + - key: edge.key + path: certs/edge.key + - key: rootCA.crt + path: ca/rootCA.crt diff --git a/build/cloud/Dockerfile b/build/cloud/Dockerfile index 3304213aa..1960a73b5 100644 --- a/build/cloud/Dockerfile +++ b/build/cloud/Dockerfile @@ -8,10 +8,6 @@ github.com/kubeedge/kubeedge/cloud/cmd/cloudcore FROM alpine:3.9 -ENV GOARCHAIUS_CONFIG_PATH /etc/kubeedge/cloud - -VOLUME ["/etc/kubeedge/certs", "/etc/kubeedge/cloud/conf"] - COPY --from=builder /usr/local/bin/cloudcore /usr/local/bin/cloudcore ENTRYPOINT ["cloudcore"] |