diff --git a/.github/workflows/pr-to-master.yml b/.github/workflows/pr-to-master.yml index a4eef87b54..989f239320 100644 --- a/.github/workflows/pr-to-master.yml +++ b/.github/workflows/pr-to-master.yml @@ -55,7 +55,7 @@ jobs: echo "Pull Request URL - ${{ steps.cpr.outputs.pr_url }}" - name: automerge if: ${{ github.event.inputs.targetEnv == 'PROD' || inputs.targetEnv == 'PROD' }} - uses: "pascalgn/automerge-action@v0.14.3" + uses: "pascalgn/automerge-action@v0.15.5" env: GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" PULL_REQUEST: "${{ steps.cpr.outputs.pr_number }}" diff --git a/.github/workflows/release-executables.yml b/.github/workflows/release-executables.yml index fff82b1e69..c05211abe8 100644 --- a/.github/workflows/release-executables.yml +++ b/.github/workflows/release-executables.yml @@ -21,14 +21,6 @@ jobs: build-executables: runs-on: ubuntu-latest steps: - # Get the latest draft release for asset upload url - - uses: cardinalby/git-get-release-action@v1 - id: get_release - env: - GITHUB_TOKEN: ${{ secrets.NC_GITHUB_TOKEN }} - with: - latest: 1 - draft: true - uses: actions/checkout@v3 - name: Cache node modules id: cache-npm @@ -107,54 +99,25 @@ jobs: mv ./dist/Noco-macos-arm64 ./mac-dist/ mv ./dist/Noco-macos-x64 ./mac-dist/ - - name: Upload win-arm64 build to asset + - name: Upload executables to asset id: upload-release-asset - uses: actions/upload-release-asset@v1 + uses: softprops/action-gh-release@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - upload_url: ${{ steps.get_release.outputs.upload_url }} - asset_path: ./scripts/pkg-executable/dist/Noco-win-arm64.exe - asset_name: Noco-win-arm64.exe - asset_content_type: application/octet-stream - - - name: Upload win-x64 build to asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.get_release.outputs.upload_url }} - asset_path: ./scripts/pkg-executable/dist/Noco-win-x64.exe - asset_name: Noco-win-x64.exe - asset_content_type: application/octet-stream - - - name: Upload linux-arm64 build to asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.get_release.outputs.upload_url }} - asset_path: ./scripts/pkg-executable/dist/Noco-linux-arm64 - asset_name: Noco-linux-arm64 - asset_content_type: application/octet-stream - - - name: Upload linux-x64 build to asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.get_release.outputs.upload_url }} - asset_path: ./scripts/pkg-executable/dist/Noco-linux-x64 - asset_name: Noco-linux-x64 - asset_content_type: application/octet-stream + draft: true + tag_name: ${{ github.event.inputs.tag || inputs.tag }} + files: | + ./scripts/pkg-executable/dist/Noco-win-arm64.exe + ./scripts/pkg-executable/dist/Noco-win-x64.exe + ./scripts/pkg-executable/dist/Noco-linux-arm64 + ./scripts/pkg-executable/dist/Noco-linux-x64 - uses: actions/upload-artifact@master with: name: ${{ github.event.inputs.tag || inputs.tag }} path: scripts/pkg-executable/mac-dist retention-days: 1 - outputs: - upload_url: ${{ steps.get_release.outputs.upload_url }} sign-mac-executables: runs-on: macos-latest needs: build-executables @@ -205,40 +168,17 @@ jobs: id: compress - - name: Upload macos-x64 build to asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ needs.build-executables.outputs.upload_url }} - asset_path: ./scripts/pkg-executable/mac-dist/Noco-macos-x64 - asset_name: Noco-macos-x64 - asset_content_type: application/octet-stream - - - - - name: Upload macos-arm64 build to asset - uses: actions/upload-release-asset@v1 + - name: Upload macos executable to asset + uses: softprops/action-gh-release@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - upload_url: ${{ needs.build-executables.outputs.upload_url }} - asset_path: ./scripts/pkg-executable/mac-dist/Noco-macos-arm64 - asset_name: Noco-macos-arm64 - asset_content_type: application/octet-stream - - - - - name: Upload macos compressed build(for homebrew) to asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ needs.build-executables.outputs.upload_url }} - asset_path: ./scripts/pkg-executable/mac-dist/nocodb.tar.gz - asset_name: nocodb.tar.gz - asset_content_type: application/octet-stream - + draft: true + tag_name: ${{ github.event.inputs.tag || inputs.tag }} + files: | + ./scripts/pkg-executable/mac-dist/Noco-macos-x64 + ./scripts/pkg-executable/mac-dist/Noco-macos-arm64 + ./scripts/pkg-executable/mac-dist/nocodb.tar.gz - name: Generate Homebrew Formula class and push run: | @@ -267,7 +207,3 @@ jobs: git commit ./Formula/nocodb.rb -m "Automatic publish" git push - - - - diff --git a/.github/workflows/release-npm.yml b/.github/workflows/release-npm.yml index 4da1dd71e5..55ec46d9af 100644 --- a/.github/workflows/release-npm.yml +++ b/.github/workflows/release-npm.yml @@ -68,7 +68,7 @@ jobs: - name: Create Pull Request if: ${{ github.event.inputs.targetEnv == 'PROD' || inputs.targetEnv == 'PROD' }} id: cpr - uses: peter-evans/create-pull-request@v3 + uses: peter-evans/create-pull-request@v4.2.3 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: @@ -84,7 +84,7 @@ jobs: echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}" - name: automerge if: ${{ github.event.inputs.targetEnv == 'PROD' || inputs.targetEnv == 'PROD' }} - uses: "pascalgn/automerge-action@v0.14.3" + uses: "pascalgn/automerge-action@v0.15.5" env: GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" PULL_REQUEST: "${{ steps.cpr.outputs.pull-request-number }}" diff --git a/.github/workflows/release-pr.yml b/.github/workflows/release-pr.yml index 4a9a56b537..d29e6b7a17 100644 --- a/.github/workflows/release-pr.yml +++ b/.github/workflows/release-pr.yml @@ -33,7 +33,7 @@ jobs: # Get current PR number PR_NUMBER=${{github.event.number}} # Get current version - CURRENT_VERSION=$(curl -fs https://docs.nocodb.com/releases | grep article | grep div | grep h2 | grep 'id\="[^"]*' -o | cut -c 5-) + CURRENT_VERSION=$(curl -fs https://docs.nocodb.com/releases | grep article | grep div | grep h2 | grep 'id\="[^"]*' -o | cut -c 5- | cut -d\: -f1) # Construct tag name TAG_NAME=pr-${PR_NUMBER}-${CURRENT_DATE}-${CURRENT_TIME} echo "TARGET_TAG=${TAG_NAME}" >> $GITHUB_OUTPUT @@ -72,14 +72,14 @@ jobs: DOCKERHUB_TOKEN: "${{ secrets.DOCKERHUB_TOKEN }}" # Build executables and publish to GitHub - release-executables: - if: ${{ github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]' && github.event.pull_request.draft == false && github.base_ref == 'develop' && github.event.action != 'closed' }} - needs: [set-tag, release-npm] - uses: ./.github/workflows/release-timely-executables.yml - with: - tag: ${{ needs.set-tag.outputs.current_version }}-${{ needs.set-tag.outputs.target_tag }} - secrets: - NC_GITHUB_TOKEN: "${{ secrets.NC_GITHUB_TOKEN }}" + # release-executables: + # if: ${{ github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]' && github.event.pull_request.draft == false && github.base_ref == 'develop' && github.event.action != 'closed' }} + # needs: [set-tag, release-npm] + # uses: ./.github/workflows/release-timely-executables.yml + # with: + # tag: ${{ needs.set-tag.outputs.current_version }}-${{ needs.set-tag.outputs.target_tag }} + # secrets: + # NC_GITHUB_TOKEN: "${{ secrets.NC_GITHUB_TOKEN }}" # Add a comment for PR docker build leave-comment: @@ -132,40 +132,40 @@ jobs: retention-days: 2 # Add a comment for PR executable build - leave-executable-comment: - if: ${{ github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]' && github.event.pull_request.draft == false && github.base_ref == 'develop' && github.event.action != 'closed' }} - runs-on: 'ubuntu-latest' - needs: [release-executables, set-tag] - steps: - - uses: peter-evans/commit-comment@v2 - with: - body: | - ### Run Executables + # leave-executable-comment: + # if: ${{ github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]' && github.event.pull_request.draft == false && github.base_ref == 'develop' && github.event.action != 'closed' }} + # runs-on: 'ubuntu-latest' + # needs: [release-executables, set-tag] + # steps: + # - uses: peter-evans/commit-comment@v2 + # with: + # body: | + # ### Run Executables - #### MacOS + # #### MacOS - ```bash - mkdir -p ./${{ needs.set-tag.outputs.current_version }}/${{ needs.set-tag.outputs.target_tag }} && cd "$_" \ - && curl http://dl.nocodb.com/${{ needs.set-tag.outputs.current_version }}-${{ needs.set-tag.outputs.target_tag }}/Noco-macos-arm64 -o noco -L \ - && chmod +x noco \ - && ./noco - ``` - #### Linux + # ```bash + # mkdir -p ./${{ needs.set-tag.outputs.current_version }}/${{ needs.set-tag.outputs.target_tag }} && cd "$_" \ + # && curl http://dl.nocodb.com/${{ needs.set-tag.outputs.current_version }}-${{ needs.set-tag.outputs.target_tag }}/Noco-macos-arm64 -o noco -L \ + # && chmod +x noco \ + # && ./noco + # ``` + # #### Linux - ```bash - mkdir -p ./${{ needs.set-tag.outputs.current_version }}/${{ needs.set-tag.outputs.target_tag }} && cd "$_" \ - && curl http://dl.nocodb.com/${{ needs.set-tag.outputs.current_version }}-${{ needs.set-tag.outputs.target_tag }}/Noco-linux-x64 -o noco -L \ - && chmod +x noco \ - && ./noco - ``` - #### Windows + # ```bash + # mkdir -p ./${{ needs.set-tag.outputs.current_version }}/${{ needs.set-tag.outputs.target_tag }} && cd "$_" \ + # && curl http://dl.nocodb.com/${{ needs.set-tag.outputs.current_version }}-${{ needs.set-tag.outputs.target_tag }}/Noco-linux-x64 -o noco -L \ + # && chmod +x noco \ + # && ./noco + # ``` + # #### Windows - ```bash - iwr http://dl.nocodb.com/${{ needs.set-tag.outputs.current_version }}-${{ needs.set-tag.outputs.target_tag }}/Noco-win-arm64.exe - .\Noco-win-arm64.exe - ``` + # ```bash + # iwr http://dl.nocodb.com/${{ needs.set-tag.outputs.current_version }}-${{ needs.set-tag.outputs.target_tag }}/Noco-win-arm64.exe + # .\Noco-win-arm64.exe + # ``` - For executables visit [here](https://github.com/nocodb/nocodb-timely/releases/tag/${{ needs.set-tag.outputs.current_version }}-${{ needs.set-tag.outputs.target_tag }}) + # For executables visit [here](https://github.com/nocodb/nocodb-timely/releases/tag/${{ needs.set-tag.outputs.current_version }}-${{ needs.set-tag.outputs.target_tag }}) # delete the uffizzi preview created off of this PR delete-uffizzi-preview: diff --git a/.github/workflows/update-sdk-path.yml b/.github/workflows/update-sdk-path.yml index fed2a4e22e..b71bf2010b 100644 --- a/.github/workflows/update-sdk-path.yml +++ b/.github/workflows/update-sdk-path.yml @@ -27,7 +27,7 @@ jobs: - name: Create Pull Request id: cpr - uses: peter-evans/create-pull-request@v3 + uses: peter-evans/create-pull-request@v4.2.3 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: @@ -41,7 +41,7 @@ jobs: echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}" echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}" - name: automerge - uses: "pascalgn/automerge-action@v0.14.3" + uses: "pascalgn/automerge-action@v0.15.5" env: GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" PULL_REQUEST: "${{ steps.cpr.outputs.pull-request-number }}" diff --git a/charts/nocodb/.gitignore b/charts/nocodb/.gitignore new file mode 100644 index 0000000000..f791801bca --- /dev/null +++ b/charts/nocodb/.gitignore @@ -0,0 +1,2 @@ +charts/ +Chart.lock diff --git a/charts/nocodb/.helmignore b/charts/nocodb/.helmignore new file mode 100644 index 0000000000..0e8a0eb36f --- /dev/null +++ b/charts/nocodb/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/charts/nocodb/Chart.yaml b/charts/nocodb/Chart.yaml new file mode 100644 index 0000000000..db58bf049b --- /dev/null +++ b/charts/nocodb/Chart.yaml @@ -0,0 +1,12 @@ +apiVersion: v2 +appVersion: 0.100.2 +dependencies: +- condition: postgresql.enabled + name: postgresql + repository: https://charts.bitnami.com/bitnami + version: ~11.6.6 +description: A Helm chart for Kubernetes +maintainers: [] +name: nocodb +type: application +version: 0.3.0 diff --git a/charts/nocodb/templates/NOTES.txt b/charts/nocodb/templates/NOTES.txt new file mode 100644 index 0000000000..0594ffd042 --- /dev/null +++ b/charts/nocodb/templates/NOTES.txt @@ -0,0 +1,22 @@ +1. Get the application URL by running these commands: +{{- if .Values.ingress.enabled }} +{{- range $host := .Values.ingress.hosts }} + {{- range .paths }} + http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }} + {{- end }} +{{- end }} +{{- else if contains "NodePort" .Values.service.type }} + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "nocodb.fullname" . }}) + export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") + echo http://$NODE_IP:$NODE_PORT +{{- else if contains "LoadBalancer" .Values.service.type }} + NOTE: It may take a few minutes for the LoadBalancer IP to be available. + You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "nocodb.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "nocodb.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + echo http://$SERVICE_IP:{{ .Values.service.port }} +{{- else if contains "ClusterIP" .Values.service.type }} + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "nocodb.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT +{{- end }} diff --git a/charts/nocodb/templates/_helpers.tpl b/charts/nocodb/templates/_helpers.tpl new file mode 100644 index 0000000000..6a5723a0df --- /dev/null +++ b/charts/nocodb/templates/_helpers.tpl @@ -0,0 +1,82 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "nocodb.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "nocodb.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "nocodb.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "nocodb.labels" -}} +helm.sh/chart: {{ include "nocodb.chart" . }} +{{ include "nocodb.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "nocodb.selectorLabels" -}} +app.kubernetes.io/name: {{ include "nocodb.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "nocodb.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "nocodb.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} + +{{- define "postgresHost" -}} +{{- printf "%s-postgresql" .Release.Name }} +{{- end }} + +{{- define "postgresDatabase" -}} +{{- .Values.postgresql.auth.database }} +{{- end }} + +{{- define "postgresUsername" -}} +{{- .Values.postgresql.auth.username }} +{{- end }} + +{{- define "postgresPassword" -}} +{{- .Values.postgresql.auth.password }} +{{- end }} + +{{- define "databaseUri" -}} +{{- printf "pg://%s:5432?u=%s&p=%s&d=%s" (include "postgresHost" .) (include "postgresUsername" .) (include "postgresPassword" .) (include "postgresDatabase" .) }} +{{- end }} diff --git a/charts/nocodb/templates/configmap.yaml b/charts/nocodb/templates/configmap.yaml new file mode 100644 index 0000000000..ef83a94612 --- /dev/null +++ b/charts/nocodb/templates/configmap.yaml @@ -0,0 +1,13 @@ +{{- if .Values.extraEnvs }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "nocodb.fullname" . }} + labels: + {{- include "nocodb.labels" . | nindent 4 }} +data: +{{- range $key, $value := .Values.extraEnvs }} + {{ $key }}: |- + {{- $value | nindent 4 }} +{{- end }} +{{- end }} diff --git a/charts/nocodb/templates/deployment.yaml b/charts/nocodb/templates/deployment.yaml new file mode 100644 index 0000000000..582d365df8 --- /dev/null +++ b/charts/nocodb/templates/deployment.yaml @@ -0,0 +1,73 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "nocodb.fullname" . }} + labels: + {{- include "nocodb.labels" . | nindent 4 }} +spec: + {{- if not .Values.autoscaling.enabled }} + replicas: {{ .Values.replicaCount }} + {{- end }} + selector: + matchLabels: + {{- include "nocodb.selectorLabels" . | nindent 6 }} + template: + metadata: + {{- with .Values.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- include "nocodb.selectorLabels" . | nindent 8 }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "nocodb.serviceAccountName" . }} + securityContext: + {{- toYaml .Values.podSecurityContext | nindent 8 }} + containers: + - name: {{ .Chart.Name }} + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + volumeMounts: + - name: {{ include "nocodb.fullname" . }} + mountPath: /usr/app/data + envFrom: + - configMapRef: + name: {{ include "nocodb.fullname" . }} + - secretRef: + name: {{ include "nocodb.fullname" . }} + ports: + - name: http + containerPort: 8080 + protocol: TCP + livenessProbe: + httpGet: + path: / + port: http + readinessProbe: + httpGet: + path: / + port: http + resources: + {{- toYaml .Values.resources | nindent 12 }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} + volumes: + - name: {{ include "nocodb.fullname" . }} + persistentVolumeClaim: + claimName: {{ include "nocodb.fullname" . }} diff --git a/charts/nocodb/templates/hpa.yaml b/charts/nocodb/templates/hpa.yaml new file mode 100644 index 0000000000..d09679632c --- /dev/null +++ b/charts/nocodb/templates/hpa.yaml @@ -0,0 +1,28 @@ +{{- if .Values.autoscaling.enabled }} +apiVersion: autoscaling/v2beta1 +kind: HorizontalPodAutoscaler +metadata: + name: {{ include "nocodb.fullname" . }} + labels: + {{- include "nocodb.labels" . | nindent 4 }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include "nocodb.fullname" . }} + minReplicas: {{ .Values.autoscaling.minReplicas }} + maxReplicas: {{ .Values.autoscaling.maxReplicas }} + metrics: + {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} + - type: Resource + resource: + name: cpu + targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} + {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} + - type: Resource + resource: + name: memory + targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + {{- end }} +{{- end }} diff --git a/charts/nocodb/templates/ingress.yaml b/charts/nocodb/templates/ingress.yaml new file mode 100644 index 0000000000..86dd9bc2f8 --- /dev/null +++ b/charts/nocodb/templates/ingress.yaml @@ -0,0 +1,61 @@ +{{- if .Values.ingress.enabled -}} +{{- $fullName := include "nocodb.fullname" . -}} +{{- $svcPort := .Values.ingress.port -}} +{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} + {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} + {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} + {{- end }} +{{- end }} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1beta1 +{{- else -}} +apiVersion: extensions/v1beta1 +{{- end }} +kind: Ingress +metadata: + name: {{ $fullName }} + labels: + {{- include "nocodb.labels" . | nindent 4 }} + {{- with .Values.ingress.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} + ingressClassName: {{ .Values.ingress.className }} + {{- end }} + {{- if .Values.ingress.tls }} + tls: + {{- range .Values.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} + {{- end }} + rules: + {{- range .Values.ingress.hosts }} + - host: {{ .host | quote }} + http: + paths: + {{- range .paths }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} + backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} + serviceName: {{ $fullName }} + servicePort: {{ $svcPort }} + {{- end }} + {{- end }} + {{- end }} +{{- end }} diff --git a/charts/nocodb/templates/pvc.yaml b/charts/nocodb/templates/pvc.yaml new file mode 100644 index 0000000000..67656c01d1 --- /dev/null +++ b/charts/nocodb/templates/pvc.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: {{ include "nocodb.fullname" . }} + labels: + {{- include "nocodb.selectorLabels" . | nindent 8 }} +spec: + accessModes: + - ReadWriteMany + resources: + requests: + storage: {{ .Values.storage.size }} + storageClassName: {{ .Values.storage.storageClassName }} + volumeMode: Filesystem diff --git a/charts/nocodb/templates/secret.yaml b/charts/nocodb/templates/secret.yaml new file mode 100644 index 0000000000..85dd6743aa --- /dev/null +++ b/charts/nocodb/templates/secret.yaml @@ -0,0 +1,13 @@ +{{- if .Values.extraSecretEnvs }} +apiVersion: v1 +kind: Secret +metadata: + name: {{ include "nocodb.fullname" . }} + labels: + {{- include "nocodb.labels" . | nindent 4 }} +data: + NC_DB: {{ include "databaseUri" . | b64enc}} +{{- range $key, $value := .Values.extraSecretEnvs }} + {{ $key }}: '{{ $value | b64enc }}' +{{- end }} +{{- end }} diff --git a/charts/nocodb/templates/service.yaml b/charts/nocodb/templates/service.yaml new file mode 100644 index 0000000000..92d484d6bf --- /dev/null +++ b/charts/nocodb/templates/service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "nocodb.fullname" . }} + labels: + {{- include "nocodb.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: http + protocol: TCP + name: http + selector: + {{- include "nocodb.selectorLabels" . | nindent 4 }} diff --git a/charts/nocodb/templates/serviceaccount.yaml b/charts/nocodb/templates/serviceaccount.yaml new file mode 100644 index 0000000000..e61ce26515 --- /dev/null +++ b/charts/nocodb/templates/serviceaccount.yaml @@ -0,0 +1,12 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "nocodb.serviceAccountName" . }} + labels: + {{- include "nocodb.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +{{- end }} diff --git a/charts/nocodb/templates/tests/test-connection.yaml b/charts/nocodb/templates/tests/test-connection.yaml new file mode 100644 index 0000000000..528686c6e7 --- /dev/null +++ b/charts/nocodb/templates/tests/test-connection.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Pod +metadata: + name: "{{ include "nocodb.fullname" . }}-test-connection" + labels: + {{- include "nocodb.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": test +spec: + containers: + - name: wget + image: busybox + command: ['wget'] + args: ['{{ include "nocodb.fullname" . }}:{{ .Values.service.port }}'] + restartPolicy: Never diff --git a/charts/nocodb/values.yaml b/charts/nocodb/values.yaml new file mode 100644 index 0000000000..5d7bf7887e --- /dev/null +++ b/charts/nocodb/values.yaml @@ -0,0 +1,98 @@ +# Default values for nocodb. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + +image: + repository: nocodb/nocodb + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: "" + +imagePullSecrets: [] +nameOverride: "" +fullnameOverride: "" + +serviceAccount: + # Specifies whether a service account should be created + create: false + # Annotations to add to the service account + annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: "" + +podAnnotations: {} + +podSecurityContext: {} + # fsGroup: 2000 + +securityContext: {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true + # runAsNonRoot: true + # runAsUser: 1000 + +service: + type: ClusterIP + port: 8080 + +ingress: + enabled: false + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + hosts: + - host: chart-example.local + paths: [] + tls: [] + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + +resources: {} + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + +nodeSelector: {} + +tolerations: [] + +affinity: {} + +extraEnvs: + NC_PUBLIC_URL: https:/nocodb.local.org + +extraSecretEnvs: + NC_AUTH_JWT_SECRET: secretString + +storage: + size: 3Gi + storageClassName: "" + +postgresql: + enabled: false + auth: + database: nocodb + username: nocodb + password: secretPass + persistence: + size: 8Gi diff --git a/markdown/readme/languages/korean.md b/markdown/readme/languages/korean.md index 0e87dfd4dc..91bb1b9402 100644 --- a/markdown/readme/languages/korean.md +++ b/markdown/readme/languages/korean.md @@ -6,7 +6,7 @@

-MySQL, PostgreSQL, SQL Server, SQLite, MariaDB를 똑똑한 스프레드시트로 바꿔줍니다. +MySQL, PostgreSQL, SQL Server, SQLite, MariaDB를 스마트 스프레드시트로 바꿔줍니다.

@@ -32,7 +32,7 @@ MySQL, PostgreSQL, SQL Server, SQLite, MariaDB를 똑똑한 스프레드시트 NocoDB - The Open Source Airtable alternative | Product Hunt

-# 바로 써보기 +# 빠른 시도 ### Docker 사용 @@ -65,7 +65,7 @@ npm start ### GUI -대시보드 접근하기 : [http://localhost:8080/dashboard](http://localhost:8080/dashboard) +대시보드 접근 : [http://localhost:8080/dashboard](http://localhost:8080/dashboard) # 커뮤니티 가입 @@ -114,18 +114,17 @@ npm start # 기능 -### 스프레드시트같은 인터페이스 +### 스프레드시트 인터페이스 -- ⚡ 정말 쉬운 검색, 정렬, 필터링, 열 숨기기 -- ⚡ 뷰 만들기: 그리드, 갤러리, 칸반, 간트 차트, 양식 -- ⚡ 뷰 공유하기: 완전 공개, 패스워드 걸고 공개 -- ⚡ 개인화하거나 잠글 수 있는 뷰 -- ⚡ 이미지를 자신의 공간에 업로드 (S3, Minio, GCP, Azure, Digitalocean, Linode, OVH, Backblaze 등) -- ⚡ 역할 부여: 소유자, 작성자, 편집자, 보기 전용, 의견 제시만, 원하는 대로 -- ⚡ 접근 통제: 데이터베이스, 테이블 및 열 수준까지도 상세한 통제 가능 +- ⚡ 기본 오퍼레이션: 테이블, 칼럼, 로우 CRUD +- ⚡ 필드 오퍼레이션: 정렬, 필터, 칼럼 보기/숨기기 +- ⚡ 뷰 타입: 그리드, 갤러리, 칸반, 간트 차트, 양식(Form) +- ⚡ 공유: 공개 / 비공개 뷰 (비밀 번호 설정) +- ⚡ 다양한 셀 타입: ID, LinkToAnotherRecord, Lookup, Rollup, SingleLine Text, Attachment, Currency, Formula 등 +- ⚡ 역할에 따른 접근 제한: 다양한 수준의 세분화된 액세스 제어 ### 워크플로 자동화를 위한 앱스토어 - +크게 채팅, 이메일, 저장소 세 가지 카테고리에 대한 통합을 제공합니다. 자세한 사항은 App Store 를 참고하세요. - ⚡ 채팅: MS 팀즈, 슬랙, 디스코드, 매터모스트 - ⚡ 이메일: SMTP, SES, MailChimp - ⚡ SMS: Twilio @@ -188,12 +187,12 @@ docker-compose up -d 여기서 확인해주세요. [환경변수 ](https://docs.nocodb.com/getting-started/installation#environment-variables) -# 개발 환경에 설치하기 +# 개발 환경에 설치 여기서 확인해주세요. [개발 환경에 설치하는 법](https://docs.nocodb.com/engineering/development-setup) -# 기여하기 +# 기여 여기서 확인해주세요. [기여 가이드라인](https://github.com/nocodb/nocodb/blob/master/.github/CONTRIBUTING.md). diff --git a/packages/nc-gui/components/account/UserList.vue b/packages/nc-gui/components/account/UserList.vue index 4ce5764c3e..4c1eaa18ae 100644 --- a/packages/nc-gui/components/account/UserList.vue +++ b/packages/nc-gui/components/account/UserList.vue @@ -71,7 +71,7 @@ const deleteUser = async (userId: string) => { Modal.confirm({ title: 'Are you sure you want to delete this user?', type: 'warn', - content: 'On deleting, user will remove from organization and any sync source(Airtable) created by user will get removed', + content: 'Upon deletion, the user will be removed from the installation.', onOk: async () => { try { await api.orgUsers.delete(userId) diff --git a/packages/nc-gui/components/cell/Currency.vue b/packages/nc-gui/components/cell/Currency.vue index c65a699d98..2ff0e2560a 100644 --- a/packages/nc-gui/components/cell/Currency.vue +++ b/packages/nc-gui/components/cell/Currency.vue @@ -14,7 +14,18 @@ const column = inject(ColumnInj)! const editEnabled = inject(EditModeInj)! -const vModel = useVModel(props, 'modelValue', emit) +const _vModel = useVModel(props, 'modelValue', emit) + +const vModel = computed({ + get: () => _vModel.value, + set: (value: unknown) => { + if (value === '') { + _vModel.value = null + } else { + _vModel.value = value as number + } + }, +}) const lastSaved = ref() diff --git a/packages/nc-gui/components/cell/Json.vue b/packages/nc-gui/components/cell/Json.vue index 8d8d6b9831..b4176d0d64 100644 --- a/packages/nc-gui/components/cell/Json.vue +++ b/packages/nc-gui/components/cell/Json.vue @@ -123,8 +123,8 @@ useSelectedCellKeyupListener(active, (e) => {
-
+
diff --git a/packages/nc-gui/components/smartsheet/Kanban.vue b/packages/nc-gui/components/smartsheet/Kanban.vue index 26578fd027..7ba8adbc50 100644 --- a/packages/nc-gui/components/smartsheet/Kanban.vue +++ b/packages/nc-gui/components/smartsheet/Kanban.vue @@ -13,6 +13,7 @@ import { MetaInj, OpenNewRecordFormHookInj, inject, + isLTAR, onBeforeMount, onBeforeUnmount, provide, @@ -472,35 +473,40 @@ watch(view, async (nextView) => { :key="`record-${record.row.id}-${col.id}`" class="flex flex-col rounded-lg w-full" > - -
-
- - +
+ +
+
+ + +
-
- -
- - + +
+ + +
diff --git a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue index 0667cc7b9f..abd1ebaa0f 100644 --- a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue +++ b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue @@ -56,7 +56,7 @@ const columns = $computed(() => {