diff --git a/datadog-values.yaml b/datadog-values.yaml index 4548ae9..349ae84 100644 --- a/datadog-values.yaml +++ b/datadog-values.yaml @@ -178,7 +178,7 @@ datadog: apm: # datadog.apm.enabled -- Enable this to enable APM and tracing, on port 8126 ## ref: https://github.com/DataDog/docker-dd-agent#tracing-from-the-host - portEnabled: false + portEnabled: true socketEnabled: true # datadog.apm.port -- Override the trace Agent port @@ -206,9 +206,9 @@ datadog: # datadog.env -- Set environment variables for all Agents ## The Datadog Agent supports many environment variables. ## ref: https://docs.datadoghq.com/agent/docker/?tab=standard#environment-variables - env: [] - # - name: - # value: + env: + - name: DD_KUBELET_TLS_VERIFY + value: "false" # datadog.confd -- Provide additional check configurations (static and Autodiscovery) ## Each key becomes a file in /conf.d @@ -861,7 +861,7 @@ agents: # # Enable APM by setting the DD_APM_ENABLED envvar to true, or override this configuration apm_config: - enabled: false + enabled: true apm_non_local_traffic: true # # Enable java cgroup handling. Only one of those options should be enabled, # # depending on the agent version you are using along that chart. @@ -1002,9 +1002,9 @@ clusterChecksRunner: # clusterChecksRunner.env -- Environment variables specific to Cluster Checks Runner ## ref: https://github.com/DataDog/datadog-agent/tree/master/Dockerfiles/agent#environment-variables - env: [] - # - name: - # value: + env: + - name: DD_KUBELET_TLS_VERIFY + value: "false" # clusterChecksRunner.volumes -- Specify additional volumes to mount in the cluster checks container volumes: [] diff --git a/recovery.sh b/recovery.sh index f1b7e48..388bd2c 100644 --- a/recovery.sh +++ b/recovery.sh @@ -39,7 +39,8 @@ systemctl restart docker docker system info --format '{{.CgroupDriver}}' # re init cluster -sudo kubeadm init --ignore-preflight-errors=DirAvailable--var-lib-etcd --control-plane-endpoint home.toozhao.com --pod-network-cidr=10.244.0.0/16 +sudo kubeadm init --ignore-preflight-errors=DirAvailable--var-lib-etcd --control-plane-endpoint 192.168.1.2 \ +--pod-network-cidr=10.244.0.0/16 --v 5 yo# check logs @@ -48,8 +49,14 @@ journalctl -xeu kubelet -f # install fiannel kubectl -n kube-system apply -f https://raw.githubusercontent.com/coreos/flannel/master/Documentation/kube-flannel.yml +## Add new nodes as control plane + +# first prepre certificate key, run this one the existing control plan +kubeadm init phase upload-certs --upload-certs + + # print join command - sudo kubeadm token create --print-join-command +sudo kubeadm token create --print-join-command # kubelet docker cgroupfs issue @@ -58,11 +65,6 @@ vim /etc/systemd/system/kubelet.service.d/10-kubeadm.conf # update KUBELET_CGROUP_ARGS=--cgroup-driver=systemd to KUBELET_CGROUP_ARGS=--cgroup-driver=cgroupfs -## Add new nodes as control plane - -# first prepre certificate key, run this one the existing control plan -kubeadm init phase upload-certs --upload-certs - # run the following the node to be added kubeadm join 192.168.1.2:6443 --token xxx --discovery-token-ca-cert-hash sha256:xxx --control-plane --certificate-key xxx