diff --git a/.github/workflows/karate-tests-on-pull-request.yml b/.github/workflows/karate-tests-on-pull-request.yml index 278183b..f61a365 100644 --- a/.github/workflows/karate-tests-on-pull-request.yml +++ b/.github/workflows/karate-tests-on-pull-request.yml @@ -64,10 +64,10 @@ jobs: # The -i flag is needed to write new image tag directly to values file sed -i "0,/tag:.*/s//tag: \"sha-${{ github.sha }}\"/" deploy/values-documents-api.yaml.gotmpl - # we need to override "latest" ref of service chart inside local-env to run tests against the current commit service chart version and not against latest from master + # we need to override "latest" ref of service chart inside local-env to run tests against the current commit service chart version and not against latest from master sed -i "0,/git+https:\/\/github.com\/TourmalineCore\/${{ github.event.repository.name }}.git?ref=.*/s//git+https:\/\/github.com\/TourmalineCore\/${{ github.event.repository.name }}.git?ref=${{ github.sha }}/" deploy/helmfile.yaml - sed -i "0,/git::https:\/\/github.com\/TourmalineCore\/${{ github.event.repository.name }}.git@\/ci\/values-local-env.yaml?ref=.*/s//git::https:\/\/github.com\/TourmalineCore\/${{ github.event.repository.name }}.git@\/ci\/values-local-env.yaml?ref=${{ github.sha }}/" deploy/helmfile.yaml + sed -i "0,/git::https:\/\/github.com\/TourmalineCore\/${{ github.event.repository.name }}.git@\/Api\/ci\/values-local-env.yaml?ref=.*/s//git::https:\/\/github.com\/TourmalineCore\/${{ github.event.repository.name }}.git@\/Api\/ci\/values-local-env.yaml?ref=${{ github.sha }}/" deploy/helmfile.yaml kind create cluster --name inner-circle --config kind-local-config.yaml --kubeconfig ./.inner-circle-cluster-kubeconfig # we need to properly expose KUBECONFIG as an absolute path, pwd prints current working directory path diff --git a/.github/workflows/prod-docker-publish.yml b/.github/workflows/prod-docker-publish.yml index aeca20c..058d233 100644 --- a/.github/workflows/prod-docker-publish.yml +++ b/.github/workflows/prod-docker-publish.yml @@ -32,9 +32,9 @@ jobs: uses: helmfile/helmfile-action@v1.9.0 with: helmfile-version: 'v0.164.0' - helm-version: 'v3.14.4' + helm-version: 'v3.18.0' helmfile-args: > - apply --namespace dev-inner-circle -f Api/ci/helmfile.yaml + apply --suppress-diff --namespace dev-inner-circle -f Api/ci/helmfile.yaml --state-values-set image.tag=sha-${{ github.sha }} --state-values-set ingress.enabled=true --state-values-set ingress.hostname=${{ secrets.HOST }} @@ -42,4 +42,4 @@ jobs: --state-values-set extraSecretEnvVars.AuthenticationOptions__PublicSigningKey=${{ secrets.PUBLIC_SIGNING_KEY }} --state-values-set extraSecretEnvVars.InnerCircleServiceUrls__EmployeesServiceUrl=${{ secrets.SALARY_SERVICE_URL }} --state-values-set extraSecretEnvVars.InnerCircleServiceUrls__EmailSenderServiceUrl=${{ secrets.EMAIL_SENDER_SERVICE_URL }} - helmfile-auto-init: "false" + helmfile-auto-init: "false" \ No newline at end of file diff --git a/Api/Dockerfile b/Api/Dockerfile index a71931d..65d3153 100644 --- a/Api/Dockerfile +++ b/Api/Dockerfile @@ -2,7 +2,6 @@ # This stage is used when running from VS in fast mode (Default for Debug configuration) FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base -USER $APP_UID WORKDIR /app EXPOSE 80 diff --git a/Api/ci/helmfile.yaml b/Api/ci/helmfile.yaml index 744ff12..3b2e993 100644 --- a/Api/ci/helmfile.yaml +++ b/Api/ci/helmfile.yaml @@ -3,9 +3,9 @@ repositories: url: https://charts.bitnami.com/bitnami releases: - - name: inner-circle-documents-api + - name: documents-api labels: - app: inner-circle-documents-api + app: documents-api wait: true chart: bitnami/aspnet-core version: 4.4.7