diff --git a/.github/workflows/helm.yaml b/.github/workflows/helm.yaml new file mode 100644 index 0000000000..b5e0601d90 --- /dev/null +++ b/.github/workflows/helm.yaml @@ -0,0 +1,18 @@ +name: Helm +on: + pull_request: + branches: + - "*" +permissions: + contents: read +jobs: + smoke-test: + name: Verify Helm Template + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + - uses: azure/setup-helm@v3 + - run: helm template charts/console \ No newline at end of file diff --git a/.github/workflows/publish-cypress.yaml b/.github/workflows/publish-cypress.yaml index ce7741d816..269aecb55b 100644 --- a/.github/workflows/publish-cypress.yaml +++ b/.github/workflows/publish-cypress.yaml @@ -1,74 +1,74 @@ -name: Build Console Cypress Container +# name: Build Console Cypress Container -on: - push: - branches: - - master - tags: - - 'v*.*.*' - paths: - - 'assets/e2e/**' - - '.github/workflows/publish-cypress.yaml' -jobs: - publish: - name: Build and push Console container - runs-on: ubuntu-20.04 - permissions: - contents: 'read' - id-token: 'write' - packages: 'write' - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Set git tag - run: echo "git_tag=$(git describe --dirty)" >> $GITHUB_ENV - - name: Docker meta - id: meta - uses: docker/metadata-action@v4 - with: - # list of Docker images to use as base name for tags - images: | - dkr.plural.sh/console/console-cypress - gcr.io/pluralsh/console-cypress - ghcr.io/pluralsh/console-cypress - # generate Docker tags based on the following events/attributes - tags: | - type=semver,pattern={{raw}},value=${{ env.git_tag }} - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - uses: google-github-actions/auth@v1 - with: - workload_identity_provider: 'projects/${{ secrets.GOOGLE_PROJECT_ID }}/locations/global/workloadIdentityPools/github/providers/github' - service_account: 'terraform@pluralsh.iam.gserviceaccount.com' - token_format: 'access_token' - create_credentials_file: true - - uses: google-github-actions/setup-gcloud@v1.0.1 - - name: Login to gcr - run: gcloud auth configure-docker -q - - name: Login to plural registry - uses: docker/login-action@v2 - with: - registry: dkr.plural.sh - username: mjg@plural.sh - password: ${{ secrets.PLURAL_ACCESS_TOKEN }} - - name: Login to GHCR - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Build and push - uses: docker/build-push-action@v3 - with: - context: "assets/e2e/" - file: "assets/e2e/cypress.Dockerfile" - push: true - platforms: linux/amd64,linux/arm64 - cache-from: type=gha - cache-to: type=gha,mode=max - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} +# on: +# push: +# branches: +# - master +# tags: +# - 'v*.*.*' +# paths: +# - 'assets/e2e/**' +# - '.github/workflows/publish-cypress.yaml' +# jobs: +# publish: +# name: Build and push Console container +# runs-on: ubuntu-20.04 +# permissions: +# contents: 'read' +# id-token: 'write' +# packages: 'write' +# steps: +# - name: Checkout +# uses: actions/checkout@v3 +# with: +# fetch-depth: 0 +# - name: Set git tag +# run: echo "git_tag=$(git describe --dirty)" >> $GITHUB_ENV +# - name: Docker meta +# id: meta +# uses: docker/metadata-action@v4 +# with: +# # list of Docker images to use as base name for tags +# images: | +# dkr.plural.sh/console/console-cypress +# gcr.io/pluralsh/console-cypress +# ghcr.io/pluralsh/console-cypress +# # generate Docker tags based on the following events/attributes +# tags: | +# type=semver,pattern={{raw}},value=${{ env.git_tag }} +# - name: Set up QEMU +# uses: docker/setup-qemu-action@v2 +# - name: Set up Docker Buildx +# uses: docker/setup-buildx-action@v2 +# - uses: google-github-actions/auth@v1 +# with: +# workload_identity_provider: 'projects/${{ secrets.GOOGLE_PROJECT_ID }}/locations/global/workloadIdentityPools/github/providers/github' +# service_account: 'terraform@pluralsh.iam.gserviceaccount.com' +# token_format: 'access_token' +# create_credentials_file: true +# - uses: google-github-actions/setup-gcloud@v1.0.1 +# - name: Login to gcr +# run: gcloud auth configure-docker -q +# - name: Login to plural registry +# uses: docker/login-action@v2 +# with: +# registry: dkr.plural.sh +# username: mjg@plural.sh +# password: ${{ secrets.PLURAL_ACCESS_TOKEN }} +# - name: Login to GHCR +# uses: docker/login-action@v2 +# with: +# registry: ghcr.io +# username: ${{ github.repository_owner }} +# password: ${{ secrets.GITHUB_TOKEN }} +# - name: Build and push +# uses: docker/build-push-action@v3 +# with: +# context: "assets/e2e/" +# file: "assets/e2e/cypress.Dockerfile" +# push: true +# platforms: linux/amd64,linux/arm64 +# cache-from: type=gha +# cache-to: type=gha,mode=max +# tags: ${{ steps.meta.outputs.tags }} +# labels: ${{ steps.meta.outputs.labels }} diff --git a/charts/console/Chart.lock b/charts/console/Chart.lock index 9522674b57..c4814fbcec 100644 --- a/charts/console/Chart.lock +++ b/charts/console/Chart.lock @@ -4,9 +4,9 @@ dependencies: version: 0.0.5 - name: controller repository: file://../controller - version: 0.0.22 + version: 0.0.23 - name: flux2 repository: https://fluxcd-community.github.io/helm-charts version: 2.11.1 -digest: sha256:d3bb3d86fa65255f8400edbbea908dea3d3ae3d5cc2f56ea8942ce8f1d6213ab -generated: "2024-03-09T18:33:12.968731578Z" +digest: sha256:c88eee71b2916fae3fbf2a452590f4881442d7eb038c6bdbefb70a9385871b06 +generated: "2024-03-15T16:35:07.796246014Z" diff --git a/charts/console/Chart.yaml b/charts/console/Chart.yaml index 4b65e8be53..6f117be6f1 100644 --- a/charts/console/Chart.yaml +++ b/charts/console/Chart.yaml @@ -2,14 +2,14 @@ apiVersion: v2 name: console description: >- deploys the plural console and additional dependencies, for use in bring-your-own-kube setups -appVersion: 0.8.17 -version: 0.1.41 +appVersion: 0.8.18 +version: 0.1.42 dependencies: - name: kas version: 0.0.5 repository: file://../../plural/helm/kas - name: controller - version: 0.0.22 + version: 0.0.23 repository: file://../controller - name: flux2 version: 2.11.1 diff --git a/charts/console/charts/controller-0.0.22.tgz b/charts/console/charts/controller-0.0.22.tgz deleted file mode 100644 index 825fae7c59..0000000000 Binary files a/charts/console/charts/controller-0.0.22.tgz and /dev/null differ diff --git a/charts/console/charts/controller-0.0.23.tgz b/charts/console/charts/controller-0.0.23.tgz new file mode 100644 index 0000000000..e66b8c199b Binary files /dev/null and b/charts/console/charts/controller-0.0.23.tgz differ diff --git a/charts/console/charts/kas-0.0.5.tgz b/charts/console/charts/kas-0.0.5.tgz index e475e48e3b..bab18c09f3 100644 Binary files a/charts/console/charts/kas-0.0.5.tgz and b/charts/console/charts/kas-0.0.5.tgz differ diff --git a/charts/controller/Chart.yaml b/charts/controller/Chart.yaml index 686ad862e1..64170fe80b 100644 --- a/charts/controller/Chart.yaml +++ b/charts/controller/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: controller description: deploys the deployment operator for plural cd -appVersion: 0.8.17 -version: 0.0.22 +appVersion: 0.8.18 +version: 0.0.23 type: application diff --git a/plural/helm/console/Chart.lock b/plural/helm/console/Chart.lock index 4dde3d0092..8d0f013b40 100644 --- a/plural/helm/console/Chart.lock +++ b/plural/helm/console/Chart.lock @@ -4,6 +4,6 @@ dependencies: version: 0.1.10 - name: controller repository: file://../../../charts/controller - version: 0.0.22 -digest: sha256:4bab7a9d41ef9b0649e040d8ec210ef771b1425bf475fbad60c4673f22e5ccfb -generated: "2024-03-09T18:33:13.288385766Z" + version: 0.0.23 +digest: sha256:51bdfe091b83d03e8e6ab794ea2ae16d75aa047f6b348135e5a28e9e91dfb962 +generated: "2024-03-15T16:35:08.100009907Z" diff --git a/plural/helm/console/Chart.yaml b/plural/helm/console/Chart.yaml index c38170d765..da4293b69b 100644 --- a/plural/helm/console/Chart.yaml +++ b/plural/helm/console/Chart.yaml @@ -1,13 +1,13 @@ apiVersion: v2 name: console description: A chart for plural console -appVersion: 0.8.17 -version: 0.8.18 +appVersion: 0.8.18 +version: 0.8.19 dependencies: - name: test-base version: 0.1.10 repository: https://pluralsh.github.io/module-library condition: test-base.enabled - name: controller - version: 0.0.22 + version: 0.0.23 repository: file://../../../charts/controller diff --git a/plural/helm/console/charts/controller-0.0.22.tgz b/plural/helm/console/charts/controller-0.0.22.tgz deleted file mode 100644 index aaa952649e..0000000000 Binary files a/plural/helm/console/charts/controller-0.0.22.tgz and /dev/null differ diff --git a/plural/helm/console/charts/controller-0.0.23.tgz b/plural/helm/console/charts/controller-0.0.23.tgz new file mode 100644 index 0000000000..e66b8c199b Binary files /dev/null and b/plural/helm/console/charts/controller-0.0.23.tgz differ