diff --git a/deploy/bin/cluster_setup.sh b/deploy/bin/cluster_setup.sh index a7f35fa9..bb661a69 100755 --- a/deploy/bin/cluster_setup.sh +++ b/deploy/bin/cluster_setup.sh @@ -81,9 +81,12 @@ $K delete configmap --ignore-not-found setup-db -n ${DEPLOYMENT_NAMESPACE} $K delete configmap --ignore-not-found db-reset -n ${DEPLOYMENT_NAMESPACE} $K delete secret --ignore-not-found groundlight-api-token -n ${DEPLOYMENT_NAMESPACE} +set +x # temporarily disable command echoing to avoid printing secrets if [[ -n "${GROUNDLIGHT_API_TOKEN}" ]]; then + echo "Creating groundlight-api-token secret" $K create secret generic groundlight-api-token --from-literal=GROUNDLIGHT_API_TOKEN=${GROUNDLIGHT_API_TOKEN} -n ${DEPLOYMENT_NAMESPACE} fi +set -x # re-enable command echoing if [[ -n "${EDGE_CONFIG}" ]]; then echo "Creating config from EDGE_CONFIG env var" diff --git a/docker-compose.yml b/docker-compose.yml index 5791aca8..e6ad02d2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,16 +14,9 @@ services: soft: 65535 hard: 65535 privileged: true - # ports: - # - 6443:6443 # Kubernetes API Server - # - 80:80 # Ingress controller port 80 - # - 443:443 # Ingress controller port 443 - # - 2379:2379 # etcd client requests - # - 2380:2380 # etcd peer communication network_mode: host # https://docs.k3s.io/cli/server#cluster-options environment: - K3S_TOKEN: "mynodetoken" K3S_KUBECONFIG_OUTPUT: "/shared/kubeconfig.yaml" K3S_KUBECONFIG_MODE: "666" EXTRA_K3S_SERVER_ARGS: ""