From b90198915e740d9d41ca79e2967c124bdadf63aa Mon Sep 17 00:00:00 2001 From: komodor-bot Date: Sat, 10 Jun 2023 17:48:04 +0000 Subject: [PATCH 1/3] Increment chart versions [skip ci] --- charts/helm-dashboard/Chart.yaml | 4 ++-- plugin.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/helm-dashboard/Chart.yaml b/charts/helm-dashboard/Chart.yaml index 2bfd6d5c..671be5e8 100644 --- a/charts/helm-dashboard/Chart.yaml +++ b/charts/helm-dashboard/Chart.yaml @@ -5,5 +5,5 @@ name: helm-dashboard description: A GUI Dashboard for Helm by Komodor icon: "https://raw.githubusercontent.com/komodorio/helm-dashboard/main/pkg/dashboard/static/logo.svg" -version: 0.1.8 -appVersion: "1.3.1" +version: 0.1.9 +appVersion: "1.3.2" diff --git a/plugin.yaml b/plugin.yaml index 7bc6e28d..0ae75562 100644 --- a/plugin.yaml +++ b/plugin.yaml @@ -1,5 +1,5 @@ name: "dashboard" -version: "1.3.1" +version: "1.3.2" usage: "A simplified way of working with Helm" description: "View HELM situation in nice web UI" command: "$HELM_PLUGIN_DIR/bin/helm-dashboard" From 27eb7949e5df0cc6594310b07922d9a4bd75e416 Mon Sep 17 00:00:00 2001 From: Andrey Pokhilko Date: Mon, 19 Jun 2023 11:23:31 +0100 Subject: [PATCH 2/3] Change commit message of chart release (#369) --- .github/workflows/build.yml | 5 +++++ .github/workflows/release.yaml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 25f2fd6c..839cfb38 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,6 +37,11 @@ jobs: args: release --snapshot --rm-dist - name: Test if the Binary is Runnable run: "dist/helm-dashboard_linux_amd64_v1/helm-dashboard --help" + - uses: actions/upload-artifact@v3 + with: + name: binaries + path: dist/ + retention-days: 1 - name: golangci-lint uses: golangci/golangci-lint-action@v3.3.1 with: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ac9591d6..76589070 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -118,4 +118,4 @@ jobs: user_email: "komi@komodor.io" user_name: "komodor-bot" destination_branch: "master" - commit_msg: "feat(helm-dashboard): ${{ github.event.head_commit.message }}" #important!! don't change this commit message unless you change the condition in pipeline.yml on helm-charts repo + commit_msg: "feat(OSS helm-dashboard): ${{ github.event.head_commit.message }}" #important!! don't change this commit message unless you change the condition in pipeline.yml on helm-charts repo From b61adf133f639b8bffd43925b5b4b8230c197a26 Mon Sep 17 00:00:00 2001 From: Andrey Pokhilko Date: Wed, 21 Jun 2023 12:42:14 +0100 Subject: [PATCH 3/3] Second attempt to do multiarch image (#370) * Second attempt to do multiarch image * Build it * Arch Args * Auth for push * Remove condition * Fix tag name * Another try * Finalize changes --- .dockerignore | 3 ++- .github/workflows/build.yml | 23 ++++++++++++++++++++++- .github/workflows/release.yaml | 2 +- Dockerfile | 16 ++++++++++++---- 4 files changed, 37 insertions(+), 7 deletions(-) diff --git a/.dockerignore b/.dockerignore index 4b186b4f..72c21b34 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1,5 @@ Dockerfile *.md bin -.idea \ No newline at end of file +.idea +dashboard/node_modules \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 839cfb38..79f451d5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -58,12 +58,33 @@ jobs: - name: Check out the repo uses: actions/checkout@v3 + - name: Docker meta + uses: docker/metadata-action@v3 + id: meta + with: + images: komodorio/helm-dashboard + + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Login to DockerHub + uses: docker/login-action@v2 + if: github.event_name != 'pull_request' + with: + username: ${{ secrets.DOCKERHUB_USER }} + password: ${{ secrets.DOCKERHUB_PASS }} + - name: Build and push uses: docker/build-push-action@v4 with: context: . - outputs: local + push: ${{ github.event_name != 'pull_request' }} + tags: komodorio/helm-dashboard:unstable + labels: ${{ steps.meta.outputs.labels }} build-args: VER=0.0.0-dev + platforms: linux/amd64,linux/arm64 helm_check: runs-on: ubuntu-latest diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 76589070..e66ec334 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -68,7 +68,7 @@ jobs: uses: docker/setup-buildx-action@v2 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v2 if: github.event_name != 'pull_request' with: username: ${{ secrets.DOCKERHUB_USER }} diff --git a/Dockerfile b/Dockerfile index 434f61ad..a2ec85db 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,13 @@ # Stage - builder -FROM golang as builder +FROM --platform=${BUILDPLATFORM:-linux/amd64} golang as builder +ARG TARGETPLATFORM +ARG BUILDPLATFORM +ARG TARGETOS +ARG TARGETARCH -ENV GOOS=linux -ENV GOARCH=amd64 +ENV GOOS=${TARGETOS:-linux} +ENV GOARCH=${TARGETARCH:-amd64} ENV CGO_ENABLED=0 WORKDIR /build @@ -23,7 +27,11 @@ WORKDIR /build/src RUN make build # Stage - runner -FROM alpine +FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine + +ARG TARGETPLATFORM +ARG BUILDPLATFORM + EXPOSE 8080 # Python