Unify namings and minor change (#320)

* feat: Unify aggregator naming * feat: Unify api naming * chore: Add `.aider*` to gitignore * feat: Unify boot-api naming * feat: Unify cli naming * fix: Correct wrong name * feat: Unify delegator naming * feat: Unify fetcher naming * feat: Unify grafana naming * refactor: Load `loadBalancerIP` value from values file * feat: Unify monitor-api naming * feat: Unify orakl-node naming * feat: Unify request-response naming * feat: Unify VRF naming --------- Co-authored-by: jay-bisonai <[email protected]>
Bisonai · Apr 23, 2024 · 3428902 · 3428902
1 parent 9037a0a
commit 3428902
Show file tree

Hide file tree

Showing 60 changed files with 62 additions and 116 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 /node_modules
+.aider*
diff --git a/aggregator/README.md b/aggregator/README.md
@@ -1,29 +1,4 @@
-## Request-Response Settings for Orakl ##
+## Aggregator Settings for Orakl ##
 ---
 
-
-This chart will deploy the Request-Response of Orakl.
-
-
-``` bash
-global:
-  image:
-    repository: docker.io/jolol/orakl #repository url
-    pullPolicy: IfNotPresent
-    tag: "v.0.0.6"                    #image tag
-    imagePullPolicy: IfNotPresent
-    # -- If defined, uses a Secret to pull an image from a private Docker registry or repository
-    imagePullSecrets: []
-
-  config:
-    NODE_ENV: production    #[dev, production]
-    CHAIN: baobab           #[baobab, cypress]
-    HOST_SETTINGS_DB_DIR:   #Default is empty
-    HEALTH_CHECK_PORT: 8888 #Specify Helath Check Port
-    ORAKL_DIR: /app/db      #The path should match with PVC of Orakl database
-    REDIS_HOST: localhost   #Redis Host Url
-    REDIS_PORT: 6379        #Redis Port
-    SLACK_WEBHOOK_URL:      #Error message is delivered to slack 
-    LOG_LEVEL: debug        #[info, debug]
-    LOG_DIR: /app/log       #The path should match with PVC of Orakl Log
-    ```   
+This chart will deploy the Aggregator of Orakl.
diff --git a/aggregator/templates/listener/deployment-listener.yaml b/aggregator/templates/listener/deployment-listener.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: aggregator-listener
+  name: {{ .Values.global.name }}-listener
   labels:
     {{- include "orakl-aggregator.labels.listener" . | nindent 4 }}
 spec:

diff --git a/aggregator/templates/listener/service.yaml b/aggregator/templates/listener/service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: aggregator-listener
+  name: {{ .Values.global.name }}-listener
   labels: 
     {{- include "orakl-aggregator.labels.listener" . | nindent 4 }}  
 spec:

diff --git a/aggregator/templates/reporter/deployment-reporter.yaml b/aggregator/templates/reporter/deployment-reporter.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: aggregator-reporter
+  name: {{ .Values.global.name }}-reporter
   labels:
     {{- include "orakl-aggregator.labels.reporter" . | nindent 4 }}
 spec:

diff --git a/aggregator/templates/reporter/service.yaml b/aggregator/templates/reporter/service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: aggregator-reporter
+  name: {{ .Values.global.name }}-reporter
   labels: 
     {{- include "orakl-aggregator.labels.reporter" . | nindent 4 }}  
 spec:

diff --git a/aggregator/templates/worker/deployment-worker.yaml b/aggregator/templates/worker/deployment-worker.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: aggregator-worker
+  name: {{ .Values.global.name }}-worker
   labels:
     {{- include "orakl-aggregator.labels.worker" . | nindent 4 }}
 spec:

diff --git a/aggregator/templates/worker/service.yaml b/aggregator/templates/worker/service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: aggregator-worker
+  name: {{ .Values.global.name }}-worker
   labels: 
     {{- include "orakl-aggregator.labels.worker" . | nindent 4 }}  
 spec:

diff --git a/aggregator/values.baobab.yaml b/aggregator/values.baobab.yaml
@@ -2,7 +2,7 @@
 ## created by Bisonai
 
 global:
-  name: aggregator
+  name: orakl-aggregator
   namespace: orakl
   appName: orakl-aggregator
   image:

diff --git a/aggregator/values.cypress.yaml b/aggregator/values.cypress.yaml
@@ -2,7 +2,7 @@
 ## created by Bisonai
 
 global:
-  name: aggregator
+  name: orakl-aggregator
   namespace: orakl
   appName: orakl-aggregator
   image:

diff --git a/aggregator/values.yaml b/aggregator/values.yaml
@@ -2,7 +2,7 @@
 ## created by Bisonai
 
 global:
-  name: aggregator
+  name: orakl-aggregator
   namespace: orakl
   appName: orakl-aggregator
   image:

diff --git a/api/values.baobab.yaml b/api/values.baobab.yaml
@@ -1,7 +1,7 @@
 ## Klaytn Orakl Api Configuration
 ## created by Bisonai
 global:
-  name: api
+  name: orakl-api
   namespace: orakl
   image:
     repository: public.ecr.aws/bisonai/orakl-api

diff --git a/api/values.cypress.yaml b/api/values.cypress.yaml
@@ -1,7 +1,7 @@
 ## Klaytn Orakl Api Configuration
 ## created by Bisonai
 global:
-  name: api
+  name: orakl-api
   namespace: orakl
   image:
     repository: public.ecr.aws/bisonai/orakl-api

diff --git a/api/values.yaml b/api/values.yaml
@@ -1,7 +1,7 @@
 ## Klaytn Orakl Api Configuration
 ## created by Bisonai
 global:
-  name: api
+  name: orakl-api
   namespace: orakl
   image:
     repository: public.ecr.aws/bisonai/orakl-api

diff --git a/boot-api/values.baobab.yaml b/boot-api/values.baobab.yaml
@@ -2,7 +2,7 @@
 ## created by Bisonai
 
 global:
-  name: boot-api
+  name: orakl-boot-api
   namespace: orakl
   image:
     repository: public.ecr.aws/bisonai/orakl-boot-api #repository url

diff --git a/boot-api/values.yaml b/boot-api/values.yaml
@@ -2,7 +2,7 @@
 ## created by Bisonai
 
 global:
-  name: boot-api
+  name: orakl-boot-api
   namespace: orakl
   image:
     repository: public.ecr.aws/bisonai/orakl-boot-api #repository url

diff --git a/cli/templates/deployment.yaml b/cli/templates/deployment.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: cli
+  name: {{ .Values.global.name }} 
   labels:
     {{- include "orakl-cli.labels.cli" . | nindent 4 }}
 spec:

diff --git a/cli/values.baobab.yaml b/cli/values.baobab.yaml
@@ -2,7 +2,7 @@
 ## created by Bisonai
 
 global:
-  name: cli
+  name: orakl-cli
   namespace: orakl
   image:
     repository: public.ecr.aws/u6t6w0e4/orakl-cli

diff --git a/cli/values.cypress.yaml b/cli/values.cypress.yaml
@@ -2,7 +2,7 @@
 ## created by Bisonai
 
 global:
-  name: cli
+  name: orakl-cli
   namespace: orakl
   image:
     repository: public.ecr.aws/u6t6w0e4/orakl-cli

diff --git a/cli/values.yaml b/cli/values.yaml
@@ -2,7 +2,7 @@
 ## created by Bisonai
 
 global:
-  name: cli
+  name: orakl-cli
   namespace: orakl
   image:
     repository: public.ecr.aws/u6t6w0e4/orakl-cli

diff --git a/delegator/values.baobab.yaml b/delegator/values.baobab.yaml
@@ -2,7 +2,7 @@
 ## created by Bisonai
 
 global:
-  name: delegator
+  name: orakl-delegator
   namespace: orakl
   image:
     repository: public.ecr.aws/bisonai/orakl-delegator #repository url

diff --git a/delegator/values.cypress.yaml b/delegator/values.cypress.yaml
@@ -2,7 +2,7 @@
 ## created by Bisonai
 
 global:
-  name: delegator
+  name: orakl-delegator
   namespace: orakl
   image:
     repository: public.ecr.aws/bisonai/orakl-delegator #repository url

diff --git a/delegator/values.yaml b/delegator/values.yaml
@@ -2,7 +2,7 @@
 ## created by Bisonai
 
 global:
-  name: delegator
+  name: orakl-delegator
   namespace: orakl
   image:
     repository: public.ecr.aws/bisonai/orakl-delegator #repository url

diff --git a/fetcher/templates/deployment.yaml b/fetcher/templates/deployment.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: fetcher
+  name: {{ .Values.global.name }} 
   labels:
     {{- include "orakl-fetcher.labels.fetcher" . | nindent 4 }}
 spec:

diff --git a/fetcher/templates/service.yaml b/fetcher/templates/service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: orakl-fetcher
+  name: {{ .Values.global.name }} 
 spec:
   {{ if .Values.global.externalIp.enabled }}
   type: LoadBalancer

diff --git a/fetcher/values.baobab.yaml b/fetcher/values.baobab.yaml
@@ -2,7 +2,7 @@
 ## created by Bisonai
 
 global:
-  name: fetcher
+  name: orakl-fetcher
   namespace: orakl
   image:
     repository: public.ecr.aws/u6t6w0e4/orakl-fetcher #repository url

diff --git a/fetcher/values.cypress.yaml b/fetcher/values.cypress.yaml
@@ -2,7 +2,7 @@
 ## created by Bisonai
 
 global:
-  name: fetcher
+  name: orakl-fetcher
   namespace: orakl
   image:
     repository: public.ecr.aws/u6t6w0e4/orakl-fetcher #repository url

diff --git a/fetcher/values.yaml b/fetcher/values.yaml
@@ -2,7 +2,7 @@
 ## created by Bisonai
 
 global:
-  name: fetcher
+  name: orakl-fetcher
   namespace: orakl
   image:
     repository: public.ecr.aws/u6t6w0e4/orakl-fetcher #repository url

diff --git a/grafana-as-code/values.baobab.yaml b/grafana-as-code/values.baobab.yaml
@@ -1,5 +1,5 @@
 global:
-  name: grafana-as-code
+  name: orakl-grafana-as-code
   namespace: orakl
 
 image:

diff --git a/grafana-as-code/values.cypress.yaml b/grafana-as-code/values.cypress.yaml
@@ -1,5 +1,5 @@
 global:
-  name: grafana-as-code
+  name: orakl-grafana-as-code
   namespace: orakl
 
 image:

diff --git a/grafana-as-code/values.yaml b/grafana-as-code/values.yaml
@@ -1,5 +1,5 @@
 global:
-  name: grafana-as-code
+  name: orakl-grafana-as-code
   namespace: orakl
 
 image:

diff --git a/monitor-api/templates/deployment.yaml b/monitor-api/templates/deployment.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: monitor-api
+  name: {{ .Values.global.name }} 
   labels:
     {{- include "orakl-monitor-api.labels.monitor-api" . | nindent 4 }}
 spec:

diff --git a/monitor-api/templates/secrets.yaml.bak b/monitor-api/templates/secrets.yaml.bak
diff --git a/monitor-api/templates/service.yaml b/monitor-api/templates/service.yaml
@@ -1,10 +1,12 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: orakl-monitor-api
+  name: {{ .Values.global.name }} 
 spec:
   type: LoadBalancer
-  loadBalancerIP: 34.142.143.138
+  {{- with .Values.service }}
+  loadBalancerIP: {{ .loadBalancerIP | quote }}
+  {{- end }}
   ports:
     - port: 8888
       targetPort: http

diff --git a/monitor-api/values.baobab.yaml b/monitor-api/values.baobab.yaml
@@ -1,7 +1,7 @@
 ## Klaytn Orakl Listener Configuration
 ## created by Bisonai
 global:
-  name: monitor-api
+  name: orakl-monitor-api
   namespace: orakl
 
   image:

diff --git a/monitor-api/values.cypress.yaml b/monitor-api/values.cypress.yaml
@@ -1,7 +1,7 @@
 ## Klaytn Orakl Listener Configuration
 ## created by Bisonai
 global:
-  name: monitor-api
+  name: orakl-monitor-api
   namespace: orakl
 
   image:

diff --git a/monitor-api/values.yaml b/monitor-api/values.yaml
@@ -1,7 +1,7 @@
 ## Klaytn Orakl Listener Configuration
 ## created by Bisonai
 global:
-  name: monitor-api
+  name: orakl-monitor-api
   namespace: orakl
 
   image:

diff --git a/node/values.baobab.yaml b/node/values.baobab.yaml
@@ -1,7 +1,7 @@
 ## Klaytn Orakl Api Configuration
 ## created by Bisonai
 global:
-  name: node
+  name: orakl-node
   namespace: orakl
   image:
     repository: public.ecr.aws/bisonai/orakl-node

diff --git a/node/values.yaml b/node/values.yaml
@@ -1,7 +1,7 @@
 ## Klaytn Orakl Api Configuration
 ## created by Bisonai
 global:
-  name: node
+  name: orakl-node
   namespace: orakl
   image:
     repository: public.ecr.aws/bisonai/orakl-node

diff --git a/package.json b/package.json
@@ -1,4 +1,5 @@
 {
+  "license": "UNLICENSED",
   "devDependencies": {
     "husky": "^9.0.11"
   }