From 98f6ad8e210f39379ab89cfa13f015286fee7bea Mon Sep 17 00:00:00 2001 From: deityhub Date: Tue, 27 Jul 2021 17:44:31 +0100 Subject: [PATCH] use single name without hyphen --- ci/spec/data-ingestor/deploy.yaml | 20 +++++++++---------- ci/spec/data-ingestor/rollback.yaml | 4 ++-- docker-compose.dev.yml | 2 +- docker-compose.yml | 2 +- .../public/fyipe/templates/data-ingestor.yaml | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ci/spec/data-ingestor/deploy.yaml b/ci/spec/data-ingestor/deploy.yaml index 2ce2ca04cd..bc09e3cdfe 100644 --- a/ci/spec/data-ingestor/deploy.yaml +++ b/ci/spec/data-ingestor/deploy.yaml @@ -10,11 +10,11 @@ production_data-ingestor: - chmod +x ./ci/scripts/deployment-production-setup.sh - ./ci/scripts/deployment-production-setup.sh - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD - - sudo docker build -t fyipeproject/data-ingestor:latest ./data-ingestor - - sudo docker tag fyipeproject/data-ingestor:latest fyipeproject/data-ingestor:3.0.$CI_PIPELINE_IID - - sudo docker push fyipeproject/data-ingestor:3.0.$CI_PIPELINE_IID - - sudo docker push fyipeproject/data-ingestor:latest - - sudo kubectl --kubeconfig=/root/.kube/config set image deployment/fi-ingestor fi-ingestor=fyipeproject/data-ingestor:3.0.$CI_PIPELINE_IID + - sudo docker build -t fyipeproject/ingestor:latest ./ingestor + - sudo docker tag fyipeproject/ingestor:latest fyipeproject/ingestor:3.0.$CI_PIPELINE_IID + - sudo docker push fyipeproject/ingestor:3.0.$CI_PIPELINE_IID + - sudo docker push fyipeproject/ingestor:latest + - sudo kubectl --kubeconfig=/root/.kube/config set image deployment/fi-ingestor fi-ingestor=fyipeproject/ingestor:3.0.$CI_PIPELINE_IID # Cleanup - chmod +x ./ci/scripts/deployment-cleanup.sh - ./ci/scripts/deployment-cleanup.sh @@ -41,11 +41,11 @@ staging_data-ingestor: - ./ci/scripts/deployment-staging-setup.sh # Build and deploy data-ingestor. - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD - - sudo docker build -t fyipeproject/data-ingestor:master ./data-ingestor - - sudo docker tag fyipeproject/data-ingestor:master fyipeproject/data-ingestor:3.0.$CI_PIPELINE_IID - - sudo docker push fyipeproject/data-ingestor:3.0.$CI_PIPELINE_IID - - sudo docker push fyipeproject/data-ingestor:master - - sudo kubectl --kubeconfig=/root/.kube/config set image deployment/fi-ingestor fi-ingestor=fyipeproject/data-ingestor:3.0.$CI_PIPELINE_IID + - sudo docker build -t fyipeproject/ingestor:master ./data-ingestor + - sudo docker tag fyipeproject/ingestor:master fyipeproject/ingestor:3.0.$CI_PIPELINE_IID + - sudo docker push fyipeproject/ingestor:3.0.$CI_PIPELINE_IID + - sudo docker push fyipeproject/ingestor:master + - sudo kubectl --kubeconfig=/root/.kube/config set image deployment/fi-ingestor fi-ingestor=fyipeproject/ingestor:3.0.$CI_PIPELINE_IID # Cleanup - chmod +x ./ci/scripts/deployment-cleanup.sh - ./ci/scripts/deployment-cleanup.sh diff --git a/ci/spec/data-ingestor/rollback.yaml b/ci/spec/data-ingestor/rollback.yaml index 209854f2c3..cd4cde8459 100644 --- a/ci/spec/data-ingestor/rollback.yaml +++ b/ci/spec/data-ingestor/rollback.yaml @@ -9,7 +9,7 @@ staging_rollback_data-ingestor: - chmod +x ./ci/scripts/job-status.sh - export smoke_test_staging_status=`./ci/scripts/job-status.sh smoke_test_staging` - if [[ $smoke_test_staging_status == \"success\" ]]; then exit 0; fi - - sudo kubectl --kubeconfig=/root/.kube/config rollout undo deployment/fi-data-ingestor + - sudo kubectl --kubeconfig=/root/.kube/config rollout undo deployment/fi-ingestor - chmod +x ./ci/scripts/cleanup.sh - ./ci/scripts/cleanup.sh only: @@ -29,7 +29,7 @@ production_rollback_data-ingestor: - chmod +x ./ci/scripts/job-status.sh - export smoke_test_production_status=`./ci/scripts/job-status.sh smoke_test_production` - if [[ $smoke_test_production_status == \"success\" ]]; then exit 0; fi - - sudo kubectl --kubeconfig=/root/.kube/config rollout undo deployment/fi-data-ingestor + - sudo kubectl --kubeconfig=/root/.kube/config rollout undo deployment/fi-ingestor - chmod +x ./ci/scripts/cleanup.sh - ./ci/scripts/cleanup.sh only: diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index a31fb86969..86ed6b7fcd 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -59,7 +59,7 @@ services: # https://stackoverflow.com/questions/29181032/add-a-volume-to-docker-but-exclude-a-sub-folder - /usr/src/app/node_modules/ - data-ingestor: + ingestor: ports: - '3200:3200' - '9239:9229' # Debugging port. diff --git a/docker-compose.yml b/docker-compose.yml index c572b8b6fc..b385af46da 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -108,7 +108,7 @@ services: environment: - IS_SAAS_SERVICE=${IS_SAAS_SERVICE} build: ./licensing - data-ingestor: + ingestor: ports: - '3200:3200' build: ./data-ingestor diff --git a/helm-chart/public/fyipe/templates/data-ingestor.yaml b/helm-chart/public/fyipe/templates/data-ingestor.yaml index a6f786be5b..6318a92d39 100644 --- a/helm-chart/public/fyipe/templates/data-ingestor.yaml +++ b/helm-chart/public/fyipe/templates/data-ingestor.yaml @@ -20,8 +20,8 @@ spec: app: {{ printf "%s-%s" .Release.Name "ingestor" }} spec: containers: - - image: {{ printf "%s/%s/%s:%s" .Values.image.registry .Values.image.repository "data-ingestor" .Values.image.tag }} - name: {{ printf "%s-%s" .Release.Name "data-ingestor" }} + - image: {{ printf "%s/%s/%s:%s" .Values.image.registry .Values.image.repository "ingestor" .Values.image.tag }} + name: {{ printf "%s-%s" .Release.Name "ingestor" }} imagePullPolicy: {{ .Values.image.pullPolicy }} env: - name: SERVER_URL