diff --git a/master/getting-started/kubernetes/installation/hosted/calico.yaml b/master/getting-started/kubernetes/installation/hosted/calico.yaml index 7272c71a7af..f4340f1767c 100644 --- a/master/getting-started/kubernetes/installation/hosted/calico.yaml +++ b/master/getting-started/kubernetes/installation/hosted/calico.yaml @@ -118,6 +118,9 @@ spec: configMapKeyRef: name: calico-config key: calico_backend + # Cluster type to identify the deployment type + - name: CLUSTER_TYPE + value: "k8s" # Disable file logging so `kubectl logs` works. - name: CALICO_DISABLE_FILE_LOGGING value: "true" diff --git a/master/getting-started/kubernetes/installation/hosted/kubeadm/1.5/calico.yaml b/master/getting-started/kubernetes/installation/hosted/kubeadm/1.5/calico.yaml index eeb0804ddf4..dbc158a5128 100644 --- a/master/getting-started/kubernetes/installation/hosted/kubeadm/1.5/calico.yaml +++ b/master/getting-started/kubernetes/installation/hosted/kubeadm/1.5/calico.yaml @@ -156,6 +156,9 @@ spec: configMapKeyRef: name: calico-config key: calico_backend + # Cluster type to identify the deployment type + - name: CLUSTER_TYPE + value: "kubeadm" # Disable file logging so `kubectl logs` works. - name: CALICO_DISABLE_FILE_LOGGING value: "true" diff --git a/master/getting-started/kubernetes/installation/hosted/kubeadm/1.6/calico.yaml b/master/getting-started/kubernetes/installation/hosted/kubeadm/1.6/calico.yaml index b33ba74cb07..c039fee0c29 100644 --- a/master/getting-started/kubernetes/installation/hosted/kubeadm/1.6/calico.yaml +++ b/master/getting-started/kubernetes/installation/hosted/kubeadm/1.6/calico.yaml @@ -171,6 +171,9 @@ spec: configMapKeyRef: name: calico-config key: calico_backend + # Cluster type to identify the deployment type + - name: CLUSTER_TYPE + value: "kubeadm" # Disable file logging so `kubectl logs` works. - name: CALICO_DISABLE_FILE_LOGGING value: "true" diff --git a/master/getting-started/kubernetes/installation/hosted/kubernetes-datastore/calico-networking/1.5/calico.yaml b/master/getting-started/kubernetes/installation/hosted/kubernetes-datastore/calico-networking/1.5/calico.yaml index 93f66f854b0..1c320d2a292 100644 --- a/master/getting-started/kubernetes/installation/hosted/kubernetes-datastore/calico-networking/1.5/calico.yaml +++ b/master/getting-started/kubernetes/installation/hosted/kubernetes-datastore/calico-networking/1.5/calico.yaml @@ -78,6 +78,9 @@ spec: # Enable felix info logging. - name: FELIX_LOGSEVERITYSCREEN value: "info" + # Cluster type to identify the deployment type + - name: CLUSTER_TYPE + value: "k8s" # Disable file logging so `kubectl logs` works. - name: CALICO_DISABLE_FILE_LOGGING value: "true" diff --git a/master/getting-started/kubernetes/installation/hosted/kubernetes-datastore/calico-networking/1.6/calico.yaml b/master/getting-started/kubernetes/installation/hosted/kubernetes-datastore/calico-networking/1.6/calico.yaml index 1eff41a7f27..ba82747b5ca 100644 --- a/master/getting-started/kubernetes/installation/hosted/kubernetes-datastore/calico-networking/1.6/calico.yaml +++ b/master/getting-started/kubernetes/installation/hosted/kubernetes-datastore/calico-networking/1.6/calico.yaml @@ -88,6 +88,9 @@ spec: # Enable felix info logging. - name: FELIX_LOGSEVERITYSCREEN value: "info" + # Cluster type to identify the deployment type + - name: CLUSTER_TYPE + value: "k8s" # Disable file logging so `kubectl logs` works. - name: CALICO_DISABLE_FILE_LOGGING value: "true" diff --git a/master/getting-started/kubernetes/installation/hosted/kubernetes-datastore/policy-only/1.5/calico.yaml b/master/getting-started/kubernetes/installation/hosted/kubernetes-datastore/policy-only/1.5/calico.yaml index af63a8479b5..b530b027dea 100644 --- a/master/getting-started/kubernetes/installation/hosted/kubernetes-datastore/policy-only/1.5/calico.yaml +++ b/master/getting-started/kubernetes/installation/hosted/kubernetes-datastore/policy-only/1.5/calico.yaml @@ -81,6 +81,9 @@ spec: # Don't enable BGP. - name: CALICO_NETWORKING_BACKEND value: "none" + # Cluster type to identify the deployment type + - name: CLUSTER_TYPE + value: "k8s,policyonly" # Disable file logging so `kubectl logs` works. - name: CALICO_DISABLE_FILE_LOGGING value: "true" diff --git a/master/getting-started/kubernetes/installation/hosted/kubernetes-datastore/policy-only/1.6/calico.yaml b/master/getting-started/kubernetes/installation/hosted/kubernetes-datastore/policy-only/1.6/calico.yaml index 65e790ffa5a..34fca1817a5 100644 --- a/master/getting-started/kubernetes/installation/hosted/kubernetes-datastore/policy-only/1.6/calico.yaml +++ b/master/getting-started/kubernetes/installation/hosted/kubernetes-datastore/policy-only/1.6/calico.yaml @@ -91,6 +91,9 @@ spec: # Don't enable BGP. - name: CALICO_NETWORKING_BACKEND value: "none" + # Cluster type to identify the deployment type + - name: CLUSTER_TYPE + value: "k8s,policyonly" # Disable file logging so `kubectl logs` works. - name: CALICO_DISABLE_FILE_LOGGING value: "true" diff --git a/master/reference/node/configuration.md b/master/reference/node/configuration.md index a1076356b9e..5019c9144b0 100644 --- a/master/reference/node/configuration.md +++ b/master/reference/node/configuration.md @@ -31,7 +31,7 @@ The `calico/node` container is primarily configured through environment variable | CALICO_IPV4POOL_NAT_OUTGOING | Controls NAT Outgoing for the IPv4 Pool created at start up. | boolean | true | | CALICO_IPV6POOL_NAT_OUTGOING | Controls NAT Outgoing for the IPv6 Pool created at start up. | boolean | false | | CALICO_STARTUP_LOGLEVEL | The log severity above which startup calico/node logs are sent to the stdout. | string | ERROR | -| CLUSTER_TYPE | Contains comma delimited list of indicators about this cluster. Expected to contain information like hosted, services, kubeadm, tectonic, or datastore type. If using Kubernetes API as the datastore then KDD will automatically be added to this list. | string | | +| CLUSTER_TYPE | Contains comma delimited list of indicators about this cluster. Expected to contain information like hosted, services, kubeadm, tectonic, or datastore type. If using Kubernetes API as the datastore then KDD will automatically be added to this list. | k8s, policy, KDD, canal, mesos, docker, rkt, acs, acse, dcos, kubeadm, kubespray, kops, tectonic | | | ETCD_ENDPOINTS | A comma separated list of etcd endpoints (optional) | string | http://127.0.0.1:2379 | | ETCD_KEY_FILE | Path to the etcd key file, e.g. `/etc/calico/key.pem` (optional) | string | | | ETCD_CERT_FILE | Path to the etcd client cert, e.g. `/etc/calico/cert.pem` (optional) | string | |