From 342890297eac8b88a2ef23d87a4e890e5a0bb1e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jay=28=EA=B9=80=EC=9E=AC=ED=9B=88=29?= Date: Tue, 23 Apr 2024 15:58:29 +0900 Subject: [PATCH] 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 <137759552+jay-bisonai@users.noreply.github.com> --- .gitignore | 1 + aggregator/README.md | 29 ++----------------- .../listener/deployment-listener.yaml | 2 +- aggregator/templates/listener/service.yaml | 2 +- .../reporter/deployment-reporter.yaml | 2 +- aggregator/templates/reporter/service.yaml | 2 +- .../templates/worker/deployment-worker.yaml | 2 +- aggregator/templates/worker/service.yaml | 2 +- aggregator/values.baobab.yaml | 2 +- aggregator/values.cypress.yaml | 2 +- aggregator/values.yaml | 2 +- api/values.baobab.yaml | 2 +- api/values.cypress.yaml | 2 +- api/values.yaml | 2 +- boot-api/values.baobab.yaml | 2 +- boot-api/values.yaml | 2 +- cli/templates/deployment.yaml | 2 +- cli/values.baobab.yaml | 2 +- cli/values.cypress.yaml | 2 +- cli/values.yaml | 2 +- delegator/values.baobab.yaml | 2 +- delegator/values.cypress.yaml | 2 +- delegator/values.yaml | 2 +- fetcher/templates/deployment.yaml | 2 +- fetcher/templates/service.yaml | 2 +- fetcher/values.baobab.yaml | 2 +- fetcher/values.cypress.yaml | 2 +- fetcher/values.yaml | 2 +- grafana-as-code/values.baobab.yaml | 2 +- grafana-as-code/values.cypress.yaml | 2 +- grafana-as-code/values.yaml | 2 +- monitor-api/templates/deployment.yaml | 2 +- monitor-api/templates/secrets.yaml.bak | 9 ------ monitor-api/templates/service.yaml | 6 ++-- monitor-api/values.baobab.yaml | 2 +- monitor-api/values.cypress.yaml | 2 +- monitor-api/values.yaml | 2 +- node/values.baobab.yaml | 2 +- node/values.yaml | 2 +- package.json | 1 + request-response/README.md | 25 ---------------- .../listener/deployment-listener.yaml | 2 +- .../templates/listener/service.yaml | 2 +- .../reporter/deployment-reporter.yaml | 2 +- .../templates/reporter/service.yaml | 2 +- .../templates/worker/deployment-worker.yaml | 2 +- .../templates/worker/service.yaml | 2 +- request-response/values.baobab.yaml | 2 +- request-response/values.cypress.yaml | 2 +- request-response/values.yaml | 2 +- vrf/README.md | 1 + .../listener/deployment-listener.yaml | 2 +- vrf/templates/listener/service.yaml | 2 +- .../reporter/deployment-reporter.yaml | 2 +- vrf/templates/reporter/service.yaml | 2 +- vrf/templates/worker/deployment-worker.yaml | 2 +- vrf/templates/worker/service.yaml | 2 +- vrf/values.baobab.yaml | 2 +- vrf/values.cypress.yaml | 2 +- vrf/values.yaml | 2 +- 60 files changed, 62 insertions(+), 116 deletions(-) delete mode 100644 monitor-api/templates/secrets.yaml.bak diff --git a/.gitignore b/.gitignore index 07e6e472..ba584238 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /node_modules +.aider* diff --git a/aggregator/README.md b/aggregator/README.md index 1bb4826a..d18adbc0 100644 --- 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 - ``` \ No newline at end of file +This chart will deploy the Aggregator of Orakl. diff --git a/aggregator/templates/listener/deployment-listener.yaml b/aggregator/templates/listener/deployment-listener.yaml index 50892dab..d29276cf 100644 --- 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 index 8907cd95..cf7b010e 100644 --- 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 index ac059e34..0e0e7012 100644 --- 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 index 27c5885a..7f77a33f 100644 --- 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 index 7b2ca7fe..edcfd0b7 100644 --- 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 index 621af5c9..1a6e2a06 100644 --- 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 index 649a8edb..279fe5d7 100644 --- 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 index 649a8edb..279fe5d7 100644 --- 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 index 649a8edb..279fe5d7 100644 --- 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 index 6b0262a5..25d5b4ab 100644 --- 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 index 6b0262a5..25d5b4ab 100644 --- 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 index 6b0262a5..25d5b4ab 100644 --- 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 index 4be45996..39318166 100644 --- 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 index 4be45996..39318166 100644 --- 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 index d35bcaa4..334a19fc 100644 --- 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 index da8871c3..ad99d2c1 100644 --- 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 index da8871c3..ad99d2c1 100644 --- 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 index da8871c3..ad99d2c1 100644 --- 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 index 624ee19c..080c07b5 100644 --- 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 index 3f74fbfa..9959e793 100644 --- 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 index 3ed73900..e011331a 100644 --- 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 index ba30a965..62ee5856 100644 --- 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 index 68f437ab..3e656b47 100644 --- 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 index 4cb85dd7..3bc4c9bf 100644 --- 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 index 4cb85dd7..3bc4c9bf 100644 --- 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 index b0049ada..d999bb44 100644 --- 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 index 809140da..c9aae253 100644 --- 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 index 17280261..0c4155db 100644 --- 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 index 60ddc895..2d76da1c 100644 --- 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 index 8800dfab..560bad99 100644 --- 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 deleted file mode 100644 index 8c279152..00000000 --- a/monitor-api/templates/secrets.yaml.bak +++ /dev/null @@ -1,9 +0,0 @@ -# apiVersion: mumoshu.github.io/v1alpha1 -# kind: AWSSecret -# metadata: -# name: orakl-monitor-secrets -# spec: -# stringDataFrom: -# secretsManagerSecretRef: -# secretId: orakl/infra -# versionId: 1ac113f0-b90c-4b2a-b104-fced527fcf06 diff --git a/monitor-api/templates/service.yaml b/monitor-api/templates/service.yaml index f1072154..690c77bc 100644 --- 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 index d8f88b68..933f3821 100644 --- 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 index d8f88b68..933f3821 100644 --- 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 index d8f88b68..933f3821 100644 --- 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 index a70969b3..658fe10c 100644 --- 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 index a70969b3..658fe10c 100644 --- 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 index b0ec83d6..6147daad 100644 --- a/package.json +++ b/package.json @@ -1,4 +1,5 @@ { + "license": "UNLICENSED", "devDependencies": { "husky": "^9.0.11" } diff --git a/request-response/README.md b/request-response/README.md index 1bb4826a..1e7d9462 100644 --- a/request-response/README.md +++ b/request-response/README.md @@ -1,29 +1,4 @@ ## Request-Response 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 - ``` \ No newline at end of file diff --git a/request-response/templates/listener/deployment-listener.yaml b/request-response/templates/listener/deployment-listener.yaml index 449c03e1..d13cbb21 100644 --- a/request-response/templates/listener/deployment-listener.yaml +++ b/request-response/templates/listener/deployment-listener.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: request-response-listener + name: {{ .Values.global.name }}-listener labels: {{- include "orakl-request-response.labels.listener" . | nindent 4 }} spec: diff --git a/request-response/templates/listener/service.yaml b/request-response/templates/listener/service.yaml index 60e6d980..d2a70cd7 100644 --- a/request-response/templates/listener/service.yaml +++ b/request-response/templates/listener/service.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Service metadata: - name: request-response-listener + name: {{ .Values.global.name }}-listener labels: {{- include "orakl-request-response.labels.listener" . | nindent 4 }} spec: diff --git a/request-response/templates/reporter/deployment-reporter.yaml b/request-response/templates/reporter/deployment-reporter.yaml index df583286..59bfd2d7 100644 --- a/request-response/templates/reporter/deployment-reporter.yaml +++ b/request-response/templates/reporter/deployment-reporter.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: request-response-reporter + name: {{ .Values.global.name }}-reporter labels: {{- include "orakl-request-response.labels.reporter" . | nindent 4 }} spec: diff --git a/request-response/templates/reporter/service.yaml b/request-response/templates/reporter/service.yaml index 69acb31f..5771ea06 100644 --- a/request-response/templates/reporter/service.yaml +++ b/request-response/templates/reporter/service.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Service metadata: - name: request-response-reporter + name: {{ .Values.global.name }}-reporter labels: {{- include "orakl-request-response.labels.reporter" . | nindent 4 }} spec: diff --git a/request-response/templates/worker/deployment-worker.yaml b/request-response/templates/worker/deployment-worker.yaml index 4bc26d20..1f2bb25b 100644 --- a/request-response/templates/worker/deployment-worker.yaml +++ b/request-response/templates/worker/deployment-worker.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: request-response-worker + name: {{ .Values.global.name }}-worker labels: {{- include "orakl-request-response.labels.worker" . | nindent 4 }} spec: diff --git a/request-response/templates/worker/service.yaml b/request-response/templates/worker/service.yaml index ce655b8f..e3da6c81 100644 --- a/request-response/templates/worker/service.yaml +++ b/request-response/templates/worker/service.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Service metadata: - name: request-response-worker + name: {{ .Values.global.name }}-worker labels: {{- include "orakl-request-response.labels.worker" . | nindent 4 }} spec: diff --git a/request-response/values.baobab.yaml b/request-response/values.baobab.yaml index 6a9fef36..865bb91d 100644 --- a/request-response/values.baobab.yaml +++ b/request-response/values.baobab.yaml @@ -2,7 +2,7 @@ ## created by Bisonai global: - name: request-response + name: orakl-request-response namespace: orakl appName: orakl-request-response diff --git a/request-response/values.cypress.yaml b/request-response/values.cypress.yaml index 6a9fef36..865bb91d 100644 --- a/request-response/values.cypress.yaml +++ b/request-response/values.cypress.yaml @@ -2,7 +2,7 @@ ## created by Bisonai global: - name: request-response + name: orakl-request-response namespace: orakl appName: orakl-request-response diff --git a/request-response/values.yaml b/request-response/values.yaml index 6a9fef36..865bb91d 100644 --- a/request-response/values.yaml +++ b/request-response/values.yaml @@ -2,7 +2,7 @@ ## created by Bisonai global: - name: request-response + name: orakl-request-response namespace: orakl appName: orakl-request-response diff --git a/vrf/README.md b/vrf/README.md index e69de29b..654b71ce 100644 --- a/vrf/README.md +++ b/vrf/README.md @@ -0,0 +1 @@ +## Orakl VRF ## diff --git a/vrf/templates/listener/deployment-listener.yaml b/vrf/templates/listener/deployment-listener.yaml index 93532163..3c654bce 100644 --- a/vrf/templates/listener/deployment-listener.yaml +++ b/vrf/templates/listener/deployment-listener.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: vrf-listener + name: {{ .Values.global.name }}-listener labels: {{- include "orakl-vrf.labels.listener" . | nindent 4 }} spec: diff --git a/vrf/templates/listener/service.yaml b/vrf/templates/listener/service.yaml index bfc1b148..3dc7400d 100644 --- a/vrf/templates/listener/service.yaml +++ b/vrf/templates/listener/service.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Service metadata: - name: vrf-listener + name: {{ .Values.global.name }}-listener labels: {{- include "orakl-vrf.labels.listener" . | nindent 4 }} spec: diff --git a/vrf/templates/reporter/deployment-reporter.yaml b/vrf/templates/reporter/deployment-reporter.yaml index 6588761d..4149d3a0 100644 --- a/vrf/templates/reporter/deployment-reporter.yaml +++ b/vrf/templates/reporter/deployment-reporter.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: vrf-reporter + name: {{ .Values.global.name }}-reporter labels: {{- include "orakl-vrf.labels.reporter" . | nindent 4 }} spec: diff --git a/vrf/templates/reporter/service.yaml b/vrf/templates/reporter/service.yaml index 305e79e5..8826ccd1 100644 --- a/vrf/templates/reporter/service.yaml +++ b/vrf/templates/reporter/service.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Service metadata: - name: vrf-reporter + name: {{ .Values.global.name }}-reporter labels: {{- include "orakl-vrf.labels.reporter" . | nindent 4 }} spec: diff --git a/vrf/templates/worker/deployment-worker.yaml b/vrf/templates/worker/deployment-worker.yaml index edac1520..1fe3db12 100644 --- a/vrf/templates/worker/deployment-worker.yaml +++ b/vrf/templates/worker/deployment-worker.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: vrf-worker + name: {{ .Values.global.name }}-worker labels: {{- include "orakl-vrf.labels.worker" . | nindent 4 }} spec: diff --git a/vrf/templates/worker/service.yaml b/vrf/templates/worker/service.yaml index 21700e65..dbec6d7e 100644 --- a/vrf/templates/worker/service.yaml +++ b/vrf/templates/worker/service.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Service metadata: - name: vrf-worker + name: {{ .Values.global.name }}-worker labels: {{- include "orakl-vrf.labels.worker" . | nindent 4 }} spec: diff --git a/vrf/values.baobab.yaml b/vrf/values.baobab.yaml index 34d78806..735ced19 100644 --- a/vrf/values.baobab.yaml +++ b/vrf/values.baobab.yaml @@ -2,7 +2,7 @@ ## created by Bisonai global: - name: vrf + name: orakl-vrf namespace: orakl appName: orakl-vrf diff --git a/vrf/values.cypress.yaml b/vrf/values.cypress.yaml index 34d78806..735ced19 100644 --- a/vrf/values.cypress.yaml +++ b/vrf/values.cypress.yaml @@ -2,7 +2,7 @@ ## created by Bisonai global: - name: vrf + name: orakl-vrf namespace: orakl appName: orakl-vrf diff --git a/vrf/values.yaml b/vrf/values.yaml index b95c64bb..2667bd6c 100644 --- a/vrf/values.yaml +++ b/vrf/values.yaml @@ -2,7 +2,7 @@ ## created by Bisonai global: - name: vrf + name: orakl-vrf namespace: orakl appName: orakl-vrf