Skip to content
Snippets Groups Projects
Commit 73ee7ddc authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Deploy scripts: 

- moved creation of secrets from crdb.sh and nats.sh to tfs.sh for safety reasons
parent 5bcdcd6d
No related branches found
No related tags found
2 merge requests!54Release 2.0.0,!34Context Scalability extensions using CockroachDB + Removal of Stateful database inside Device + other
Hide whitespace changes
Inline Side-by-side
deploy/crdb.sh
+ 0
− 38
View file @ 73ee7ddc
...@@ -30,12 +30,6 @@ export CRDB_PASSWORD=${CRDB_PASSWORD:-"tfs123"} ...@@ -30,12 +30,6 @@ export CRDB_PASSWORD=${CRDB_PASSWORD:-"tfs123"}
# If not already set, set the database name to be used by Context. # If not already set, set the database name to be used by Context.
export CRDB_DATABASE=${CRDB_DATABASE:-"tfs"} export CRDB_DATABASE=${CRDB_DATABASE:-"tfs"}
# If not already set, set the name of the secret where CockroachDB data and credentials will be stored.
export CRDB_SECRET_NAME=${CRDB_SECRET_NAME:-"crdb-data"}
# If not already set, set the namespace where the secret containing CockroachDB data and credentials will be stored.
export CRDB_SECRET_NAMESPACE=${CRDB_SECRET_NAMESPACE:-"tfs"}
# If not already set, set CockroachDB installation mode. Accepted values are: 'single' and 'cluster'. # If not already set, set CockroachDB installation mode. Accepted values are: 'single' and 'cluster'.
# "YES", the database pointed by variable CRDB_NAMESPACE will be dropped while # "YES", the database pointed by variable CRDB_NAMESPACE will be dropped while
# checking/deploying CockroachDB. # checking/deploying CockroachDB.
...@@ -138,25 +132,9 @@ function crdb_deploy_single() { ...@@ -138,25 +132,9 @@ function crdb_deploy_single() {
PATCH='{"spec": {"template": {"spec": {"containers": ['${CONTAINER}']}}}}' PATCH='{"spec": {"template": {"spec": {"containers": ['${CONTAINER}']}}}}'
kubectl patch daemonset nginx-ingress-microk8s-controller --namespace ingress --patch "${PATCH}" kubectl patch daemonset nginx-ingress-microk8s-controller --namespace ingress --patch "${PATCH}"
echo echo
echo "Create secret with CockroachDB data"
kubectl create secret generic ${CRDB_SECRET_NAME} --namespace ${CRDB_SECRET_NAMESPACE} --type='Opaque' \
--from-literal=CRDB_NAMESPACE=${CRDB_NAMESPACE} \
--from-literal=CRDB_SQL_PORT=${CRDB_SQL_PORT} \
--from-literal=CRDB_GUI_PORT=${CRDB_GUI_PORT} \
--from-literal=CRDB_DATABASE=${CRDB_DATABASE} \
--from-literal=CRDB_USERNAME=${CRDB_USERNAME} \
--from-literal=CRDB_PASSWORD="'"${CRDB_PASSWORD}"'" \
--from-literal=CRDB_SSLMODE=require
kubectl get all --all-namespaces
} }
function crdb_undeploy_single() { function crdb_undeploy_single() {
echo "Delete secret with CockroachDB data"
kubectl delete secret ${CRDB_SECRET_NAME} --namespace ${CRDB_SECRET_NAMESPACE} --ignore-not-found
echo
echo "CockroachDB" echo "CockroachDB"
echo ">>> Checking if CockroachDB is deployed..." echo ">>> Checking if CockroachDB is deployed..."
if kubectl get --namespace ${CRDB_NAMESPACE} statefulset/cockroachdb &> /dev/null; then if kubectl get --namespace ${CRDB_NAMESPACE} statefulset/cockroachdb &> /dev/null; then
...@@ -307,25 +285,9 @@ function crdb_deploy_cluster() { ...@@ -307,25 +285,9 @@ function crdb_deploy_cluster() {
PATCH='{"spec": {"template": {"spec": {"containers": ['${CONTAINER}']}}}}' PATCH='{"spec": {"template": {"spec": {"containers": ['${CONTAINER}']}}}}'
kubectl patch daemonset nginx-ingress-microk8s-controller --namespace ingress --patch "${PATCH}" kubectl patch daemonset nginx-ingress-microk8s-controller --namespace ingress --patch "${PATCH}"
echo echo
echo "Create secret with CockroachDB data"
kubectl create secret generic ${CRDB_SECRET_NAME} --namespace ${CRDB_SECRET_NAMESPACE} --type='Opaque' \
--from-literal=CRDB_NAMESPACE=${CRDB_NAMESPACE} \
--from-literal=CRDB_SQL_PORT=${CRDB_SQL_PORT} \
--from-literal=CRDB_GUI_PORT=${CRDB_GUI_PORT} \
--from-literal=CRDB_DATABASE=${CRDB_DATABASE} \
--from-literal=CRDB_USERNAME=${CRDB_USERNAME} \
--from-literal=CRDB_PASSWORD="'"${CRDB_PASSWORD}"'" \
--from-literal=CRDB_SSLMODE=require
kubectl get all --all-namespaces
} }
function crdb_undeploy_cluster() { function crdb_undeploy_cluster() {
echo "Delete secret with CockroachDB data"
kubectl delete secret ${CRDB_SECRET_NAME} --namespace ${CRDB_SECRET_NAMESPACE} --ignore-not-found
echo
echo "CockroachDB Client" echo "CockroachDB Client"
echo ">>> Checking if CockroachDB Client is deployed..." echo ">>> Checking if CockroachDB Client is deployed..."
if kubectl get --namespace ${CRDB_NAMESPACE} pod/cockroachdb-client-secure &> /dev/null; then if kubectl get --namespace ${CRDB_NAMESPACE} pod/cockroachdb-client-secure &> /dev/null; then
......
deploy/nats.sh
+ 2
− 18
View file @ 73ee7ddc
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
######################################################################################################################## ########################################################################################################################
# Read deployment settings # Read deployment settings
######################################################################################################################## ########################################################################################################################
...@@ -20,17 +21,12 @@ ...@@ -20,17 +21,12 @@
# If not already set, set the namespace where NATS will be deployed. # If not already set, set the namespace where NATS will be deployed.
export NATS_NAMESPACE=${NATS_NAMESPACE:-"nats"} export NATS_NAMESPACE=${NATS_NAMESPACE:-"nats"}
# If not already set, set the name of the secret where NATS data and credentials will be stored.
export NATS_SECRET_NAME=${NATS_SECRET_NAME:-"nats-data"}
# If not already set, set the namespace where the secret containing NATS data and credentials will be stored.
export NATS_SECRET_NAMESPACE=${NATS_SECRET_NAMESPACE:-"tfs"}
# If not already set, disable flag for re-deploying NATS from scratch. # If not already set, disable flag for re-deploying NATS from scratch.
# WARNING: ACTIVATING THIS FLAG IMPLIES LOOSING THE MESSAGE BROKER INFORMATION! # WARNING: ACTIVATING THIS FLAG IMPLIES LOOSING THE MESSAGE BROKER INFORMATION!
# If NATS_REDEPLOY is "YES", the message broker will be dropped while checking/deploying NATS. # If NATS_REDEPLOY is "YES", the message broker will be dropped while checking/deploying NATS.
export NATS_REDEPLOY=${NATS_REDEPLOY:-""} export NATS_REDEPLOY=${NATS_REDEPLOY:-""}
######################################################################################################################## ########################################################################################################################
# Automated steps start here # Automated steps start here
######################################################################################################################## ########################################################################################################################
...@@ -106,21 +102,9 @@ function nats_deploy_single() { ...@@ -106,21 +102,9 @@ function nats_deploy_single() {
PATCH='{"spec": {"template": {"spec": {"containers": ['${CONTAINER}']}}}}' PATCH='{"spec": {"template": {"spec": {"containers": ['${CONTAINER}']}}}}'
kubectl patch daemonset nginx-ingress-microk8s-controller --namespace ingress --patch "${PATCH}" kubectl patch daemonset nginx-ingress-microk8s-controller --namespace ingress --patch "${PATCH}"
echo echo
echo "Create secret with NATS data"
kubectl create secret generic ${NATS_SECRET_NAME} --namespace ${NATS_SECRET_NAMESPACE} --type='Opaque' \
--from-literal=NATS_NAMESPACE=${NATS_NAMESPACE} \
--from-literal=NATS_CLIENT_PORT=${NATS_CLIENT_PORT} \
--from-literal=NATS_GUI_PORT=${NATS_GUI_PORT}
kubectl get all --all-namespaces
} }
function nats_undeploy_single() { function nats_undeploy_single() {
echo "Delete secret with NATS data"
kubectl delete secret ${NATS_SECRET_NAME} --namespace ${NATS_SECRET_NAMESPACE} --ignore-not-found
echo
echo "NATS" echo "NATS"
echo ">>> Checking if NATS is deployed..." echo ">>> Checking if NATS is deployed..."
if kubectl get --namespace ${NATS_NAMESPACE} statefulset/nats &> /dev/null; then if kubectl get --namespace ${NATS_NAMESPACE} statefulset/nats &> /dev/null; then
......
deploy/tfs.sh
+ 34
− 0
View file @ 73ee7ddc
...@@ -42,6 +42,22 @@ export TFS_GRAFANA_PASSWORD=${TFS_GRAFANA_PASSWORD:-"admin123+"} ...@@ -42,6 +42,22 @@ export TFS_GRAFANA_PASSWORD=${TFS_GRAFANA_PASSWORD:-"admin123+"}
# If TFS_SKIP_BUILD is "YES", the containers are not rebuilt-retagged-repushed and existing ones are used. # If TFS_SKIP_BUILD is "YES", the containers are not rebuilt-retagged-repushed and existing ones are used.
export TFS_SKIP_BUILD=${TFS_SKIP_BUILD:-""} export TFS_SKIP_BUILD=${TFS_SKIP_BUILD:-""}
# If not already set, set the namespace where CockroackDB will be deployed.
export CRDB_NAMESPACE=${CRDB_NAMESPACE:-"crdb"}
# If not already set, set the database username to be used by Context.
export CRDB_USERNAME=${CRDB_USERNAME:-"tfs"}
# If not already set, set the database user's password to be used by Context.
export CRDB_PASSWORD=${CRDB_PASSWORD:-"tfs123"}
# If not already set, set the database name to be used by Context.
export CRDB_DATABASE=${CRDB_DATABASE:-"tfs"}
# If not already set, set the namespace where NATS will be deployed.
export NATS_NAMESPACE=${NATS_NAMESPACE:-"nats"}
######################################################################################################################## ########################################################################################################################
# Automated steps start here # Automated steps start here
######################################################################################################################## ########################################################################################################################
...@@ -61,6 +77,24 @@ kubectl delete namespace $TFS_K8S_NAMESPACE ...@@ -61,6 +77,24 @@ kubectl delete namespace $TFS_K8S_NAMESPACE
kubectl create namespace $TFS_K8S_NAMESPACE kubectl create namespace $TFS_K8S_NAMESPACE
printf "\n" printf "\n"
echo "Create secret with CockroachDB data"
CRDB_SQL_PORT=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.ports[?(@.name=="sql")].port}')
kubectl create secret generic crdb-data --namespace ${TFS_K8S_NAMESPACE} --type='Opaque' \
--from-literal=CRDB_NAMESPACE=${CRDB_NAMESPACE} \
--from-literal=CRDB_SQL_PORT=${CRDB_SQL_PORT} \
--from-literal=CRDB_DATABASE=${CRDB_DATABASE} \
--from-literal=CRDB_USERNAME=${CRDB_USERNAME} \
--from-literal=CRDB_PASSWORD="'"${CRDB_PASSWORD}"'" \
--from-literal=CRDB_SSLMODE=require
printf "\n"
echo "Create secret with NATS data"
NATS_CLIENT_PORT=$(kubectl --namespace ${NATS_NAMESPACE} get service nats -o 'jsonpath={.spec.ports[?(@.name=="client")].port}')
kubectl create secret generic nats-data --namespace ${TFS_K8S_NAMESPACE} --type='Opaque' \
--from-literal=NATS_NAMESPACE=${NATS_NAMESPACE} \
--from-literal=NATS_CLIENT_PORT=${NATS_CLIENT_PORT}
printf "\n"
echo "Deploying components and collecting environment variables..." echo "Deploying components and collecting environment variables..."
ENV_VARS_SCRIPT=tfs_runtime_env_vars.sh ENV_VARS_SCRIPT=tfs_runtime_env_vars.sh
echo "# Environment variables for TeraFlowSDN deployment" > $ENV_VARS_SCRIPT echo "# Environment variables for TeraFlowSDN deployment" > $ENV_VARS_SCRIPT
......
my_deploy.sh
+ 6
− 13
View file @ 73ee7ddc
...@@ -13,6 +13,9 @@ ...@@ -13,6 +13,9 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# ----- TeraFlowSDN ------------------------------------------------------------
# Set the URL of the internal MicroK8s Docker registry where the images will be uploaded to. # Set the URL of the internal MicroK8s Docker registry where the images will be uploaded to.
export TFS_REGISTRY_IMAGES=${TFS_REGISTRY_IMAGES:-"http://localhost:32000/tfs/"} export TFS_REGISTRY_IMAGES=${TFS_REGISTRY_IMAGES:-"http://localhost:32000/tfs/"}
...@@ -34,6 +37,7 @@ export TFS_GRAFANA_PASSWORD="admin123+" ...@@ -34,6 +37,7 @@ export TFS_GRAFANA_PASSWORD="admin123+"
# Disable skip-build flag to rebuild the Docker images. # Disable skip-build flag to rebuild the Docker images.
export TFS_SKIP_BUILD="" export TFS_SKIP_BUILD=""
# ----- CockroachDB ------------------------------------------------------------
# Set the namespace where CockroackDB will be deployed. # Set the namespace where CockroackDB will be deployed.
export CRDB_NAMESPACE="crdb" export CRDB_NAMESPACE="crdb"
...@@ -46,12 +50,6 @@ export CRDB_PASSWORD="tfs123" ...@@ -46,12 +50,6 @@ export CRDB_PASSWORD="tfs123"
# Set the database name to be used by Context. # Set the database name to be used by Context.
export CRDB_DATABASE="tfs" export CRDB_DATABASE="tfs"
# Set the name of the secret where CockroachDB data and credentials will be stored.
export CRDB_SECRET_NAME="crdb-data"
# Set the namespace where the secret containing CockroachDB data and credentials will be stored.
export CRDB_SECRET_NAMESPACE=${TFS_K8S_NAMESPACE}
# Set CockroachDB installation mode to 'single'. This option is convenient for development and testing. # Set CockroachDB installation mode to 'single'. This option is convenient for development and testing.
# See ./deploy/all.sh or ./deploy/crdb.sh for additional details # See ./deploy/all.sh or ./deploy/crdb.sh for additional details
export CRDB_DEPLOY_MODE="single" export CRDB_DEPLOY_MODE="single"
...@@ -62,14 +60,9 @@ export CRDB_DROP_DATABASE_IF_EXISTS="" ...@@ -62,14 +60,9 @@ export CRDB_DROP_DATABASE_IF_EXISTS=""
# Disable flag for re-deploying CockroachDB from scratch. # Disable flag for re-deploying CockroachDB from scratch.
export CRDB_REDEPLOY="" export CRDB_REDEPLOY=""
# ----- NATS -------------------------------------------------------------------
# Set the namespace where NATS will be deployed. # Set the namespace where NATS will be deployed.
export NATS_NAMESPACE="nats" export NATS_NAMESPACE="nats"
# Set the name of the secret where NATS data and credentials will be stored.
export NATS_SECRET_NAME="nats-data"
# Set the namespace where the secret containing NATS data and credentials will be stored.
export NATS_SECRET_NAMESPACE=${TFS_K8S_NAMESPACE}
# Disable flag for re-deploying NATS from scratch. # Disable flag for re-deploying NATS from scratch.
export NATS_REDEPLOY=${NATS_REDEPLOY:-""} export NATS_REDEPLOY=""
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment