Mirroristas/bigchaindb
2
0
Fork 0
mirror of https://github.com/bigchaindb/bigchaindb.git synced 2024-10-13 13:34:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Problem: Nginx deployment is broken for k8s (#2287)

Browse Source
This commit is contained in:
Ahmed Muawia Khan 2018-05-15 10:59:35 +02:00 committed by vrde
parent 2c171312cf
commit 48cabdd6b9
4 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
k8s/nginx-http/nginx-http-dep.yaml
View File

@ -30,6 +30,11 @@ spec:
configMapKeyRef: configMapKeyRef:
name: vars name: vars
key: node-dns-server-ip key: node-dns-server-ip
- name: MONGODB_FRONTEND_PORT
valueFrom:
configMapKeyRef:
name: vars
key: mongodb-backend-port
- name: MONGODB_BACKEND_HOST - name: MONGODB_BACKEND_HOST
valueFrom: valueFrom:
configMapKeyRef: configMapKeyRef:

3
k8s/scripts/functions
View File

@ -236,6 +236,7 @@ function generate_config_map(){
bdb_instance_name="${9}" bdb_instance_name="${9}"
dns_resolver_k8s="${10}" dns_resolver_k8s="${10}"
auth_mode="${11}" auth_mode="${11}"
node_frontend_port="${12}"
cat > config-map.yaml << EOF cat > config-map.yaml << EOF
apiVersion: v1 apiVersion: v1
@ -249,7 +250,7 @@ data:
# node-frontend-port is the port number on which this node's services # node-frontend-port is the port number on which this node's services
# are available to external clients. # are available to external clients.
node-frontend-port: "443" node-frontend-port: "{node_frontend_port}"
# node-health-check-port is the port number on which an external load # node-health-check-port is the port number on which an external load
# balancer can check the status/liveness of the external/public server. # balancer can check the status/liveness of the external/public server.

3
k8s/scripts/generate_configs.sh
View File

@ -16,6 +16,7 @@ CONFIGURE_CA='true'
CONFIGURE_MEMBER='true' CONFIGURE_MEMBER='true'
CONFIGURE_CLIENT='true' CONFIGURE_CLIENT='true'
SECRET_TOKEN=${SECRET_TOKEN:="secret-token"} SECRET_TOKEN=${SECRET_TOKEN:="secret-token"}
NODE_FRONTEND_PORT=${NODE_FRONTEND_PORT:="443"}
function show_help(){ function show_help(){
cat > /dev/stdout << END cat > /dev/stdout << END
@ -100,4 +101,4 @@ get_users $BASE_USERS_DIR $BASE_CA_DIR/$BASE_EASY_RSA_PATH
generate_secretes_no_threescale $BASE_K8S_DIR $SECRET_TOKEN $HTTPS_CERT_KEY_FILE_NAME $HTTPS_CERT_CHAIN_FILE_NAME $MDB_ADMIN_PASSWORD generate_secretes_no_threescale $BASE_K8S_DIR $SECRET_TOKEN $HTTPS_CERT_KEY_FILE_NAME $HTTPS_CERT_CHAIN_FILE_NAME $MDB_ADMIN_PASSWORD
generate_config_map $BASE_USERS_DIR $MDB_ADMIN_USER $NODE_FQDN $BDB_PERSISTENT_PEERS $BDB_VALIDATORS $BDB_VALIDATOR_POWERS $BDB_GENESIS_TIME \ generate_config_map $BASE_USERS_DIR $MDB_ADMIN_USER $NODE_FQDN $BDB_PERSISTENT_PEERS $BDB_VALIDATORS $BDB_VALIDATOR_POWERS $BDB_GENESIS_TIME \
$BDB_CHAIN_ID $BDB_INSTANCE_NAME $NODE_DNS_SERVER $AUTH_MODE $BDB_CHAIN_ID $BDB_INSTANCE_NAME $NODE_DNS_SERVER $AUTH_MODE $NODE_FRONTEND_PORT

22
k8s/scripts/vars
View File

@ -1,6 +1,10 @@
# DNS name of the bigchaindb node # DNS name of the bigchaindb node
NODE_FQDN="test.bigchaindb.com" NODE_FQDN="test.bigchaindb.com"
# NODE_FRONTEND_PORT is the port number on which this node's services
# are available to external clients. Default is 443(https)
NODE_FRONTEND_PORT="443"
# Authorization mode: [secret-token, threescale] # Authorization mode: [secret-token, threescale]
AUTH_MODE="secret-token" AUTH_MODE="secret-token"
@ -16,34 +20,34 @@ HTTPS_CERT_KEY_FILE_NAME="/path/to/https.key"
HTTPS_CERT_CHAIN_FILE_NAME="/path/to/https.crt" HTTPS_CERT_CHAIN_FILE_NAME="/path/to/https.crt"
# MongoDB Admin user credentials # MongoDB Admin user credentials
MDB_ADMIN_USER='adminUser' MDB_ADMIN_USER="adminUser"
MDB_ADMIN_PASSWORD='superstrongpassword' MDB_ADMIN_PASSWORD="superstrongpassword"
# BigchainDB instance name. This name should be unique # BigchainDB instance name. This name should be unique
BDB_INSTANCE_NAME='bdb-instance-0' BDB_INSTANCE_NAME="bdb-instance-0"
# Comma separated list of initial peers in the # Comma separated list of initial peers in the
# network. # network.
BDB_PERSISTENT_PEERS='bdb-instance-0,bdb-instance-1,bdb-instance-2,bdb-instance-3' BDB_PERSISTENT_PEERS="bdb-instance-0,bdb-instance-1,bdb-instance-2,bdb-instance-3"
# Comma separated list of validators in the # Comma separated list of validators in the
# network # network
BDB_VALIDATORS='bdb-instance-0,bdb-instance-1,bdb-instance-2,bdb-instance-3' BDB_VALIDATORS="bdb-instance-0,bdb-instance-1,bdb-instance-2,bdb-instance-3"
# Comma separated list of voting # Comma separated list of voting
# power of all validators. Make sure # power of all validators. Make sure
# order and number of powers corresponds # order and number of powers corresponds
# to BDB_VALIDATORS # to BDB_VALIDATORS
BDB_VALIDATOR_POWERS='10,10,10,10' BDB_VALIDATOR_POWERS="10,10,10,10"
# Offical time of blockchain start # Offical time of blockchain start
BDB_GENESIS_TIME='0001-01-01T00:00:00Z' BDB_GENESIS_TIME="0001-01-01T00:00:00Z"
# Blockchain ID must be unique for # Blockchain ID must be unique for
# every blockchain # every blockchain
BDB_CHAIN_ID='test-chain-rwcPML' BDB_CHAIN_ID="test-chain-rwcPML"
# IP Address of the resolver(DNS server). # IP Address of the resolver(DNS server).
# i.e. IP of `kube-dns`, can be retrieved using: # i.e. IP of `kube-dns`, can be retrieved using:
# $ kubectl get services --namespace=kube-system -l k8s-app=kube-dns # $ kubectl get services --namespace=kube-system -l k8s-app=kube-dns
NODE_DNS_SERVER='10.0.0.10' NODE_DNS_SERVER="10.0.0.10"