diff --git a/.github/workflows/init-project.yml b/.github/workflows/init-project.yml index bdfc6f7..10d60d4 100644 --- a/.github/workflows/init-project.yml +++ b/.github/workflows/init-project.yml @@ -5,7 +5,7 @@ on: workflow_dispatch: env: - IMAGE_PREFIX: registry.cloudzilla.ai/lens-project-8eefe9e0/ + IMAGE_PREFIX: registry.cloudzilla.ai/lens-project-b36efeb0/ jobs: build-push: @@ -22,7 +22,7 @@ jobs: uses: docker/login-action@v3 with: registry: https://registry.cloudzilla.ai/ - username: 'robot$lens-project-8eefe9e0+imageuser' + username: 'robot$lens-project-b36efeb0+imageuser' password: '${{ secrets.DOCKER_PASSWORD }}' - name: downcase REPO @@ -36,6 +36,13 @@ jobs: with: images: ${{ env.IMAGE_PREFIX }}${{ env.IMAGE_NAME }} + - name: Put down .env file + run: | + echo "writing .env file..." + echo "# This file is generated or updated by the cloudzilla deploy workflow" >> .env + # remove duplicates keeping the items at the bottom of the file + tac .env | awk -F'=' '!seen[$1]++' | tac > .env.tmp2 && mv .env.tmp2 .env + - name: Build and push Docker image uses: docker/build-push-action@v5 with: @@ -49,7 +56,7 @@ jobs: SECTION_K8S_API_URL: '${{ secrets.SECTION_K8S_API_URL }}' SECTION_API_TOKEN: '${{ secrets.SECTION_API_TOKEN }}' DOCKER_SERVER: 'registry.cloudzilla.ai' - DOCKER_USERNAME: 'robot$lens-project-8eefe9e0+imageuser' + DOCKER_USERNAME: 'robot$lens-project-b36efeb0+imageuser' DOCKER_PASSWORD: '${{ secrets.DOCKER_PASSWORD }}' FULL_IMAGE_WITH_TAG: '${{ env.DOCKER_METADATA_OUTPUT_TAGS }}' POD_NAME: '${{ env.IMAGE_NAME }}' @@ -66,11 +73,12 @@ jobs: main() { setCluster + kubectl create secret generic console-project-env-secret --from-env-file=${GITHUB_WORKSPACE}/.env --dry-run=client -o yaml | kubectl apply -f - kubectl create secret docker-registry regcred --docker-server="${DOCKER_SERVER}" --docker-username="${DOCKER_USERNAME}" --docker-password="${DOCKER_PASSWORD}" --dry-run=client -o yaml | kubectl apply -f - - envsubst '$FULL_IMAGE_WITH_TAG $POD_NAME' < ${GITHUB_WORKSPACE}/k8s/deploy.yaml | kubectl apply -f - kubectl apply -f ${GITHUB_WORKSPACE}/k8s/ingress-upstream.yaml - + envsubst '$FULL_IMAGE_WITH_TAG $POD_NAME' < ${GITHUB_WORKSPACE}/k8s/deploy.yaml | kubectl apply -f - kubectl rollout restart deployment "section-project-deployment" + } setCluster() { diff --git a/k8s/deploy.yaml b/k8s/deploy.yaml index 013f77a..ecb62da 100644 --- a/k8s/deploy.yaml +++ b/k8s/deploy.yaml @@ -18,6 +18,9 @@ spec: - name: console-project image: $FULL_IMAGE_WITH_TAG imagePullPolicy: Always + envFrom: + - secretRef: + name: console-project-env-secret resources: limits: cpu: 2000m