Skip to content

Commit 3d8117c

Browse files
Merge branch 'prod/provision'
2 parents 8fc53d6 + 7b3dfa7 commit 3d8117c

File tree

5 files changed

+32
-3
lines changed

5 files changed

+32
-3
lines changed

.gitignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,9 @@
88

99
terraform/**.tfstate*
1010
terraform/.terraform
11-
terraform/**.lock*
11+
terraform/**.lock*
12+
13+
/sandbox/gcplocal/**
14+
15+
/templates/
16+
/tests/

helm/beametl/templates/config.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
apiVersion: v1
2+
kind: ConfigMap
3+
metadata:
4+
name: beametl-conf
5+
namespace: {{ .Values.namespace }}
6+
spec:
7+
data:
8+
PROJECT: {{ .Values.config.project }}
9+
TOPIC: {{ .Values.config.mqtt_topic }}
10+
INSTANCE: {{ .Values.config.cbt_instance }}
11+
TABLE: {{ .Values.config.cbt_table }}

helm/beametl/templates/deployment.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,7 @@ spec:
3939
cpu: {{ .cpu | quote }}
4040
{{- end }}
4141
{{- end }}
42+
envFrom:
43+
- configMapRef:
44+
name: beametl-conf
4245
---

helm/beametl/values.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,9 @@ resourceOptions:
99
limits:
1010
memory: "1.5Gi"
1111
cpu: "4"
12+
13+
config:
14+
project: quick-sonar-469406-j1
15+
mqtt_topic: projects/quick-sonar-469406-j1/topics/mqtt-source
16+
cbt_instance: logcorebt
17+
cbt_table: iotsink

taskfile.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ tasks:
6565
- helm template grafana grafana/grafana --values ./k8s/dev/observe/values/graf.yaml --debug > ./templates/observe/graf-dev-manifest.yaml
6666
- helm template loki grafana/loki --values ./k8s/dev/observe/values/loki.yaml --debug > ./templates/observe/loki-dev-manifest.yaml
6767
- helm template prom prometheus-community/prometheus --values ./k8s/dev/observe/values/prom.yaml --debug > ./templates/observe/prom-dev-manifest.yaml
68-
6968

7069
observe-grafana-access-local:
7170
desc: access the grafana web ui (get address & details)
@@ -96,10 +95,15 @@ tasks:
9695
- helm install verne verne/verne -n verne -f ./dev-values.yaml
9796

9897
verne-helm-deploy-prod:
99-
desc: install verne helm package for prod (GKE cluster)
98+
desc: deploy verne helm package for prod (GKE cluster)
10099
cmds:
101100
- helm install verne verne/verne -n verne -f ./k8s/prod/verne/prod-values.yaml
102101

102+
beametl-helm-deploy-prod:
103+
desc: deploy beametl helm package for prod (GKE cluster)
104+
cmds:
105+
- helm install beametl beametl/beametl -n beametl -f ./k8s/prod/beametl/values.yaml
106+
103107
verne-get-ip:
104108
desc: get verne broker load balancer IP to access
105109
cmds:

0 commit comments

Comments
 (0)