kleph/q3_server_status
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add env var for server address and rconn password #1

Merged
kleph merged 1 commit from fix-env into master 2020-03-25 11:17:33 +01:00
Conversation 0 Commits 1 Files changed 2 +14 -2
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.drone.yml
View file

@ -24,9 +24,10 @@ deploy_commands_alias:
- sed "s/__LEVEL__/$${LEVEL}/g" kube/q3-status-deployment.yaml > kube/q3-status-deployment-$${LEVEL}.yaml - sed "s/__LEVEL__/$${LEVEL}/g" kube/q3-status-deployment.yaml > kube/q3-status-deployment-$${LEVEL}.yaml
- sed "s/__NAMESPACE__/$${NAMESPACE}/g" kube/q3-status-deployment-$${LEVEL}.yaml > kube/q3-status-deployment-$${NAMESPACE}-$${LEVEL}.yaml - sed "s/__NAMESPACE__/$${NAMESPACE}/g" kube/q3-status-deployment-$${LEVEL}.yaml > kube/q3-status-deployment-$${NAMESPACE}-$${LEVEL}.yaml
- sed "s/__IMAGE_TAG__/$${IMAGE_TAG}/g" kube/q3-status-deployment-$${NAMESPACE}-$${LEVEL}.yaml > kube/q3-status-deployment-$${NAMESPACE}-$${LEVEL}2.yaml - sed "s/__IMAGE_TAG__/$${IMAGE_TAG}/g" kube/q3-status-deployment-$${NAMESPACE}-$${LEVEL}.yaml > kube/q3-status-deployment-$${NAMESPACE}-$${LEVEL}2.yaml
- cat kube/q3-status-deployment-$${NAMESPACE}-$${LEVEL}2.yaml - sed "s/__Q3_SERVER__/$${Q3_SERVER}/g" kube/q3-status-deployment-$${NAMESPACE}-$${LEVEL}2.yaml > kube/q3-status-deployment-$${NAMESPACE}-$${LEVEL}3.yaml
- sed "s/__RCONN_PASSWORD__/$${RCONN_PASSWORD}/g" kube/q3-status-deployment-$${NAMESPACE}-$${LEVEL}3.yaml > kube/q3-status-deployment-$${NAMESPACE}-$${LEVEL}4.yaml
- echo "applying" - echo "applying"
- kubectl apply -f kube/q3-status-deployment-$${NAMESPACE}-$${LEVEL}2.yaml --namespace=q3 - kubectl apply -f kube/q3-status-deployment-$${NAMESPACE}-$${LEVEL}4.yaml --namespace=q3
- echo "== post deploy ($${LEVEL}) status:" - echo "== post deploy ($${LEVEL}) status:"
- kubectl get deployments --namespace=q3 - kubectl get deployments --namespace=q3
- kubectl get pods --namespace=q3 - kubectl get pods --namespace=q3
@ -48,6 +49,9 @@ steps:
IMAGE_TAG: ${DRONE_COMMIT_SHA:0:8} IMAGE_TAG: ${DRONE_COMMIT_SHA:0:8}
NAMESPACE: q3 NAMESPACE: q3
LEVEL: staging LEVEL: staging
Q3_SERVER: "vm-docker:27960"
RCONN_PASSWORD:
from_secret: rconn_password
<<: *deploy_commands <<: *deploy_commands
when: when:
branch: branch:
@ -67,6 +71,9 @@ steps:
IMAGE_TAG: ${DRONE_COMMIT_SHA:0:8} IMAGE_TAG: ${DRONE_COMMIT_SHA:0:8}
NAMESPACE: q3 NAMESPACE: q3
LEVEL: live LEVEL: live
Q3_SERVER: "vm-docker:27960"
RCONN_PASSWORD:
from_secret: rconn_password
<<: *deploy_commands <<: *deploy_commands
when: when:
branch: branch:

5
kube/q3-status-deployment.yaml
View file

@ -20,5 +20,10 @@ spec:
- name: q3-status - name: q3-status
image: kleph/q3-status:__IMAGE_TAG__ image: kleph/q3-status:__IMAGE_TAG__
imagePullPolicy: Always imagePullPolicy: Always
env:
- name: Q3_SERVER
value: __Q3_SERVER__
- name: RCONN_PASSWORD
value: __RCONN_PASSWORD__
ports: ports:
- containerPort: 5000 - containerPort: 5000