From 307100c70887c15fac8fad4e56e8d9a825291669 Mon Sep 17 00:00:00 2001 From: Andrej Petras Date: Tue, 19 Dec 2023 10:04:39 +0100 Subject: [PATCH] feat: add product info, update pipes (#3) --- .github/workflows/build-release.yml | 8 ++------ .github/workflows/build.yml | 15 +++++++++++++++ ...t-helm-update.yml => helm-update-deps.yml} | 4 ++-- .github/workflows/product-helm-build.yml | 19 ------------------- helm/Chart.lock | 7 +++++-- helm/Chart.yaml | 4 ++++ helm/values.yaml | 11 ++++++++++- 7 files changed, 38 insertions(+), 30 deletions(-) create mode 100644 .github/workflows/build.yml rename .github/workflows/{product-helm-update.yml => helm-update-deps.yml} (64%) delete mode 100644 .github/workflows/product-helm-build.yml diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 625f8ca..deb5b26 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -4,10 +4,6 @@ on: tags: - '**' jobs: - helm: - uses: onecx/ci-common/.github/workflows/helm-release.yml@v1 - secrets: inherit - changelog: - uses: onecx/ci-common/.github/workflows/generate-changelog.yml@v1 - needs: helm + release: + uses: onecx/ci-product/.github/workflows/build-release.yml@v1 secrets: inherit \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..0f0df25 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,15 @@ +name: Build helm chart + +on: + push: + branches: + - 'main' + - 'fix/[0-9]+.[0-9]+.x' + paths: + - 'helm/**' + +jobs: + helm: + uses: onecx/ci-product/.github/workflows/build.yml@v1 + secrets: inherit + diff --git a/.github/workflows/product-helm-update.yml b/.github/workflows/helm-update-deps.yml similarity index 64% rename from .github/workflows/product-helm-update.yml rename to .github/workflows/helm-update-deps.yml index 0459ebe..2a9e630 100644 --- a/.github/workflows/product-helm-update.yml +++ b/.github/workflows/helm-update-deps.yml @@ -6,6 +6,6 @@ on: types: [helm-update-deps] jobs: - release: - uses: onecx/ci-common/.github/workflows/helm-update-deps.yml@v1 + update: + uses: onecx/ci-product/.github/workflows/helm-update-deps.yml@v1 secrets: inherit diff --git a/.github/workflows/product-helm-build.yml b/.github/workflows/product-helm-build.yml deleted file mode 100644 index 4a478f4..0000000 --- a/.github/workflows/product-helm-build.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Build helm chart - -on: - push: - branches: - - 'main' - - 'fix/[0-9]+.[0-9]+.x' - paths: - - 'helm/**' - -jobs: - release: - uses: onecx/ci-common/.github/workflows/helm-build.yml@v1 - secrets: inherit - with: - push: true - artifact: '' - helmdir: 'helm' - helmAbsoluteDir: true diff --git a/helm/Chart.lock b/helm/Chart.lock index a9aca6a..90dee54 100644 --- a/helm/Chart.lock +++ b/helm/Chart.lock @@ -1,6 +1,9 @@ dependencies: +- name: helm-product + repository: oci://ghcr.io/onecx/charts + version: 0.0.0 - name: onecx-workspace-svc repository: oci://ghcr.io/onecx/charts version: 0.0.0-rc.6 -digest: sha256:9813915037ed0e1eb5249a1b4a531fa8ee7a105c5ad88e9e10f5f671a38d2a24 -generated: "2023-12-18T14:23:42.830555959Z" +digest: sha256:2bb186f8855a4c8ee7977f5f8b8d71a0e029de1ee908c8787db3f5307d90f88e +generated: "2023-12-19T10:03:18.146135706+01:00" diff --git a/helm/Chart.yaml b/helm/Chart.yaml index e70956b..579a5db 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -3,6 +3,10 @@ name: onecx-workspace version: 0.0.0 appversion: 0.0.0 dependencies: +- name: helm-product + version: ^0 + repository: oci://ghcr.io/onecx/charts + alias: product - name: onecx-workspace-svc version: "*-0" repository: oci://ghcr.io/onecx/charts diff --git a/helm/values.yaml b/helm/values.yaml index 2859e77..99275ec 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -1,2 +1,11 @@ deployment: - svc: true \ No newline at end of file + svc: true + +product: + info: + data: + description: "Onecx Workspace" + imageUrl: "" + iconName: "gear" + dispalyName: "Workspace" + basePath: "/workspace" \ No newline at end of file