diff --git a/.github/workflows/docker-hub.yml b/.github/workflows/docker-hub.yml index 32f6ee9c..be555de5 100644 --- a/.github/workflows/docker-hub.yml +++ b/.github/workflows/docker-hub.yml @@ -43,7 +43,7 @@ jobs: id: meta uses: docker/metadata-action@v5 with: - images: lasuite/impress-backend + images: lasuite/meet-backend - name: Login to DockerHub if: github.event_name != 'pull_request' @@ -87,7 +87,7 @@ jobs: id: meta uses: docker/metadata-action@v5 with: - images: lasuite/impress-frontend + images: lasuite/meet-frontend - name: Login to DockerHub if: github.event_name != 'pull_request' @@ -104,51 +104,6 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - build-and-push-y-webrtc-signaling: - runs-on: ubuntu-latest - steps: - - - uses: actions/create-github-app-token@v1 - id: app-token - with: - app-id: ${{ secrets.APP_ID }} - private-key: ${{ secrets.PRIVATE_KEY }} - owner: ${{ github.repository_owner }} - repositories: "impress,secrets" - - - name: Checkout repository - uses: actions/checkout@v2 - with: - submodules: recursive - token: ${{ steps.app-token.outputs.token }} - - - name: Load sops secrets - uses: rouja/actions-sops@main - with: - secret-file: secrets/numerique-gouv/impress/secrets.enc.env - age-key: ${{ secrets.SOPS_PRIVATE }} - - - name: Docker meta - id: meta - uses: docker/metadata-action@v5 - with: - images: lasuite/impress-y-webrtc-signaling - - - name: Login to DockerHub - if: github.event_name != 'pull_request' - run: echo "$DOCKER_HUB_PASSWORD" | docker login -u "$DOCKER_HUB_USER" --password-stdin - - - name: Build and push - uses: docker/build-push-action@v5 - with: - context: . - file: ./src/frontend/Dockerfile - target: y-webrtc-signaling - build-args: DOCKER_USER=${{ env.DOCKER_USER }}:-1000 - push: ${{ github.event_name != 'pull_request' }} - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - notify-argocd: needs: - build-and-push-frontend diff --git a/bin/Tiltfile b/bin/Tiltfile index e95e111d..0d228194 100644 --- a/bin/Tiltfile +++ b/bin/Tiltfile @@ -3,7 +3,7 @@ load('ext://namespace', 'namespace_create', 'namespace_inject') namespace_create('impress') docker_build( - 'localhost:5001/impress-backend:latest', + 'localhost:5001/meet-backend:latest', context='..', dockerfile='../Dockerfile', only=['./src/backend', './src/mail', './docker'], @@ -29,7 +29,7 @@ docker_build( ) docker_build( - 'localhost:5001/impress-frontend:latest', + 'localhost:5001/meet-frontend:latest', context='..', dockerfile='../src/frontend/Dockerfile', only=['./src/frontend', './docker', './dockerignore'], @@ -44,12 +44,12 @@ k8s_yaml(local('cd ../src/helm && helmfile -n impress -e dev template .')) migration = ''' set -eu # get k8s pod name from tilt resource name -POD_NAME="$(tilt get kubernetesdiscovery impress-backend -ojsonpath='{.status.pods[0].name}')" +POD_NAME="$(tilt get kubernetesdiscovery meet-backend -ojsonpath='{.status.pods[0].name}')" kubectl -n impress exec "$POD_NAME" -- python manage.py makemigrations ''' cmd_button('Make migration', argv=['sh', '-c', migration], - resource='impress-backend', + resource='meet-backend', icon_name='developer_board', text='Run makemigration', ) @@ -57,12 +57,12 @@ cmd_button('Make migration', pod_migrate = ''' set -eu # get k8s pod name from tilt resource name -POD_NAME="$(tilt get kubernetesdiscovery impress-backend -ojsonpath='{.status.pods[0].name}')" +POD_NAME="$(tilt get kubernetesdiscovery meet-backend -ojsonpath='{.status.pods[0].name}')" kubectl -n impress exec "$POD_NAME" -- python manage.py migrate --no-input ''' cmd_button('Migrate db', argv=['sh', '-c', pod_migrate], - resource='impress-backend', + resource='meet-backend', icon_name='developer_board', text='Run database migration', ) diff --git a/src/helm/env.d/dev/values.impress.yaml.gotmpl b/src/helm/env.d/dev/values.impress.yaml.gotmpl index 8f8768b8..424c1565 100644 --- a/src/helm/env.d/dev/values.impress.yaml.gotmpl +++ b/src/helm/env.d/dev/values.impress.yaml.gotmpl @@ -1,5 +1,5 @@ image: - repository: localhost:5001/impress-backend + repository: localhost:5001/meet-backend pullPolicy: Always tag: "latest" @@ -80,7 +80,7 @@ frontend: - dev image: - repository: localhost:5001/impress-frontend + repository: localhost:5001/meet-frontend pullPolicy: Always tag: "latest" diff --git a/src/helm/env.d/preprod/values.impress.yaml.gotmpl b/src/helm/env.d/preprod/values.impress.yaml.gotmpl index 2cc51acc..e0595613 100644 --- a/src/helm/env.d/preprod/values.impress.yaml.gotmpl +++ b/src/helm/env.d/preprod/values.impress.yaml.gotmpl @@ -1,5 +1,5 @@ image: - repository: lasuite/impress-backend + repository: lasuite/meet-backend pullPolicy: Always tag: "v0.1.0" @@ -113,7 +113,7 @@ backend: frontend: image: - repository: lasuite/impress-frontend + repository: lasuite/meet-frontend pullPolicy: Always tag: "v0.1.0" diff --git a/src/helm/env.d/production/values.impress.yaml.gotmpl b/src/helm/env.d/production/values.impress.yaml.gotmpl index 54aa1e3b..1b45ed45 100644 --- a/src/helm/env.d/production/values.impress.yaml.gotmpl +++ b/src/helm/env.d/production/values.impress.yaml.gotmpl @@ -1,5 +1,5 @@ image: - repository: lasuite/impress-backend + repository: lasuite/meet-backend pullPolicy: Always tag: "v0.1.0" @@ -113,7 +113,7 @@ backend: frontend: image: - repository: lasuite/impress-frontend + repository: lasuite/meet-frontend pullPolicy: Always tag: "v0.1.0" diff --git a/src/helm/env.d/staging/values.impress.yaml.gotmpl b/src/helm/env.d/staging/values.impress.yaml.gotmpl index e3cc75a5..d8d0fc41 100644 --- a/src/helm/env.d/staging/values.impress.yaml.gotmpl +++ b/src/helm/env.d/staging/values.impress.yaml.gotmpl @@ -1,5 +1,5 @@ image: - repository: lasuite/impress-backend + repository: lasuite/meet-backend pullPolicy: Always tag: "main" @@ -113,7 +113,7 @@ backend: frontend: image: - repository: lasuite/impress-frontend + repository: lasuite/meet-frontend pullPolicy: Always tag: "main" diff --git a/src/helm/impress/README.md b/src/helm/impress/README.md index 2b16874e..f1120c85 100644 --- a/src/helm/impress/README.md +++ b/src/helm/impress/README.md @@ -4,34 +4,34 @@ ### General configuration -| Name | Description | Value | -| ------------------------------------------ | ---------------------------------------------------- | ------------------------ | -| `image.repository` | Repository to use to pull impress's container image | `lasuite/impress-backend` | -| `image.tag` | impress's container tag | `latest` | -| `image.pullPolicy` | Container image pull policy | `IfNotPresent` | -| `image.credentials.username` | Username for container registry authentication | | -| `image.credentials.password` | Password for container registry authentication | | -| `image.credentials.registry` | Registry url for which the credentials are specified | | -| `image.credentials.name` | Name of the generated secret for imagePullSecrets | | -| `nameOverride` | Override the chart name | `""` | -| `fullnameOverride` | Override the full application name | `""` | -| `ingress.enabled` | whether to enable the Ingress or not | `false` | -| `ingress.className` | IngressClass to use for the Ingress | `nil` | -| `ingress.host` | Host for the Ingress | `impress.example.com` | -| `ingress.path` | Path to use for the Ingress | `/` | -| `ingress.hosts` | Additional host to configure for the Ingress | `[]` | -| `ingress.tls.enabled` | Weather to enable TLS for the Ingress | `true` | -| `ingress.tls.additional[].secretName` | Secret name for additional TLS config | | -| `ingress.tls.additional[].hosts[]` | Hosts for additional TLS config | | -| `ingress.customBackends` | Add custom backends to ingress | `[]` | -| `ingressAdmin.enabled` | whether to enable the Ingress or not | `false` | -| `ingressAdmin.className` | IngressClass to use for the Ingress | `nil` | -| `ingressAdmin.host` | Host for the Ingress | `impress.example.com` | -| `ingressAdmin.path` | Path to use for the Ingress | `/admin` | -| `ingressAdmin.hosts` | Additional host to configure for the Ingress | `[]` | -| `ingressAdmin.tls.enabled` | Weather to enable TLS for the Ingress | `true` | -| `ingressAdmin.tls.additional[].secretName` | Secret name for additional TLS config | | -| `ingressAdmin.tls.additional[].hosts[]` | Hosts for additional TLS config | | +| Name | Description | Value | +| ------------------------------------------ | ---------------------------------------------------- |------------------------| +| `image.repository` | Repository to use to pull impress's container image | `lasuite/meet-backend` | +| `image.tag` | impress's container tag | `latest` | +| `image.pullPolicy` | Container image pull policy | `IfNotPresent` | +| `image.credentials.username` | Username for container registry authentication | | +| `image.credentials.password` | Password for container registry authentication | | +| `image.credentials.registry` | Registry url for which the credentials are specified | | +| `image.credentials.name` | Name of the generated secret for imagePullSecrets | | +| `nameOverride` | Override the chart name | `""` | +| `fullnameOverride` | Override the full application name | `""` | +| `ingress.enabled` | whether to enable the Ingress or not | `false` | +| `ingress.className` | IngressClass to use for the Ingress | `nil` | +| `ingress.host` | Host for the Ingress | `impress.example.com` | +| `ingress.path` | Path to use for the Ingress | `/` | +| `ingress.hosts` | Additional host to configure for the Ingress | `[]` | +| `ingress.tls.enabled` | Weather to enable TLS for the Ingress | `true` | +| `ingress.tls.additional[].secretName` | Secret name for additional TLS config | | +| `ingress.tls.additional[].hosts[]` | Hosts for additional TLS config | | +| `ingress.customBackends` | Add custom backends to ingress | `[]` | +| `ingressAdmin.enabled` | whether to enable the Ingress or not | `false` | +| `ingressAdmin.className` | IngressClass to use for the Ingress | `nil` | +| `ingressAdmin.host` | Host for the Ingress | `impress.example.com` | +| `ingressAdmin.path` | Path to use for the Ingress | `/admin` | +| `ingressAdmin.hosts` | Additional host to configure for the Ingress | `[]` | +| `ingressAdmin.tls.enabled` | Weather to enable TLS for the Ingress | `true` | +| `ingressAdmin.tls.additional[].secretName` | Secret name for additional TLS config | | +| `ingressAdmin.tls.additional[].hosts[]` | Hosts for additional TLS config | | ### backend @@ -83,7 +83,7 @@ | Name | Description | Value | | ------------------------------------------------------ | ----------------------------------------------------------------------------------- | ------------------------- | -| `frontend.image.repository` | Repository to use to pull impress's frontend container image | `lasuite/impress-frontend` | +| `frontend.image.repository` | Repository to use to pull impress's frontend container image | `lasuite/meet-frontend` | | `frontend.image.tag` | impress's frontend container tag | `latest` | | `frontend.image.pullPolicy` | frontend container image pull policy | `IfNotPresent` | | `frontend.command` | Override the frontend container command | `[]` | diff --git a/src/helm/impress/values.yaml b/src/helm/impress/values.yaml index 60dbbcce..f902ac32 100644 --- a/src/helm/impress/values.yaml +++ b/src/helm/impress/values.yaml @@ -12,7 +12,7 @@ ## @extra image.credentials.registry Registry url for which the credentials are specified ## @extra image.credentials.name Name of the generated secret for imagePullSecrets image: - repository: lasuite/impress-backend + repository: lasuite/meet-backend pullPolicy: IfNotPresent tag: "latest" @@ -206,7 +206,7 @@ frontend: ## @param frontend.image.tag impress's frontend container tag ## @param frontend.image.pullPolicy frontend container image pull policy image: - repository: lasuite/impress-frontend + repository: lasuite/meet-frontend pullPolicy: IfNotPresent tag: "latest"