From c7b6122c2c64485dd551b8ab44a2f8dd4ce98244 Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Wed, 15 Feb 2023 18:28:43 +0100 Subject: [PATCH 1/6] chore(actions): changing deploy command for assist --- .github/workflows/utilities-ee.yaml | 2 +- .github/workflows/utilities.yaml | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/utilities-ee.yaml b/.github/workflows/utilities-ee.yaml index a589bfb81..81341b5d4 100644 --- a/.github/workflows/utilities-ee.yaml +++ b/.github/workflows/utilities-ee.yaml @@ -10,7 +10,7 @@ on: - "!utilities/.gitignore" - "!utilities/*-dev.sh" -name: Build and Deploy Utilities EE +name: Build and Deploy Assist EE jobs: deploy: diff --git a/.github/workflows/utilities.yaml b/.github/workflows/utilities.yaml index b33d86c21..aa962bfce 100644 --- a/.github/workflows/utilities.yaml +++ b/.github/workflows/utilities.yaml @@ -9,7 +9,7 @@ on: - "!utilities/.gitignore" - "!utilities/*-dev.sh" -name: Build and Deploy Utilities +name: Build and Deploy Assist jobs: deploy: @@ -52,7 +52,12 @@ jobs: sed -i "s#domain_name.*#domain_name: \"foss.openreplay.com\" #g" vars.yaml sed -i "s#kubeconfig.*#kubeconfig_path: ${KUBECONFIG}#g" vars.yaml sed -i "s/image_tag:.*/image_tag: \"$IMAGE_TAG\"/g" vars.yaml - bash kube-install.sh --app utilities +# bash kube-install.sh --app utilities + # Deploy command + mv openreplay/charts/{ingress-nginx,assist,quickwit} /tmp + rm -rf openreplay/charts/* + mv /tmp/{ingress-nginx,assist,quickwit} openreplay/charts/ + helm template openreplay -n app openreplay -f vars.yaml -f /tmp/image_override.yaml --set ingress-nginx.enabled=false --set skipMigration=true --no-hooks --kube-version=$k_version | kubectl apply -f - env: DOCKER_REPO: ${{ secrets.OSS_REGISTRY_URL }} IMAGE_TAG: ${{ github.ref_name }}_${{ github.sha }} From 5beeb149e3982fb5ad02ac04c32b811134a89390 Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Wed, 15 Feb 2023 18:29:45 +0100 Subject: [PATCH 2/6] feat(assist): changes --- .github/workflows/utilities.yaml | 2 +- utilities/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/utilities.yaml b/.github/workflows/utilities.yaml index aa962bfce..e862c500c 100644 --- a/.github/workflows/utilities.yaml +++ b/.github/workflows/utilities.yaml @@ -3,7 +3,7 @@ on: workflow_dispatch: push: branches: - - dev + - api-v1.10.0 paths: - "utilities/**" - "!utilities/.gitignore" diff --git a/utilities/Dockerfile b/utilities/Dockerfile index bd47e1c71..8f4d98549 100644 --- a/utilities/Dockerfile +++ b/utilities/Dockerfile @@ -21,4 +21,4 @@ USER 1001 ADD --chown=1001 https://static.openreplay.com/geoip/GeoLite2-Country.mmdb $MAXMINDDB_FILE ENTRYPOINT ["/sbin/tini", "--"] -CMD npm start +CMD npm start \ No newline at end of file From bc1f148ea7eb5f86fe78a49d69849cbf1bb1b1cf Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Wed, 15 Feb 2023 18:31:03 +0100 Subject: [PATCH 3/6] chore(actions): changing deploy command for assist --- .github/workflows/utilities.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/utilities.yaml b/.github/workflows/utilities.yaml index e862c500c..15f7a5f97 100644 --- a/.github/workflows/utilities.yaml +++ b/.github/workflows/utilities.yaml @@ -52,7 +52,7 @@ jobs: sed -i "s#domain_name.*#domain_name: \"foss.openreplay.com\" #g" vars.yaml sed -i "s#kubeconfig.*#kubeconfig_path: ${KUBECONFIG}#g" vars.yaml sed -i "s/image_tag:.*/image_tag: \"$IMAGE_TAG\"/g" vars.yaml -# bash kube-install.sh --app utilities + # bash kube-install.sh --app utilities # Deploy command mv openreplay/charts/{ingress-nginx,assist,quickwit} /tmp rm -rf openreplay/charts/* From fb8db2d3e497966d589cfe63e3d896197251ae31 Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Wed, 15 Feb 2023 18:31:36 +0100 Subject: [PATCH 4/6] feat(assist): changes --- utilities/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/Dockerfile b/utilities/Dockerfile index 8f4d98549..bd47e1c71 100644 --- a/utilities/Dockerfile +++ b/utilities/Dockerfile @@ -21,4 +21,4 @@ USER 1001 ADD --chown=1001 https://static.openreplay.com/geoip/GeoLite2-Country.mmdb $MAXMINDDB_FILE ENTRYPOINT ["/sbin/tini", "--"] -CMD npm start \ No newline at end of file +CMD npm start From 02e413d4afea360759226899d32cf01d8082cb31 Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Wed, 15 Feb 2023 18:39:33 +0100 Subject: [PATCH 5/6] chore(actions): changing deploy command for assist --- .github/workflows/utilities.yaml | 7 +------ utilities/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/utilities.yaml b/.github/workflows/utilities.yaml index 15f7a5f97..82d84cf15 100644 --- a/.github/workflows/utilities.yaml +++ b/.github/workflows/utilities.yaml @@ -52,12 +52,7 @@ jobs: sed -i "s#domain_name.*#domain_name: \"foss.openreplay.com\" #g" vars.yaml sed -i "s#kubeconfig.*#kubeconfig_path: ${KUBECONFIG}#g" vars.yaml sed -i "s/image_tag:.*/image_tag: \"$IMAGE_TAG\"/g" vars.yaml - # bash kube-install.sh --app utilities - # Deploy command - mv openreplay/charts/{ingress-nginx,assist,quickwit} /tmp - rm -rf openreplay/charts/* - mv /tmp/{ingress-nginx,assist,quickwit} openreplay/charts/ - helm template openreplay -n app openreplay -f vars.yaml -f /tmp/image_override.yaml --set ingress-nginx.enabled=false --set skipMigration=true --no-hooks --kube-version=$k_version | kubectl apply -f - + bash kube-install.sh --app utilities env: DOCKER_REPO: ${{ secrets.OSS_REGISTRY_URL }} IMAGE_TAG: ${{ github.ref_name }}_${{ github.sha }} diff --git a/utilities/Dockerfile b/utilities/Dockerfile index bd47e1c71..8f4d98549 100644 --- a/utilities/Dockerfile +++ b/utilities/Dockerfile @@ -21,4 +21,4 @@ USER 1001 ADD --chown=1001 https://static.openreplay.com/geoip/GeoLite2-Country.mmdb $MAXMINDDB_FILE ENTRYPOINT ["/sbin/tini", "--"] -CMD npm start +CMD npm start \ No newline at end of file From b3427abfbe72630cf7439d0bfa0678c0ccd443e3 Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Thu, 16 Feb 2023 11:09:32 +0100 Subject: [PATCH 6/6] chore(actions): changing comments --- .github/workflows/utilities-ee.yaml | 2 +- .github/workflows/utilities.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/utilities-ee.yaml b/.github/workflows/utilities-ee.yaml index 81341b5d4..f9a1ac677 100644 --- a/.github/workflows/utilities-ee.yaml +++ b/.github/workflows/utilities-ee.yaml @@ -1,4 +1,4 @@ -# This action will push the utilities changes to aws +# This action will push the assist changes to aws on: workflow_dispatch: push: diff --git a/.github/workflows/utilities.yaml b/.github/workflows/utilities.yaml index 82d84cf15..7d2792d9b 100644 --- a/.github/workflows/utilities.yaml +++ b/.github/workflows/utilities.yaml @@ -1,4 +1,4 @@ -# This action will push the utilities changes to aws +# This action will push the assist changes to aws on: workflow_dispatch: push: