diff --git a/.gitea/workflows/build-backend.yml b/.gitea/workflows/build-backend.yml index a3734d7..6858bc2 100644 --- a/.gitea/workflows/build-backend.yml +++ b/.gitea/workflows/build-backend.yml @@ -41,7 +41,8 @@ jobs: run: | echo "Cloning ${{ github.event.inputs.repo_path }}" echo "From branch ${{ github.event.inputs.branch }}" - - name: Cloning2 + echo "Namespace ${{ github.event.inputs.namespace }}" + - name: Cloning uses: https://git.binom.pw/otp/devops/clone@main with: ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} diff --git a/.gitea/workflows/build-frontend.yml b/.gitea/workflows/build-frontend.yml index 2089fae..8ea4729 100644 --- a/.gitea/workflows/build-frontend.yml +++ b/.gitea/workflows/build-frontend.yml @@ -33,7 +33,12 @@ jobs: name: 'Deploy to dev' runs-on: ubuntu-latest steps: - - name: Cloning2 + - name: 'Print Info' + run: | + echo "Cloning ${{ github.event.inputs.repo_path }}" + echo "From branch ${{ github.event.inputs.branch }}" + echo "Namespace ${{ github.event.inputs.namespace }}" + - name: Cloning uses: https://git.binom.pw/otp/devops/clone@main with: ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} diff --git a/devspc/devspace-api/values.yaml b/devspc/devspace-api/values.yaml index 98cead8..6fc6e2f 100644 --- a/devspc/devspace-api/values.yaml +++ b/devspc/devspace-api/values.yaml @@ -29,6 +29,3 @@ auth: jwk: url: 'http://192.168.76.150/realms/devspace-dev/protocol/openid-connect/certs' claimName: 'dev-space' -integrations: - core: - url: 'http://devspace-apiregistry-core-service-agent:8080' \ No newline at end of file diff --git a/devspc/devspace-gateway/templates/configmap.yaml b/devspc/devspace-gateway/templates/configmap.yaml index d091b24..2dfa87c 100644 --- a/devspc/devspace-gateway/templates/configmap.yaml +++ b/devspc/devspace-gateway/templates/configmap.yaml @@ -19,9 +19,9 @@ data: session.lifecycle.enabled: true fail-fast: true api-registry-core: - url: 'http://{{$.Values.services.core}}' + url: '{{$.Values.integrations.core.url}}' api-registry-generator: - url: 'http://{{$.Values.services.generator}}' + url: '{{$.Values.integrations.generator.url}}' app: auth: enabled: true diff --git a/devspc/devspace-gateway/values.yaml b/devspc/devspace-gateway/values.yaml index aab743a..7338f52 100644 --- a/devspc/devspace-gateway/values.yaml +++ b/devspc/devspace-gateway/values.yaml @@ -10,9 +10,6 @@ vault: appRole: roleId: '85a3c725-075b-b107-b948-a076625a1a37' secretId: 'b36b7b4c-5da4-d5cf-1cdf-f367bd52b475' -services: - core: 'devspace-apiregistry-core-service-agent:8080' - generator: 'devspace-apiregistry-generator-service-agent:8080' keycloak: jwk: 'http://192.168.76.150/realms/devspace-dev/protocol/openid-connect/certs' claimName: 'dev-space' diff --git a/devspc/stands/values.yaml b/devspc/stands/values.yaml index a24fa3d..6bbcafa 100644 --- a/devspc/stands/values.yaml +++ b/devspc/stands/values.yaml @@ -1,2 +1,7 @@ ingress: - host: '{{$.Values.ingress.domain}}.{{$.Release.Namespace}}.kube.xx' \ No newline at end of file + host: '{{$.Values.ingress.domain}}.{{$.Release.Namespace}}.kube.xx' +integrations: + core: + url: 'http://main-devspace-apiregistry-core-service:8080' + generator: + url: 'http://devspace-apiregistry-generator-service-agent:8080' \ No newline at end of file