Swap datasource to proxysql (#121)

* Swap datasource to proxysql * DB_HOST var isn't necessary anymore
Chia-Network · Dec 5, 2024 · a480160 · a480160
1 parent 145384b
commit a480160
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml
@@ -55,7 +55,6 @@ jobs:
           token: ${{ env.VAULT_TOKEN }}
           secrets: |
             secret/data/${{ matrix.colo.region }}/k8s/k8s-${{ matrix.colo.region }} api_server_url | K8S_API_SERVER_URL;
-            secret/data/${{ matrix.colo.region }}/mysql/db-info host | DB_HOST;
             secret/data/${{ matrix.colo.region }}/mysql/users/grafana-read-pub username | GRAFANA_PUB_READ_USERNAME;
             secret/data/${{ matrix.colo.region }}/mysql/users/grafana-read-pub password | GRAFANA_PUB_READ_PASSWORD;
 

diff --git a/.github/workflows/deploy-review.yml b/.github/workflows/deploy-review.yml
@@ -42,7 +42,6 @@ jobs:
           token: ${{ env.VAULT_TOKEN }}
           secrets: |
             secret/data/msp/k8s/k8s-msp api_server_url | K8S_API_SERVER_URL;
-            secret/data/msp/mysql/db-info host | DB_HOST;
             secret/data/msp/mysql/users/grafana-read-pub username | GRAFANA_PUB_READ_USERNAME;
             secret/data/msp/mysql/users/grafana-read-pub password | GRAFANA_PUB_READ_PASSWORD;
 

diff --git a/helm/values.yaml.j2 b/helm/values.yaml.j2
@@ -55,11 +55,14 @@ networkPolicy:
     - Egress
   egressRules:
     - to:
-        - ipBlock:
-            cidr: "{{ DB_HOST }}/32"
+        - namespaceSelector:
+            matchLabels:
+              kubernetes.io/metadata.name: proxysql
       ports:
         - protocol: TCP
           port: 3306
+        - protocol: TCP
+          port: 6033
     - to:
         - namespaceSelector:
             matchLabels:

diff --git a/templates/datasources.yaml.j2 b/templates/datasources.yaml.j2
@@ -22,7 +22,7 @@ datasources:
     editable: False
   - name: block-data
     type: mysql
-    url: {{ DB_HOST }}:3306
+    url: "proxysql-generic.proxysql:3306"
     uid: P00A25F4DA48796D5
     user: '{{ GRAFANA_PUB_READ_USERNAME }}'
     jsonData: