diff --git a/.gitea/workflows/build-backend.yml b/.gitea/workflows/build-backend.yml index 5d12c11..5924b2d 100644 --- a/.gitea/workflows/build-backend.yml +++ b/.gitea/workflows/build-backend.yml @@ -12,6 +12,15 @@ on: - devspc/devspace-gateway - devspc/devspace-api default: devspc/devspace-apiregistry-core-service + namespace: + description: 'Name Space' + required: true + type: choice + options: + - devx + - test + - prod + default: devx branch: description: 'Ветка' required: true @@ -70,7 +79,7 @@ jobs: releaseName=$(basename "$pathToHelm") echo "Release Name: $releaseName" helm upgrade --install "$releaseName" "$pathToHelm" \ - --namespace devx \ + --namespace ${{ github.event.inputs.namespace }} \ --kubeconfig ./ku.yaml \ --create-namespace \ --set-string 'image.version=${{ github.event.inputs.version }}' \ @@ -78,6 +87,8 @@ jobs: --set-string 'repository.name=${{ github.event.inputs.repo_path }}' \ --set-string 'repository.branch=${{ github.event.inputs.branch }}' \ --set "imagePullSecrets[0].name=regcred" \ + -f devspc/${{ github.event.inputs.namespace }}/values.yaml \ + -f devspc/values.yaml \ --wait - name: 'Cleanup' if: always() diff --git a/.gitea/workflows/build-frontend.yml b/.gitea/workflows/build-frontend.yml index f18de4e..70879a2 100644 --- a/.gitea/workflows/build-frontend.yml +++ b/.gitea/workflows/build-frontend.yml @@ -9,6 +9,15 @@ on: options: - devspc/devspace-selfkit-ui default: devspc/devspace-selfkit-ui + namespace: + description: 'Name Space' + required: true + type: choice + options: + - devx + - test + - prod + default: devx branch: description: 'Ветка' required: true @@ -113,7 +122,7 @@ jobs: releaseName=$(basename "$pathToHelm") echo "Release Name: $releaseName" helm upgrade --install "$releaseName" "$pathToHelm" \ - --namespace devx \ + --namespace ${{ github.event.inputs.namespace }} \ --kubeconfig ./ku.yaml \ --create-namespace \ --set-string 'image.version=${{ github.event.inputs.version }}' \ @@ -121,6 +130,8 @@ jobs: --set-string 'repository.name=${{ github.event.inputs.repo_path }}' \ --set-string 'repository.branch=${{ github.event.inputs.branch }}' \ --set "imagePullSecrets[0].name=regcred" \ + -f devspc/${{ github.event.inputs.namespace }}/values.yaml \ + -f devspc/values.yaml \ --wait - name: 'Cleanup' if: always() diff --git a/devspc/devspace-apiregistry-core-service/templates/configmap.yaml b/devspc/devspace-apiregistry-core-service/templates/configmap.yaml index be9fa51..6f05ece 100644 --- a/devspc/devspace-apiregistry-core-service/templates/configmap.yaml +++ b/devspc/devspace-apiregistry-core-service/templates/configmap.yaml @@ -15,9 +15,9 @@ data: application: name: {{$.Release.Name}} datasource: - url: jdbc:postgresql://192.168.76.114:5432/database - username: postgres - password: postgres + url: 'jdbc:postgresql://{{$.Values.database.url}}' + username: {{$.Values.database.user}} + password: {{$.Values.database.password}} cloud: vault: enabled: false diff --git a/devspc/helm-agent b/devspc/helm-agent new file mode 100644 index 0000000..5cbcfb7 --- /dev/null +++ b/devspc/helm-agent @@ -0,0 +1,2 @@ +#!/bin/bash +helm \ No newline at end of file diff --git a/devspc/stands/devx/values.yaml b/devspc/stands/devx/values.yaml new file mode 100644 index 0000000..d77c878 --- /dev/null +++ b/devspc/stands/devx/values.yaml @@ -0,0 +1,4 @@ +database: + url: '192.168.76.114:5432/database' + user: 'postgres' + password: 'postgres' \ No newline at end of file diff --git a/devspc/stands/prod/values.yaml b/devspc/stands/prod/values.yaml new file mode 100644 index 0000000..e69de29 diff --git a/devspc/stands/test/values.yaml b/devspc/stands/test/values.yaml new file mode 100644 index 0000000..d77c878 --- /dev/null +++ b/devspc/stands/test/values.yaml @@ -0,0 +1,4 @@ +database: + url: '192.168.76.114:5432/database' + user: 'postgres' + password: 'postgres' \ No newline at end of file diff --git a/devspc/stands/values.yaml b/devspc/stands/values.yaml new file mode 100644 index 0000000..e69de29