Merge pull request #26 from ShubhamTiwary914/prod/provision

Prod/provision

Author: ShubhamTiwary914

helm/verne/templates/config.yaml

@@ -14,4 +14,6 @@ data:
   PUBSUB_CONNECT_SUCCESS_PATH: {{ .Values.listenerConfig.pubsubSuccessPath | quote }}
   MQTT_TOPIC: {{ .Values.listenerConfig.mqttTopic | quote }}
   MQTT_BROKER_ADDRESS: {{ .Values.listenerConfig.brokerAddress | quote }}
-  PUBSUB_HOST: {{ .Values.listenerConfig.pubsubHost | quote }}
+  PUBSUB_HOST: {{ .Values.listenerConfig.pubsubHost | quote }}
+  MODE_PATH: {{ .Values.listenerConfig.modePath | quote }}
+  PROJECT_ID: {{ .Values.listenerConfig.projectID | quote }}

helm/verne/templates/deployment.yaml

@@ -19,14 +19,13 @@ spec:
         app: broker 
     spec:
       serviceAccountName: vernemq 
-
-{{- if eq .Values.env "dev" }}
       #shared emptyDir vol
       volumes:
         - name: envs
           emptyDir: {}
-          
-      #allow access to node (access gcp emulator - not for prod!)
+
+#node address(for access gcp emulator - not for prod!)
+{{- if eq .Values.env "dev" }}          
       initContainers:
         - name: init-host-ip
           image: busybox
@@ -39,6 +38,20 @@ spec:
               mountPath: /envs
 {{- end }}
 
+{{- if eq .Values.env "prod" }}
+#set mode = prod (for prod)
+      initContainers: 
+        - name: init-mode-setter
+          image: busybox
+          command:
+          - sh
+          - c
+          - echo "prod" > {{ .Values.listenerConfig.modePath }}
+        volumeMounts:
+          - name: envs
+            mountPath: /envs
+{{-end }}
+
       containers:
         - name:  vernemq
           image: vernemq/vernemq
@@ -52,7 +65,7 @@ spec:
               name: verne-conf
 
         - name: listener
-          image: sardinesszsz/verne-listener:latest 
+          image: {{ .Values.image }} 
           envFrom:
           - configMapRef: 
               name: verne-conf
@@ -75,9 +88,6 @@ spec:
                 - 'grep -q "SUCCESS" $MQTT_CONNECT_SUCCESS_PATH && grep -q "SUCCESS" $PUBSUB_CONNECT_SUCCESS_PATH' 
             initialDelaySeconds: 10
             periodSeconds: 2
-
-{{- if eq .Values.env "dev" }}
           volumeMounts:
           - name: envs
-            mountPath: /envs
-{{- end }}
+            mountPath: /envs

helm/verne/values.yaml

@@ -1,6 +1,7 @@
-replicaCount: 5
+replicaCount: 2
 env: dev 
 namespace: verne
+image: sardinesszsz/verne-listener:latest 
 
 verneConfig:
   acceptEula: "yes"
@@ -11,5 +12,7 @@ listenerConfig:
   mqttSuccessPath: "/tmp/listener.status"
   pubsubSuccessPath: "/tmp/pub.status"
   mqttTopic: "mqtt-source"
-  brokerAddress: "localhost"
-  pubsubHost: "gcp-emulators:8085"
+  brokerAddress: "localhost" #same pod as broker 
+  pubsubHost: "gcp-emulators:8085"
+  modePath: "/envs/mode"
+  projectID: "gcplocal-emulator"

k8s/dev/verne/dev-values.yaml

@@ -0,0 +1,18 @@
+replicaCount: 1
+env: dev 
+namespace: verne
+image: sardinesszsz/verne-listener:latest 
+
+verneConfig:
+  acceptEula: "yes"
+  allowAnonymous: "on"
+listenerConfig:
+  hostPath: "/envs/host_ip"
+  mqttPort: "1883"
+  mqttSuccessPath: "/tmp/listener.status"
+  pubsubSuccessPath: "/tmp/pub.status"
+  mqttTopic: "mqtt-source"
+  brokerAddress: "localhost" #same pod as broker 
+  pubsubHost: "gcp-emulators:8085"
+  modePath: "/envs/mode"
+  projectID: "gcplocal-emulator"

k8s/prod/verne/prod-values.yaml

@@ -0,0 +1,16 @@
+replicaCount: 3
+env: prod 
+namespace: verne
+image: sardinesszsz/verne-listener:latest 
+
+verneConfig:
+  acceptEula: "yes"
+  allowAnonymous: "on"
+listenerConfig:
+  mqttPort: "1883"
+  mqttSuccessPath: "/tmp/listener.status"
+  pubsubSuccessPath: "/tmp/pub.status"
+  mqttTopic: "mqtt-source"
+  brokerAddress: "localhost" #same pod as broker 
+  modePath: "/envs/mode"
+  projectID: "quick-sonar-469406-j1"

scripts/run-local.sh

@@ -76,15 +76,16 @@ else
 fi
 
 #verne setup
+VERNE_DIR="../k8s/dev/verne"
 log_info "Installing Verne chart..."
 if helm list -n verne | grep -q "verne"; then
     log_skip "Verne chart already installed"
 else
-    helm install verne verne/verne -n verne
+    helm install verne verne/verne -n verne -f "$VERNE_DIR/dev-values.yaml"
 fi
 
 #setup observability stack
-OBSERVE_DIR="../k8s/observe"
+OBSERVE_DIR="../k8s/dev/observe"
 log_info "Setting up observability stack..."
 
 #loki

services/listener/main.go

@@ -17,18 +17,20 @@ var (
 	//readiness probe file path (container healthcheck)
 	LISTENER_HEALTHFILE_PATH = os.Getenv("MQTT_CONNECT_SUCCESS_PATH")
 	PUB_HEALTHFILE_PATH      = os.Getenv("PUBSUB_CONNECT_SUCCESS_PATH")
+	MODE_PATH                = os.Getenv("MODE_PATH")
 )
 
 var (
 	//target= verne container in same pod (hence TCP at localhost:1883)
 	Broker      string = os.Getenv("MQTT_BROKER_ADDRESS")
 	Port        int    = 1883
-	projectID   string = "gcplocal-emulator"
+	projectID   string = os.Getenv("PROJECT_ID")
 	pubsubTopic string = "source"
 
 	MqttTopicPath string = os.Getenv("MQTT_TOPIC")
 	pubsubPort    string = "8085"
 	pubsubHost    string = os.Getenv("PUBSUB_HOST")
+	mode          string = "dev"
 )
 
 var (
@@ -60,6 +62,7 @@ func localConfigs() {
 	//read host_ip (for k3s local) -> node where gcp emulator runs
 	data, err := os.ReadFile("/envs/host_ip")
 	if err != nil {
+		utils.Log(utils.LOG_ERROR, "error loading host_ip from /envs/host_ip")
 		panic(err)
 	}
 	hostIP := string(utils.TrimSpace(data))
@@ -72,8 +75,19 @@ func localConfigs() {
 	utils.Log(utils.LOG_WARN, "currently running localhost pubsub via gcp-emulator, change in production to real gcp!")
 }
 
+func configs() {
+	modepath, err := os.ReadFile(MODE_PATH)
+	if err != nil {
+		utils.Log(utils.LOG_ERROR, utils.Sprintf("error finding what mode to set at %s"))
+	}
+	mode = string(utils.TrimSpace(modepath))
+	if mode == "dev" {
+		localConfigs()
+	}
+}
+
 func main() {
-	localConfigs()
+	configs()
 
 	//connect to pubsub (+channel for publishing)
 	pubctx, pubclient = confPubSub(projectID)
@@ -151,7 +165,11 @@ func confPubSub(projectID string) (context.Context, *pubsub.Client) {
 	if err != nil {
 		utils.Log(utils.LOG_ERROR, utils.Sprintf("failed to create pubsub client: %v", err))
 	}
-	utils.Log(utils.LOG_DEBUG, utils.Sprintf("connected to pubsub host: %s", os.Getenv("PUBSUB_EMULATOR_HOST")))
+	if MODE_PATH == "dev" {
+		utils.Log(utils.LOG_DEBUG, utils.Sprintf("connected to pubsub host: %s", os.Getenv("PUBSUB_EMULATOR_HOST")))
+	} else {
+		utils.Log(utils.LOG_DEBUG, "connected to pubsub host")
+	}
 	logSuccess(PUB_HEALTHFILE_PATH)
 	return ctx, client
 }

taskfile.yaml

@@ -1,12 +1,14 @@
 version: '3'
 
+dotenv: ['.tf.env']
+
+
 env:
   MONITOR_NAMESPACE: observe
   GCP_PROJECT: gcplocal-emulator
   GCP_LOCAL_BASE_URL: http://localhost:8085/v1
   DEV_PATH: ./k8s/dev
   PROD_PATH: ./k8s/prod
-  
 
 tasks:
   # / ======== \
@@ -53,10 +55,11 @@ tasks:
     cmds:
       - helm upgrade prometheus prometheus-community/prometheus -n $MONITOR_NAMESPACE -f ./values/prom.yaml
 
-  verne-helm-pack-install:
+  verne-helm-setup-local:
+    dir: $DEV_PATH/verne
     desc: install verne helm package
     cmds:
-      - helm install verne verne/verne -n verne
+      - helm install verne verne/verne -n verne -f ./dev-values.yaml
 
   verne-get-ip:
     desc: get verne broker load balancer IP to access 
@@ -169,3 +172,32 @@ tasks:
   # / ======== \
   #   region PROD 
   # \ ======== /
+  tf-init:
+    dir: ./terraform
+    cmds: 
+      - terraform init
+      
+  tf-plan:
+    dir: ./terraform
+    cmds:
+      - terraform plan
+   
+  tf-apply:
+    dir: ./terraform
+    cmds:
+      - terraform apply 
+  
+  tf-apply-debug:
+    dir: ./terraform
+    cmds:
+      - TF_LOG=DEBUG TF_LOG_PATH=./tf-debug.log terraform apply -auto-approve
+
+  tf-destroy-single:
+    dir: ./terraform
+    cmds:
+      - terraform destroy -target={{.CLI_ARGS}}  
+   
+  tf-list-res:
+    dir: ./terraform
+    cmds:
+      - terraform state list

terraform/gke.tf

@@ -4,6 +4,7 @@ resource "google_container_cluster" "default" {
     enable_autopilot = true
     network = google_compute_network.logcore-net.id
     subnetwork = google_compute_subnetwork.logcore-lowa-subnet.id
+    project = var.project_id
 
     cluster_autoscaling {
         auto_provisioning_defaults {