diff --git a/.github/workflows/dockerimg.yml b/.github/workflows/dockerimg.yml index f4f8195a..27d484ec 100644 --- a/.github/workflows/dockerimg.yml +++ b/.github/workflows/dockerimg.yml @@ -12,8 +12,6 @@ on: # use_docs (use_docs are built on readthedocs any way) - 'use_docs/*' -env: - OKD_URL: https://okd.hbp.eu:443 jobs: build-docker-img: runs-on: ubuntu-latest @@ -99,28 +97,12 @@ jobs: secrets: KUBECONFIG: ${{ secrets.KUBECONFIG }} - deploy-on-okd: + deploy-rewrite-on-rancher: needs: [ build-docker-img ] - if: success() - runs-on: ubuntu-latest - steps: - - name: "Configure image stream" - run: | - if [[ "$GITHUB_REF" == "refs/heads/master" ]] - then - echo "IMAGE_STREAM_TAG=docker-registry.default.svc:5000/voluba/voluba-img-deploy:latest" >> $GITHUB_ENV - fi - if [[ "$GITHUB_REF" == "refs/heads/staging" ]] - then - echo "IMAGE_STREAM_TAG=docker-registry.default.svc:5000/voluba/voluba-stg-img-deploy:staging" >> $GITHUB_ENV - fi - - name: "Login via cli" - run: | - if [[ ! -z "$IMAGE_STREAM_TAG" ]] - then - oc login ${{ env.OKD_URL }} --token=${{ secrets.OKD_SECRET }} - oc project voluba - oc import-image $IMAGE_STREAM_TAG - else - echo "Empty IMAGE_STREAM_TAG, skipping" - fi + if: ${{ github.ref == 'refs/heads/rf_rewriteFrontend' && success() }} + uses: ./.github/workflows/deploy-helm.yml + with: + DEPLOYMENT_NAME: voluba-angular + IMAGE_TAG: rf_rewriteFrontend + secrets: + KUBECONFIG: ${{ secrets.KUBECONFIG }} diff --git a/.helm/adhoc/certificate.yaml b/.helm/adhoc/certificate.yaml index d594c08c..40cce5d1 100644 --- a/.helm/adhoc/certificate.yaml +++ b/.helm/adhoc/certificate.yaml @@ -16,6 +16,28 @@ spec: dnsNames: # (CHANGE ME! same as `commonName`) - voluba.apps.tc.humanbrainproject.eu + issuerRef: + name: letsencrypt-production-issuer-1 + kind: ClusterIssuer +--- +apiVersion: cert-manager.io/v1 +kind: Certificate +metadata: + name: voluba-ebrains-cert +spec: + secretName: voluba-prod-ebrains-cert-secret + renewBefore: 120h + commonName: voluba.apps.ebrains.eu + isCA: false + privateKey: + algorithm: RSA + encoding: PKCS1 + size: 2048 + usages: + - server auth + dnsNames: + # (CHANGE ME! same as `commonName`) + - voluba.apps.ebrains.eu issuerRef: name: letsencrypt-production-issuer-1 kind: ClusterIssuer \ No newline at end of file diff --git a/.helm/voluba-prod/Chart.yaml b/.helm/voluba-prod/Chart.yaml index e57d8db4..d8bed997 100644 --- a/.helm/voluba-prod/Chart.yaml +++ b/.helm/voluba-prod/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.1 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.1.1" +appVersion: "1.1.2" diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 6a4f3162..1426f616 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -20,7 +20,7 @@ "@angular/router": "^15.0.0", "@ngrx/effects": "^15.1.0", "@ngrx/store": "^15.1.0", - "export-nehuba": "^0.1.7", + "export-nehuba": "^0.1.10", "prettier": "^2.8.3", "rxjs": "~7.5.0", "tslib": "^2.3.0", @@ -6128,9 +6128,9 @@ } }, "node_modules/export-nehuba": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/export-nehuba/-/export-nehuba-0.1.7.tgz", - "integrity": "sha512-LakXeWGkEtHwWrV69snlM2GGmeVP+jGnTaevOpWQJePkdkPq6DvCkCSH0mLBriR8yOPyO0e+VHuE3V4AnV4fPA==", + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/export-nehuba/-/export-nehuba-0.1.10.tgz", + "integrity": "sha512-CC4KnFtdtfbST4LKVxZO3DQ1p6jkmJHf9PPVaRyUrdD0UAM/Oh1Hita2vdnabsEPkAiJ0UMK1bLZ7KQ+5HLhHQ==", "dependencies": { "pako": "^1.0.6" } @@ -16757,9 +16757,9 @@ } }, "export-nehuba": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/export-nehuba/-/export-nehuba-0.1.7.tgz", - "integrity": "sha512-LakXeWGkEtHwWrV69snlM2GGmeVP+jGnTaevOpWQJePkdkPq6DvCkCSH0mLBriR8yOPyO0e+VHuE3V4AnV4fPA==", + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/export-nehuba/-/export-nehuba-0.1.10.tgz", + "integrity": "sha512-CC4KnFtdtfbST4LKVxZO3DQ1p6jkmJHf9PPVaRyUrdD0UAM/Oh1Hita2vdnabsEPkAiJ0UMK1bLZ7KQ+5HLhHQ==", "requires": { "pako": "^1.0.6" } diff --git a/frontend/package.json b/frontend/package.json index 85bff5d4..0f2c3707 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -22,7 +22,7 @@ "@angular/router": "^15.0.0", "@ngrx/effects": "^15.1.0", "@ngrx/store": "^15.1.0", - "export-nehuba": "^0.1.7", + "export-nehuba": "^0.1.10", "prettier": "^2.8.3", "rxjs": "~7.5.0", "tslib": "^2.3.0",