diff --git a/.github/resources/docker-compose.be-test.yml b/.github/resources/docker-compose.be-test.yml index c256649c1..373c88dc0 100644 --- a/.github/resources/docker-compose.be-test.yml +++ b/.github/resources/docker-compose.be-test.yml @@ -6,7 +6,7 @@ services: restart: unless-stopped depends_on: - mongo - image: infisical/backend:test + image: infisical/infisical:test command: npm run start environment: - NODE_ENV=production diff --git a/.github/values.yaml b/.github/values.yaml index 93aa94767..ff3199fa9 100644 --- a/.github/values.yaml +++ b/.github/values.yaml @@ -1,29 +1,3 @@ -# secretScanningGitApp: -# enabled: false -# deploymentAnnotations: -# secrets.infisical.com/auto-reload: "true" -# image: -# repository: infisical/staging_deployment_secret-scanning-git-app - -frontend: - enabled: true - name: frontend - podAnnotations: {} - deploymentAnnotations: - secrets.infisical.com/auto-reload: "true" - replicaCount: 2 - image: - repository: infisical/staging_deployment_frontend - tag: "latest" - pullPolicy: Always - kubeSecretRef: managed-secret-frontend - service: - annotations: {} - type: ClusterIP - nodePort: "" - -frontendEnvironmentVariables: null - backend: enabled: true name: backend @@ -32,7 +6,7 @@ backend: secrets.infisical.com/auto-reload: "true" replicaCount: 2 image: - repository: infisical/staging_deployment_backend + repository: infisical/staging_infisical tag: "latest" pullPolicy: Always kubeSecretRef: managed-backend-secret @@ -63,7 +37,7 @@ ingress: enabled: true # annotations: # kubernetes.io/ingress.class: "nginx" - # cert-manager.io/issuer: letsencrypt-nginx + # cert-manager.io/issuer: letsencrypt-nginx hostName: gamma.infisical.com ## <- Replace with your own domain frontend: path: / diff --git a/.github/workflows/build-staging-img.yml b/.github/workflows/build-staging-img.yml index f4233c713..6e094871e 100644 --- a/.github/workflows/build-staging-img.yml +++ b/.github/workflows/build-staging-img.yml @@ -2,7 +2,7 @@ name: Build, Publish and Deploy to Gamma on: [workflow_dispatch] jobs: - backend-image: + infisical-image: name: Build backend image runs-on: ubuntu-latest steps: @@ -32,8 +32,9 @@ jobs: project: 64mmf0n610 token: ${{ secrets.DEPOT_PROJECT_TOKEN }} load: true - context: backend - tags: infisical/backend:test + context: . + file: Dockerfile.standalone-infisical + tags: infisical/infisical:test - name: โป Spawn backend container and dependencies run: | docker compose -f .github/resources/docker-compose.be-test.yml up --wait --quiet-pull @@ -49,68 +50,20 @@ jobs: project: 64mmf0n610 token: ${{ secrets.DEPOT_PROJECT_TOKEN }} push: true - context: backend + context: . + file: Dockerfile.standalone-infisical tags: | - infisical/staging_deployment_backend:${{ steps.commit.outputs.short }} - infisical/staging_deployment_backend:latest + infisical/staging_infisical:${{ steps.commit.outputs.short }} + infisical/staging_infisical:latest platforms: linux/amd64,linux/arm64 + build-args: | + POSTHOG_API_KEY=${{ secrets.PUBLIC_POSTHOG_API_KEY }} + INFISICAL_PLATFORM_VERSION=${{ steps.extract_version.outputs.version }} - frontend-image: - name: Build frontend image - runs-on: ubuntu-latest - steps: - - name: โ˜๏ธ Checkout source - uses: actions/checkout@v3 - - name: Save commit hashes for tag - id: commit - uses: pr-mpt/actions-commit-hash@v2 - - name: ๐Ÿ”ง Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - name: ๐Ÿ‹ Login to Docker Hub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Set up Depot CLI - uses: depot/setup-action@v1 - - name: ๐Ÿ“ฆ Build frontend and export to Docker - uses: depot/build-push-action@v1 - with: - load: true - token: ${{ secrets.DEPOT_PROJECT_TOKEN }} - project: 64mmf0n610 - context: frontend - tags: infisical/staging_deployment_frontend:test - build-args: | - POSTHOG_API_KEY=${{ secrets.PUBLIC_POSTHOG_API_KEY }} - NEXT_INFISICAL_PLATFORM_VERSION=${{ steps.extract_version.outputs.version }} - - name: โป Spawn frontend container - run: | - docker run -d --rm --name infisical-frontend-test infisical/staging_deployment_frontend:test - - name: ๐Ÿงช Test frontend image - run: | - ./.github/resources/healthcheck.sh infisical-frontend-test - - name: โป Shut down frontend container - run: | - docker stop infisical-frontend-test - - name: ๐Ÿ—๏ธ Build frontend and push - uses: depot/build-push-action@v1 - with: - project: 64mmf0n610 - push: true - token: ${{ secrets.DEPOT_PROJECT_TOKEN }} - context: frontend - tags: | - infisical/staging_deployment_frontend:${{ steps.commit.outputs.short }} - infisical/staging_deployment_frontend:latest - platforms: linux/amd64,linux/arm64 - build-args: | - POSTHOG_API_KEY=${{ secrets.PUBLIC_POSTHOG_API_KEY }} - NEXT_INFISICAL_PLATFORM_VERSION=${{ steps.extract_version.outputs.version }} gamma-deployment: name: Deploy to gamma runs-on: ubuntu-latest - needs: [frontend-image, backend-image] + needs: [infisical-image] steps: - name: โ˜๏ธ Checkout source uses: actions/checkout@v3 diff --git a/docker-compose.yml b/docker-compose.yml index c6108ea7f..57e5b5b63 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,46 +1,20 @@ version: "3" services: - nginx: - container_name: infisical-nginx - image: nginx - restart: always - ports: - - 80:80 - - 443:443 - volumes: - - ./nginx/default.conf:/etc/nginx/conf.d/default.conf:ro - depends_on: - - frontend - - backend - networks: - - infisical - backend: container_name: infisical-backend restart: unless-stopped depends_on: - mongo - image: infisical/backend + image: infisical/infisical:latest env_file: .env + ports: + - 80:8080 environment: - NODE_ENV=production networks: - infisical - frontend: - container_name: infisical-frontend - restart: unless-stopped - depends_on: - - backend - image: infisical/frontend - env_file: .env - environment: - # - NEXT_PUBLIC_POSTHOG_API_KEY=${POSTHOG_PROJECT_API_KEY} - - INFISICAL_TELEMETRY_ENABLED=${TELEMETRY_ENABLED} - networks: - - infisical - redis: image: redis container_name: infisical-dev-redis diff --git a/docs/self-hosting/configuration/envars.mdx b/docs/self-hosting/configuration/envars.mdx index e348f5b3e..e44efb8c1 100644 --- a/docs/self-hosting/configuration/envars.mdx +++ b/docs/self-hosting/configuration/envars.mdx @@ -3,7 +3,7 @@ title: "All environment variables" description: "Configure your environment variables when self-hosting Infisical." --- -## Backend environment variables +## Environment variables Depending on your chosen self hosted deployment method, you may need to configured at least the required environment variable listed below. Other environment variables are listed below to increase the functionality of your self hosted instance based on your use case. @@ -232,12 +232,3 @@ Infisical uses Sentry to report error logs - -## Frontend environment variables - - diff --git a/docs/self-hosting/deployment-options/fly.io.mdx b/docs/self-hosting/deployment-options/fly.io.mdx index 4f43c9f46..b8c561224 100644 --- a/docs/self-hosting/deployment-options/fly.io.mdx +++ b/docs/self-hosting/deployment-options/fly.io.mdx @@ -31,7 +31,7 @@ primary_region = "iad" MONGO_URL = <> [http_service] - internal_port = 80 + internal_port = 8080 ``` diff --git a/docs/self-hosting/deployment-options/kubernetes-helm.mdx b/docs/self-hosting/deployment-options/kubernetes-helm.mdx index 37383fa82..e0a4f36e6 100644 --- a/docs/self-hosting/deployment-options/kubernetes-helm.mdx +++ b/docs/self-hosting/deployment-options/kubernetes-helm.mdx @@ -23,40 +23,27 @@ helm repo update ## Add Helm values -Create a values.yaml file to configure various installation settings, such as the docker image tags and environment variables for both the frontend and backend. To explore all configurable properties for your values file, [visit this page](https://github.com/Infisical/infisical/tree/main/helm-charts/infisical). +Create a values.yaml file to configure various installation settings, such as the docker image tags and environment variables. To explore all configurable properties for your values file, [visit this page](https://github.com/Infisical/infisical/tree/main/helm-charts/infisical). #### Set image tags -By default, the application will use the latest tag to retrieve the required Docker images, which may be appropriate for most cases. -However, it's important to specify a particular version of Infisical during installation to prevent any significant updates from disrupting your deployment. -View [properties for frontend and backend](https://github.com/Infisical/infisical/tree/main/helm-charts/infisical#parameters). - +By default, the application will use the `latest` docker image tag. This is okay for test environments; however, for production deployments it is important to pin your deployment to a particular docker image tag to prevent receiving unintended changes. - To find the latest version number of Infisical, follow the links below - - [frontend Docker image](https://hub.docker.com/r/infisical/frontend/tags) - - [backend Docker image](https://hub.docker.com/r/infisical/backend/tags) + To find the latest version number of Infisical, click [here](https://hub.docker.com/r/infisical/infisical/tags) ```yaml simple-values-example.yaml -frontend: - name: frontend - replicaCount: 2 - image: - repository: infisical/frontend - tag: "v0.34.2" # <--- frontend version - pullPolicy: Always - backend: replicaCount: 2 image: - repository: infisical/backend - tag: "v0.34.2" # <--- backend version + repository: infisical/infisical + tag: "v0.39.5" pullPolicy: Always ``` #### Configure environment variables -You can configure environment variables for the frontend and backend in your Helm values file under the property `frontendEnvironmentVariables` and `backendEnvironmentVariables` respectively. View configurable [environment variables](../configuration/envars). +You can configure environment variables for your instance of Infisical though the Helm values file under the property `backendEnvironmentVariables`. View configurable [environment variables](../configuration/envars). Infisical requires the following backend environment variables to be defined: _`ENCRYPTION_KEY`_, _`JWT_SIGNUP_SECRET`_, _`JWT_REFRESH_SECRET`_, _`JWT_AUTH_SECRET`_, _`JWT_MFA_SECRET`_ and _`JWT_SERVICE_SECRET`_. @@ -87,38 +74,30 @@ Infisical uses Nginx to route external traffic. You can install Nginx along with ... ingress: nginx: - enabled: false #<-- if you would like to install nginx along with Infisical + enabled: true #<-- if you would like to install nginx along with Infisical ``` #### Database -Infisical uses a document database as its persistence layer. With this Helm chart, you spin up a MongoDB instance power by Bitnami along side other Infisical services in your cluster. +Infisical uses a MongoDB as its persistence layer. With this Helm chart, a MongoDB instance is automatically spun up for use with Infisical. When persistence is enabled, the data will be stored as Kubernetes Persistence Volume. View all [properties for mongodb](https://github.com/Infisical/infisical/tree/main/helm-charts/infisical). ```yaml simple-values-example.yaml mongodb: - enabled: false + enabled: true persistence: enabled: false ``` -To increase data redundancy, we recommend that you use a managed document database service such as AWS Document DB, MongoDB or similar services instead. +To achieve high availability and data redundancy, we recommend that you use a managed document database service such as AWS Document DB, MongoDB or similar services instead of the in cluster database. Managed database connection string can be set in the `backendEnvironmentVariables`. #### Example helm values ```yaml simple-values-example.yaml -frontend: - name: frontend - replicaCount: 2 - image: - repository: infisical/frontend - tag: "v0.34.2" # <--- frontend version - pullPolicy: Always - backend: replicaCount: 2 image: - repository: infisical/backend - tag: "v0.34.2" # <--- backend version + repository: infisical/infisical + tag: "v0.39.5" pullPolicy: Always backendEnvironmentVariables: @@ -126,7 +105,7 @@ backendEnvironmentVariables: ingress: nginx: - enabled: true #<-- if you would like to install nginx along with Infisical + enabled: true ``` @@ -136,22 +115,6 @@ ingress: nginx: enabled: true - frontend: - enabled: true - name: frontend - podAnnotations: {} - deploymentAnnotations: {} - replicaCount: 4 - image: - repository: infisical/frontend - tag: "v0.34.2" # <--- frontend version - pullPolicy: IfNotPresent - kubeSecretRef: null - service: - annotations: {} - type: ClusterIP - nodePort: "" - backend: enabled: true name: backend @@ -159,8 +122,8 @@ ingress: deploymentAnnotations: {} replicaCount: 4 image: - repository: infisical/backend - tag: "v0.34.2" # <--- backend version + repository: infisical/infisical + tag: "v0.39.5" pullPolicy: IfNotPresent kubeSecretRef: null service: @@ -176,26 +139,9 @@ ingress: ## Mongo DB persistence mongodb: - enabled: false - persistence: - enabled: false - - ingress: enabled: true - annotations: - cert-manager.io/cluster-issuer: "letsencrypt-prod" # <-- if you are setting up HTTPS - hostName: app.infisical.com ## <- Replace with your own domain - frontend: - path: / - pathType: Prefix - backend: - path: /api - pathType: Prefix - tls: # <-- if you are setting up HTTPS - - secretName: echo-tls - hosts: - - app.infisical.com - + persistence: + enabled: true ``` diff --git a/docs/self-hosting/deployment-options/standalone-infisical.mdx b/docs/self-hosting/deployment-options/standalone-infisical.mdx index 03f132d69..881697442 100644 --- a/docs/self-hosting/deployment-options/standalone-infisical.mdx +++ b/docs/self-hosting/deployment-options/standalone-infisical.mdx @@ -58,7 +58,7 @@ Add the required environment variables listed below to your docker run command. Once you have added the required environment variables to your docker run command, execute it in your terminal. ```bash -docker run -p 80:80 \ +docker run -p 80:8080 \ -e ENCRYPTION_KEY=f40c9178624764ad85a6830b37ce239a \ -e JWT_SIGNUP_SECRET=38ea90fb7998b92176080f457d890392 \ -e JWT_REFRESH_SECRET=7764c7bbf3928ad501591a3e005eb364 \ diff --git a/helm-charts/infisical/Chart.yaml b/helm-charts/infisical/Chart.yaml index 97fca592e..046fdd1f0 100644 --- a/helm-charts/infisical/Chart.yaml +++ b/helm-charts/infisical/Chart.yaml @@ -7,7 +7,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.3.5 +version: 0.4.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/helm-charts/infisical/README.md b/helm-charts/infisical/README.md index 4aca077a9..46a219a66 100644 --- a/helm-charts/infisical/README.md +++ b/helm-charts/infisical/README.md @@ -4,7 +4,6 @@ This is the Infisical application Helm chart. This chart includes the following | Service | Description | | ---------- | ----------------------------------- | -| `frontend` | Infisical's Web UI | | `backend` | Infisical's API | | `mongodb` | Infisical's database | | `redis` | Infisical's cache service | @@ -59,28 +58,6 @@ kubectl get secrets -n \ | `nameOverride` | Override release name | `""` | | `fullnameOverride` | Override release fullname | `""` | -### Infisical frontend parameters - -| Name | Description | Value | -| --------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------- | -| `frontend.enabled` | Enable frontend | `true` | -| `frontend.name` | Frontend name | `frontend` | -| `frontend.fullnameOverride` | Frontend fullnameOverride | `""` | -| `frontend.podAnnotations` | Frontend pod annotations | `{}` | -| `frontend.deploymentAnnotations` | Frontend deployment annotations | `{}` | -| `frontend.replicaCount` | Frontend replica count | `2` | -| `frontend.image.repository` | Frontend image repository | `infisical/frontend` | -| `frontend.image.tag` | Frontend image tag | `latest` | -| `frontend.image.pullPolicy` | Frontend image pullPolicy | `IfNotPresent` | -| `frontend.resources.limits.memory` | container memory limit [check the offical kubernetes documentations](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) | `100Mi` | -| `frontend.resources.requests.cpu` | container CPU request [check the offical kubernetes documentations](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) | `100m` | -| `frontend.affinity` | Frontend pod affinity | `{}` | -| `frontend.kubeSecretRef` | Backend secret resource reference name (containing required [frontend configuration variables](https://infisical.com/docs/self-hosting/configuration/envars)) | `""` | -| `frontend.service.annotations` | Backend service annotations | `{}` | -| `frontend.service.type` | Backend service type | `ClusterIP` | -| `frontend.service.nodePort` | Backend service nodePort (used if above type is `NodePort`) | `""` | -| `frontendEnvironmentVariables.SITE_URL` | Absolute URL including the protocol (e.g. https://app.infisical.com) | `infisical.local` | - ### Infisical backend parameters | Name | Description | Value | @@ -91,11 +68,9 @@ kubectl get secrets -n \ | `backend.podAnnotations` | Backend pod annotations | `{}` | | `backend.deploymentAnnotations` | Backend deployment annotations | `{}` | | `backend.replicaCount` | Backend replica count | `2` | -| `backend.image.repository` | Backend image repository | `infisical/backend` | +| `backend.image.repository` | Backend image repository | `infisical/infisical` | | `backend.image.tag` | Backend image tag | `latest` | | `backend.image.pullPolicy` | Backend image pullPolicy | `IfNotPresent` | -| `backend.resources.limits.memory` | container memory limit [check the offical kubernetes documentations](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) | `200Mi` | -| `backend.resources.requests.cpu` | container CPU request [check the offical kubernetes documentations](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) | `150m` | | `backend.affinity` | Backend pod affinity | `{}` | | `backend.kubeSecretRef` | Backend secret resource reference name (containing required [backend configuration variables](https://infisical.com/docs/self-hosting/configuration/envars)) | `""` | | `backend.service.annotations` | Backend service annotations | `{}` | @@ -197,6 +172,7 @@ kubectl get secrets -n \ + ## Persistence The database persistence is enabled by default, your volumes will remain on your cluster even after uninstalling the chart. To disable persistence, set this value `mongodb.persistence.enabled: false` diff --git a/helm-charts/infisical/templates/NOTES.txt b/helm-charts/infisical/templates/NOTES.txt index 103ec9a5b..a5f3cd005 100644 --- a/helm-charts/infisical/templates/NOTES.txt +++ b/helm-charts/infisical/templates/NOTES.txt @@ -2,34 +2,6 @@ -- Infisical Helm Chart -- - __ __ - ( _) ( _) - / / \\ / /\_\_ - / / \\ / / | \ \ - / / \\ / / |\ \ \ - / / , \ , / / /| \ \ - / / |\_ /| / / / \ \_\ - / / |\/ _ '_|\ / / / \ \\ - | / |/ 0 \0\\ / | | \ \\ - | |\| \_\_ / / | \ \\ - | | |/ \.\ o\o) / \ | \\ - \ | /\\`v-v / | | \\ - | \/ /_| \\_| / | | \ \\ - | | /__/_ / _____ | | \ \\ - \| [__] \_/ |_________ \ | \ () - / [___] ( \ \ |\ | | // - | [___] |\| \| / |/ - /| [____] \ |/\ / / || - ( \ [____ / ) _\ \ \ \| | || - \ \ [_____| / / __/ \ / / // - | \ [_____/ / / \ | \/ // - | / '----| /=\____ _/ | / // - __ / / | / ___/ _/\ \ | || - (/-(/-\) / \ (/\/\)/ | / | / - (/\/\) / / // - _________/ / / - \____________/ ( - โ–ˆโ–ˆโ•—โ–ˆโ–ˆโ–ˆโ•— โ–ˆโ–ˆโ•—โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ•—โ–ˆโ–ˆโ•—โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ•—โ–ˆโ–ˆโ•— โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ•— โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ•— โ–ˆโ–ˆโ•— โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ–ˆโ–ˆโ•— โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•”โ•โ•โ•โ•โ•โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•”โ•โ•โ•โ•โ•โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•”โ•โ•โ•โ•โ•โ–ˆโ–ˆโ•”โ•โ•โ–ˆโ–ˆโ•—โ–ˆโ–ˆโ•‘ โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•”โ–ˆโ–ˆโ•— โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ•— โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ•—โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•‘ โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•‘ @@ -46,7 +18,6 @@ โ”‚ Visit < https://infisical.com/docs/self-hosting/overview > for further documentation about self-hosting! โ”‚ โ”‚ Current installation (infisical) : -โ”‚ โ€ข infisical-frontend : {{ .Values.frontend.enabled }} โ”‚ โ€ข infisical-backend : {{ .Values.backend.enabled }} โ”‚ โ€ข mongodb : {{ .Values.mongodb.enabled }} โ”‚ โ€ข mailhog : {{ .Values.mailhog.enabled }} diff --git a/helm-charts/infisical/templates/_helpers.tpl b/helm-charts/infisical/templates/_helpers.tpl index 500edea33..40180896f 100644 --- a/helm-charts/infisical/templates/_helpers.tpl +++ b/helm-charts/infisical/templates/_helpers.tpl @@ -41,16 +41,6 @@ component: {{ .Values.backend.name | quote }} {{ include "infisical.common.matchLabels" . }} {{- end -}} -{{- define "infisical.frontend.labels" -}} -{{ include "infisical.frontend.matchLabels" . }} -{{ include "infisical.common.metaLabels" . }} -{{- end -}} - -{{- define "infisical.frontend.matchLabels" -}} -component: {{ .Values.frontend.name | quote }} -{{ include "infisical.common.matchLabels" . }} -{{- end -}} - {{- define "infisical.mongodb.labels" -}} {{ include "infisical.mongodb.matchLabels" . }} {{ include "infisical.common.metaLabels" . }} @@ -78,22 +68,6 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this {{- end -}} {{- end -}} -{{/* -Create a fully qualified frontend name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -*/}} -{{- define "infisical.frontend.fullname" -}} -{{- if .Values.frontend.fullnameOverride -}} -{{- .Values.frontend.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} -{{- printf "%s-%s" .Release.Name .Values.frontend.name | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s-%s" .Release.Name $name .Values.frontend.name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} -{{- end -}} {{/* Create a fully qualified mongodb name. diff --git a/helm-charts/infisical/templates/backend-deployment.yaml b/helm-charts/infisical/templates/backend-deployment.yaml index 86c00c1bc..0c7f3c903 100644 --- a/helm-charts/infisical/templates/backend-deployment.yaml +++ b/helm-charts/infisical/templates/backend-deployment.yaml @@ -36,17 +36,17 @@ spec: readinessProbe: httpGet: path: /api/status - port: 4000 - initialDelaySeconds: 10 - periodSeconds: 10 + port: 8080 + initialDelaySeconds: 50 + periodSeconds: 30 ports: - - containerPort: 4000 + - containerPort: 8080 envFrom: - secretRef: name: {{ $backend.kubeSecretRef | default (include "infisical.backend.fullname" .) }} - {{- if $backend.resources }} - resources: {{- toYaml $backend.resources | nindent 12 }} - {{- end }} + # {{- if $backend.resources }} + # resources: {{- toYaml $backend.resources | nindent 12 }} + # {{- end }} --- apiVersion: v1 @@ -65,8 +65,8 @@ spec: {{- include "infisical.backend.matchLabels" . | nindent 8 }} ports: - protocol: TCP - port: 4000 - targetPort: 4000 # container port + port: 8080 + targetPort: 8080 # container port {{- if eq $backend.service.type "NodePort" }} nodePort: {{ $backend.service.nodePort }} {{- end }} diff --git a/helm-charts/infisical/templates/frontend-deployment.yaml b/helm-charts/infisical/templates/frontend-deployment.yaml deleted file mode 100644 index 043a94263..000000000 --- a/helm-charts/infisical/templates/frontend-deployment.yaml +++ /dev/null @@ -1,94 +0,0 @@ -{{- $frontend := .Values.frontend }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "infisical.frontend.fullname" . }} - annotations: - updatedAt: {{ now | date "2006-01-01 MST 15:04:05" | quote }} - {{- with .Values.frontend.deploymentAnnotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - labels: - {{- include "infisical.frontend.labels" . | nindent 4 }} -spec: - replicas: {{ $frontend.replicaCount }} - selector: - matchLabels: - {{- include "infisical.frontend.matchLabels" . | nindent 6 }} - template: - metadata: - labels: - {{- include "infisical.frontend.matchLabels" . | nindent 8 }} - annotations: - updatedAt: {{ now | date "2006-01-01 MST 15:04:05" | quote }} - {{- with $frontend.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - {{- with $frontend.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ template "infisical.name" . }}-{{ $frontend.name }} - image: "{{ $frontend.image.repository }}:{{ $frontend.image.tag | default "latest" }}" - imagePullPolicy: {{ $frontend.image.pullPolicy }} - readinessProbe: - httpGet: - path: / - port: 3000 - initialDelaySeconds: 10 - periodSeconds: 10 - envFrom: - - secretRef: - name: {{ $frontend.kubeSecretRef | default (include "infisical.frontend.fullname" .) }} - ports: - - containerPort: 3000 - {{- if $frontend.resources }} - resources: {{- toYaml $frontend.resources | nindent 12 }} - {{- end }} ---- - -apiVersion: v1 -kind: Service -metadata: - name: {{ include "infisical.frontend.fullname" . }} - labels: - {{- include "infisical.frontend.labels" . | nindent 4 }} - {{- with $frontend.service.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - type: {{ $frontend.service.type }} - selector: - {{- include "infisical.frontend.matchLabels" . | nindent 8 }} - ports: - - protocol: TCP - port: 3000 # service - targetPort: 3000 # container port - {{- if eq $frontend.service.type "NodePort" }} - nodePort: {{ $frontend.service.nodePort }} - {{- end }} - ---- - -{{ if not $frontend.kubeSecretRef }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "infisical.frontend.fullname" . }} - annotations: - "helm.sh/resource-policy": "keep" -type: Opaque -stringData: - {{- $requiredVars := dict }} - {{- $secretObj := (lookup "v1" "Secret" .Release.Namespace (include "infisical.frontend.fullname" .)) | default dict }} - {{- $secretData := (get $secretObj "data") | default dict }} - {{ range $key, $value := .Values.frontendEnvironmentVariables }} - {{- $default := get $requiredVars $key -}} - {{- $current := get $secretData $key | b64dec -}} - {{- $v := $value | default ($current | default $default) -}} - {{ $key }}: {{ $v | quote }} - {{ end -}} -{{- end }} \ No newline at end of file diff --git a/helm-charts/infisical/templates/ingress.yaml b/helm-charts/infisical/templates/ingress.yaml index 659948510..ab5253ca6 100644 --- a/helm-charts/infisical/templates/ingress.yaml +++ b/helm-charts/infisical/templates/ingress.yaml @@ -30,27 +30,20 @@ spec: rules: - http: paths: - - path: {{ $ingress.frontend.path }} - pathType: {{ $ingress.frontend.pathType }} - backend: - service: - name: {{ include "infisical.frontend.fullname" . }} - port: - number: 3000 - - path: {{ $ingress.backend.path }} - pathType: {{ $ingress.backend.pathType }} + - path: / + pathType: Prefix backend: service: name: {{ include "infisical.backend.fullname" . }} port: - number: 4000 + number: 8080 - path: /ss-webhook pathType: Exact backend: service: name: {{ include "infisical.backend.fullname" . }} port: - number: 4000 + number: 8080 {{- if $ingress.hostName }} host: {{ $ingress.hostName }} {{- end }} diff --git a/helm-charts/infisical/values.yaml b/helm-charts/infisical/values.yaml index 12706c56b..70fca908d 100644 --- a/helm-charts/infisical/values.yaml +++ b/helm-charts/infisical/values.yaml @@ -8,76 +8,6 @@ nameOverride: "" ## fullnameOverride: "" -## @section Infisical frontend parameters -## Documentation : https://infisical.com/docs/self-hosting/deployments/kubernetes -## - -frontend: - ## @param frontend.enabled Enable frontend - ## - enabled: true - ## @param frontend.name Frontend name - ## - name: frontend - ## @param frontend.fullnameOverride Frontend fullnameOverride - ## - fullnameOverride: "" - ## @param frontend.podAnnotations Frontend pod annotations - ## - podAnnotations: {} - ## @param frontend.deploymentAnnotations Frontend deployment annotations - ## - deploymentAnnotations: {} - ## @param frontend.replicaCount Frontend replica count - ## - replicaCount: 2 - ## Frontend image parameters - ## - image: - ## @param frontend.image.repository Frontend image repository - ## - repository: infisical/frontend - ## @param frontend.image.tag Frontend image tag - ## - tag: "latest" - ## @param frontend.image.pullPolicy Frontend image pullPolicy - ## - pullPolicy: IfNotPresent - ## @param frontend.resources.limits.memory container memory limit [check the offical kubernetes documentations](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) - ## @param frontend.resources.requests.cpu container CPU request [check the offical kubernetes documentations](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) - ## - resources: - limits: - memory: 100Mi - requests: - cpu: 100m - ## @param frontend.affinity Frontend pod affinity - ## - affinity: {} - ## @param frontend.kubeSecretRef Backend secret resource reference name (containing required [frontend configuration variables](https://infisical.com/docs/self-hosting/configuration/envars)) - ## - kubeSecretRef: "" - ## Frontend service - ## - service: - ## @param frontend.service.annotations Backend service annotations - ## - annotations: {} - ## @param frontend.service.type Backend service type - ## - type: ClusterIP - ## @param frontend.service.nodePort Backend service nodePort (used if above type is `NodePort`) - ## - nodePort: "" - -## Frontend variables configuration -## Documentation : https://infisical.com/docs/self-hosting/configuration/envars -## -frontendEnvironmentVariables: - ## @param frontendEnvironmentVariables.SITE_URL Absolute URL including the protocol (e.g. https://app.infisical.com) - ## - SITE_URL: infisical.local - ## @section Infisical backend parameters ## Documentation : https://infisical.com/docs/self-hosting/deployments/kubernetes ## @@ -106,21 +36,13 @@ backend: image: ## @param backend.image.repository Backend image repository ## - repository: infisical/backend + repository: infisical/infisical ## @param backend.image.tag Backend image tag ## tag: "latest" ## @param backend.image.pullPolicy Backend image pullPolicy ## pullPolicy: IfNotPresent - ## @param backend.resources.limits.memory container memory limit [check the offical kubernetes documentations](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) - ## @param backend.resources.requests.cpu container CPU request [check the offical kubernetes documentations](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) - ## - resources: - limits: - memory: 200Mi - requests: - cpu: 150m ## @param backend.affinity Backend pod affinity ## affinity: {} @@ -349,16 +271,6 @@ ingress: ## Replace with your own domain ## hostName: "" - ## @skip ingress.frontend - ## - frontend: - path: / - pathType: Prefix - ## @skip ingress.backend - ## - backend: - path: /api - pathType: Prefix ## @param ingress.tls Ingress TLS hosts (matching above hostName) ## Replace with your own domain ##