diff --git a/.github/workflows/deploy-to-prod-from-default.yml b/.github/workflows/deploy-to-prod-from-default.yml index a2cf85c..239b088 100644 --- a/.github/workflows/deploy-to-prod-from-default.yml +++ b/.github/workflows/deploy-to-prod-from-default.yml @@ -17,28 +17,18 @@ jobs: deploy-to-prod: name: Deploy service to k8s for prod environment needs: [push-to-registry] - runs-on: ubuntu-24.04 + runs-on: self-hosted steps: - name: Check out the repo uses: actions/checkout@v4 - - name: Create default global .kube/config file - run: | - cd $HOME - mkdir .kube - echo "${{ secrets.INNER_CIRCLE_PROD_KUBECONFIG }}" > .kube/config - - name: Deploy - uses: helmfile/helmfile-action@v1.9.0 - with: - helmfile-version: 'v0.164.0' - helm-version: 'v3.18.0' - helmfile-args: > - apply --suppress-diff --namespace ${{ secrets.INNER_CIRCLE_PROD_NAMESPACE }} -f ci/helmfile.yaml - --state-values-set image.tag=sha-${{ github.sha }} - --state-values-set ingress.hostname=${{ secrets.INNER_CIRCLE_PROD_HOSTNAME }} - --state-values-set extraConfigMapEnvVars.API_ROOT_URL=${{ secrets.INNER_CIRCLE_PROD_AUTH_API_ROOT_URL }} - helmfile-auto-init: "false" + # We use quotes because in other services we got a problems with vars without quotes + run: | + helmfile cache cleanup && helmfile apply --suppress-diff --namespace "${{ secrets.INNER_CIRCLE_PROD_NAMESPACE }}" -f ci/helmfile.yaml \ + --state-values-set image.tag="sha-${{ github.sha }}" \ + --state-values-set ingress.hostname="${{ secrets.INNER_CIRCLE_PROD_HOSTNAME }}" \ + --state-values-set extraConfigMapEnvVars.API_ROOT_URL="${{ secrets.INNER_CIRCLE_PROD_AUTH_API_ROOT_URL }}" > /dev/null 2>&1 e2e-test-prod: runs-on: ubuntu-24.04 @@ -64,4 +54,4 @@ jobs: CYPRESS_BASE_URL: ${{ secrets.INNER_CIRCLE_PROD_BASE_URL }} API_ROOT_URL: ${{ secrets.INNER_CIRCLE_PROD_AUTH_API_ROOT_URL }} USER_LOGIN: ${{ secrets.INNER_CIRCLE_PROD_AUTH_FIRST_TENANT_LOGIN_WITH_ALL_PERMISSIONS }} - USER_PASSWORD: ${{ secrets.INNER_CIRCLE_PROD_AUTH_FIRST_TENANT_PASSWORD_WITH_ALL_PERMISSIONS }} \ No newline at end of file + USER_PASSWORD: ${{ secrets.INNER_CIRCLE_PROD_AUTH_FIRST_TENANT_PASSWORD_WITH_ALL_PERMISSIONS }} diff --git a/ci/helmfile.yaml b/ci/helmfile.yaml index 90e34cc..da7bb69 100644 --- a/ci/helmfile.yaml +++ b/ci/helmfile.yaml @@ -1,6 +1,6 @@ repositories: - name: bitnami - url: https://charts.bitnami.com/bitnami + url: https://mirror.yandex.ru/helm/charts.bitnami.com releases: - name: auth-ui @@ -17,4 +17,4 @@ releases: - ingress: hostname: "{{ .StateValues.ingress.hostname }}" - extraConfigMapEnvVars: - API_ROOT_URL: "{{ .StateValues.extraConfigMapEnvVars.API_ROOT_URL }}" \ No newline at end of file + API_ROOT_URL: "{{ .StateValues.extraConfigMapEnvVars.API_ROOT_URL }}"