kubeshop · vsukhin · Jan 15, 2024 · Jan 15, 2024 · Jan 15, 2024 · Jan 16, 2024
@@ -70,16 +70,6 @@ dockers:
       - "--cache-from={{ .Env.DOCKER_BUILDX_CACHE_FROM }}"
       - "--build-arg=ALPINE_IMAGE={{ .Env.ALPINE_IMAGE }}"
 
-docker_manifests:
-  - name_template: kubeshop/testkube-cli:{{ .Env.DOCKER_IMAGE_TAG }}
-    image_templates:
-      - kubeshop/testkube-cli:{{ .Env.DOCKER_IMAGE_TAG }}-amd64
-      - kubeshop/testkube-cli:{{ .Env.DOCKER_IMAGE_TAG }}-arm64v8
-  - name_template: kubeshop/testkube-cli:latest
-    image_templates:
-      - kubeshop/testkube-cli:{{ .Env.DOCKER_IMAGE_TAG }}-amd64
-      - kubeshop/testkube-cli:{{ .Env.DOCKER_IMAGE_TAG }}-arm64v8
-
 docker_signs:
   - cmd: cosign
     artifacts: all

@@ -47,7 +47,7 @@
             ${{ runner.os }}-go-
 
       - name: Lint using golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v4
         with:
           version: latest
           args: --timeout=5m

@@ -2,8 +2,8 @@ name: Release logs server dev
 
 on:
   push:
-    tags:
-      - "v[0-9]+.[0-9]+.[0-9]+-*"
+    branches:
+      - develop
 
 permissions:
   id-token: write
@@ -62,7 +62,6 @@ jobs:
           args: release -f ./goreleaser_files/.goreleaser-docker-build-logs-server.yml --snapshot
         env:
           GITHUB_TOKEN: ${{ secrets.CI_BOT_TOKEN }}
-          # Your GoReleaser Pro key, if you are using the 'goreleaser-pro' distribution
           GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
           DOCKER_BUILDX_BUILDER: "${{ steps.buildx.outputs.name }}"
           DOCKER_BUILDX_CACHE_FROM: "type=gha"
@@ -75,6 +74,9 @@ jobs:
           docker push kubeshop/testkube-logs-server:${{ steps.github_sha.outputs.sha_short }}-arm64v8
           docker push kubeshop/testkube-logs-server:${{ steps.github_sha.outputs.sha_short }}-amd64
 
+          docker manifest create kubeshop/testkube-logs-server:${{ steps.github_sha.outputs.sha_short }} --amend kubeshop/testkube-logs-server:${{ steps.github_sha.outputs.sha_short }}-arm64v8 --amend kubeshop/testkube-logs-server:${{ steps.github_sha.outputs.sha_short }}-amd64
+          docker manifest push -p kubeshop/testkube-logs-server:${{ steps.github_sha.outputs.sha_short }}
+
       - name: Push README to Dockerhub
         uses: christian-korneck/update-container-description-action@v1
         env:

@@ -2,8 +2,8 @@ name: Release logs sidecar dev
 
 on:
   push:
-    tags:
-      - "v[0-9]+.[0-9]+.[0-9]+-*"
+    branches:
+      - develop
 
 permissions:
   id-token: write
@@ -62,7 +62,6 @@ jobs:
           args: release -f ./goreleaser_files/.goreleaser-docker-build-logs-sidecar.yml --snapshot
         env:
           GITHUB_TOKEN: ${{ secrets.CI_BOT_TOKEN }}
-          # Your GoReleaser Pro key, if you are using the 'goreleaser-pro' distribution
           GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
           DOCKER_BUILDX_BUILDER: "${{ steps.buildx.outputs.name }}"
           DOCKER_BUILDX_CACHE_FROM: "type=gha"
@@ -75,6 +74,9 @@ jobs:
           docker push kubeshop/testkube-logs-sidecar:${{ steps.github_sha.outputs.sha_short }}-arm64v8
           docker push kubeshop/testkube-logs-sidecar:${{ steps.github_sha.outputs.sha_short }}-amd64
 
+          docker manifest create kubeshop/testkube-logs-sidecar:${{ steps.github_sha.outputs.sha_short }} --amend kubeshop/testkube-logs-sidecar:${{ steps.github_sha.outputs.sha_short }}-arm64v8 --amend kubeshop/testkube-logs-sidecar:${{ steps.github_sha.outputs.sha_short }}-amd64
+          docker manifest push -p kubeshop/testkube-logs-sidecar:${{ steps.github_sha.outputs.sha_short }}
+
       - name: Push README to Dockerhub
         uses: christian-korneck/update-container-description-action@v1
         env:

@@ -62,9 +62,11 @@
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Get github sha
-        id: github_sha
-        run: echo "::set-output name=sha_short::${GITHUB_SHA::7}"
+      - name: Get tag
+        id: tag
+        uses: dawidd6/action-get-tag@v1
+        with:
+          strip_v: true
 
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v4
@@ -82,13 +84,20 @@
           DOCKER_BUILDX_CACHE_FROM: "type=gha"
           DOCKER_BUILDX_CACHE_TO: "type=gha,mode=max"
           ALPINE_IMAGE: ${{ env.ALPINE_IMAGE }}
-          DOCKER_IMAGE_TAG: ${{ steps.github_sha.outputs.sha_short }}
+          DOCKER_IMAGE_TAG: ${{steps.tag.outputs.tag}}
 
       - name: Push Docker images
         if: matrix.name == 'linux'
         run: |
-          docker push kubeshop/testkube-cli:${{ steps.github_sha.outputs.sha_short }}-arm64v8
-          docker push kubeshop/testkube-cli:${{ steps.github_sha.outputs.sha_short }}-amd64
+          docker push kubeshop/testkube-cli:${{steps.tag.outputs.tag}}-arm64v8
+          docker push kubeshop/testkube-cli:${{steps.tag.outputs.tag}}-amd64
+
+          # adding the docker manifest for the latest image tag
+          docker manifest create kubeshop/testkube-cli:latest --amend kubeshop/testkube-cli:${{steps.tag.outputs.tag}}-amd64 --amend kubeshop/testkube-cli:${{steps.tag.outputs.tag}}-arm64v8
+          docker manifest push -p kubeshop/testkube-cli:latest
+
+          docker manifest create kubeshop/testkube-cli:${{steps.tag.outputs.tag}} --amend kubeshop/testkube-cli:${{steps.tag.outputs.tag}}-amd64 --amend kubeshop/testkube-cli:${{steps.tag.outputs.tag}}-arm64v8
+          docker manifest push -p kubeshop/testkube-cli:${{steps.tag.outputs.tag}}
 
       - name: Push README to Dockerhub
         if: matrix.name == 'linux'

@@ -29,6 +29,9 @@
         id: buildx
         uses: docker/setup-buildx-action@v1
 
+      - uses: sigstore/[email protected]
+      - uses: anchore/sbom-action/[email protected]
+
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
@@ -59,28 +62,14 @@
         with:
           distribution: goreleaser-pro
           version: latest
-          args: release -f ./goreleaser_files/.goreleaser-docker-build-logs-server.yml --skip-publish
+          args: release -f ./goreleaser_files/.goreleaser-docker-build-logs-server.yml
         env:
           GITHUB_TOKEN: ${{ secrets.CI_BOT_TOKEN }}
-          # Your GoReleaser Pro key, if you are using the 'goreleaser-pro' distribution
           GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
           DOCKER_BUILDX_BUILDER: "${{ steps.buildx.outputs.name }}"
           DOCKER_BUILDX_CACHE_FROM: "type=gha"
           DOCKER_BUILDX_CACHE_TO: "type=gha,mode=max"
           ALPINE_IMAGE: ${{ env.ALPINE_IMAGE }}
-          DOCKER_IMAGE_TAG: ${{ steps.github_sha.outputs.sha_short }}
-
-      - name: Push Docker images
-        run: |
-          docker push kubeshop/testkube-logs-server:${{ steps.github_sha.outputs.sha_short }}-arm64v8
-          docker push kubeshop/testkube-logs-server:${{ steps.github_sha.outputs.sha_short }}-amd64
-          # adding the docker manifest for the latest image tag
-          docker manifest create kubeshop/testkube-logs-server:latest \
-            kubeshop/testkube-logs-server:${{ steps.github_sha.outputs.sha_short }}-amd64 \
-            kubeshop/testkube-logs-server:${{ steps.github_sha.outputs.sha_short }}-arm64v8
-          docker manifest annotate kubeshop/testkube-logs-server:latest kubeshop/testkube-logs-server:${{ steps.github_sha.outputs.sha_short }}-amd64 --arch amd64
-          docker manifest annotate kubeshop/testkube-logs-server:latest kubeshop/testkube-logs-server:${{ steps.github_sha.outputs.sha_short }}-arm64v8 --arch arm64 --variant v8
-          docker manifest push kubeshop/testkube-logs-server:latest
 
       - name: Push README to Dockerhub
         uses: christian-korneck/update-container-description-action@v1

@@ -29,6 +29,9 @@
         id: buildx
         uses: docker/setup-buildx-action@v1
 
+      - uses: sigstore/[email protected]
+      - uses: anchore/sbom-action/[email protected]
+
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
@@ -59,28 +62,14 @@
         with:
           distribution: goreleaser-pro
           version: latest
-          args: release -f ./goreleaser_files/.goreleaser-docker-build-logs-sidecar.yml --skip-publish
+          args: release -f ./goreleaser_files/.goreleaser-docker-build-logs-sidecar.yml
         env:
           GITHUB_TOKEN: ${{ secrets.CI_BOT_TOKEN }}
-          # Your GoReleaser Pro key, if you are using the 'goreleaser-pro' distribution
           GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
           DOCKER_BUILDX_BUILDER: "${{ steps.buildx.outputs.name }}"
           DOCKER_BUILDX_CACHE_FROM: "type=gha"
           DOCKER_BUILDX_CACHE_TO: "type=gha,mode=max"
           ALPINE_IMAGE: ${{ env.ALPINE_IMAGE }}
-          DOCKER_IMAGE_TAG: ${{ steps.github_sha.outputs.sha_short }}
-
-      - name: Push Docker images
-        run: |
-          docker push kubeshop/testkube-logs-sidecar:${{ steps.github_sha.outputs.sha_short }}-arm64v8
-          docker push kubeshop/testkube-logs-sidecar:${{ steps.github_sha.outputs.sha_short }}-amd64
-          # adding the docker manifest for the latest image tag
-          docker manifest create kubeshop/testkube-logs-sidecar:latest \
-            kubeshop/testkube-logs-sidecar:${{ steps.github_sha.outputs.sha_short }}-amd64 \
-            kubeshop/testkube-logs-sidecar:${{ steps.github_sha.outputs.sha_short }}-arm64v8
-          docker manifest annotate kubeshop/testkube-logs-sidecar:latest kubeshop/testkube-logs-sidecar:${{ steps.github_sha.outputs.sha_short }}-amd64 --arch amd64
-          docker manifest annotate kubeshop/testkube-logs-sidecar:latest kubeshop/testkube-logs-sidecar:${{ steps.github_sha.outputs.sha_short }}-arm64v8 --arch arm64 --variant v8
-          docker manifest push kubeshop/testkube-logs-sidecar:latest
 
       - name: Push README to Dockerhub
         uses: christian-korneck/update-container-description-action@v1

@@ -63,12 +63,14 @@
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Get github sha
-        id: github_sha
-        run: echo "::set-output name=sha_short::${GITHUB_SHA::7}"
+      - name: Get tag
+        id: tag
+        uses: dawidd6/action-get-tag@v1
+        with:
+          strip_v: true
 
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v2
+        uses: goreleaser/goreleaser-action@v4
         with:
           distribution: goreleaser-pro
           version: latest
@@ -83,20 +85,20 @@
           DOCKER_BUILDX_CACHE_FROM: "type=gha"
           DOCKER_BUILDX_CACHE_TO: "type=gha,mode=max"
           ALPINE_IMAGE: ${{ env.ALPINE_IMAGE }}
-          DOCKER_IMAGE_TAG: ${{ steps.github_sha.outputs.sha_short }}
+          DOCKER_IMAGE_TAG: ${{steps.tag.outputs.tag}}
 
       - name: Push Docker images
         if: matrix.name == 'linux'
         run: |
-          docker push kubeshop/testkube-cli:${{ steps.github_sha.outputs.sha_short }}-arm64v8
-          docker push kubeshop/testkube-cli:${{ steps.github_sha.outputs.sha_short }}-amd64
+          docker push kubeshop/testkube-cli:${{steps.tag.outputs.tag}}-arm64v8
+          docker push kubeshop/testkube-cli:${{steps.tag.outputs.tag}}-amd64
+
           # adding the docker manifest for the latest image tag
-          docker manifest create kubeshop/testkube-cli:latest \
-            kubeshop/testkube-cli:${{ steps.github_sha.outputs.sha_short }}-amd64 \
-            kubeshop/testkube-cli:${{ steps.github_sha.outputs.sha_short }}-arm64v8
-          docker manifest annotate kubeshop/testkube-cli:latest kubeshop/testkube-cli:${{ steps.github_sha.outputs.sha_short }}-amd64 --arch amd64
-          docker manifest annotate kubeshop/testkube-cli:latest kubeshop/testkube-cli:${{ steps.github_sha.outputs.sha_short }}-arm64v8 --arch arm64 --variant v8
-          docker manifest push kubeshop/testkube-cli:latest
+          docker manifest create kubeshop/testkube-cli:latest --amend kubeshop/testkube-cli:${{steps.tag.outputs.tag}}-amd64 --amend kubeshop/testkube-cli:${{steps.tag.outputs.tag}}-arm64v8
+          docker manifest push -p kubeshop/testkube-cli:latest
+
+          docker manifest create kubeshop/testkube-cli:${{steps.tag.outputs.tag}} --amend kubeshop/testkube-cli:${{steps.tag.outputs.tag}}-amd64 --amend kubeshop/testkube-cli:${{steps.tag.outputs.tag}}-arm64v8
+          docker manifest push -p kubeshop/testkube-cli:${{steps.tag.outputs.tag}}
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@master

@@ -19,24 +19,24 @@ Testkube consists of 3 different parts.
 
 ## 🚢 How to contribute design
 
-1. Check out open [issues](https://github.com/kubeshop/testkube/issues) here on GitHub (we tend to label them with `🚨 needs-ux`)
+1. Check out open [issues](https://github.com/kubeshop/testkube/issues) here on GitHub (we tend to label them with `🚨 needs-ux`).
 2. Feel free to open an issue on your own if you find something you would like to contribute to the project and use the `idea 💡` label for it.
-3. Clone the public Figma files or create new ones and share them publicly
-4. Add your contributions to an issue and we promise we will review your contribution carefully and foster discussions around it
+3. Clone the public Figma files or create new ones and share them publicly.
+4. Add your contributions to an issue and we promise we will review your contribution carefully and foster discussions around it.
 
 **We encourage you to:**
 
-- Get in touch with the team by starting a discussion on [GitHub](https://github.com/kubeshop/testkube/issues) or on our [Discord Server](https://discord.gg/hfq44wtR6Q).
+- Get in touch with the team by starting a discussion on [GitHub](https://github.com/kubeshop/testkube/issues) or on our [Slack Channel](https://testkubeworkspace.slack.com/join/shared_invite/zt-2arhz5vmu-U2r3WZ69iPya5Fw0hMhRDg#/shared-invite/email).
 - Check out our [Contributor Guide](https://github.com/kubeshop/testkube/blob/main/CONTRIBUTING.md) and
-  [Code of Conduct](https://github.com/kubeshop/testkube/blob/main/CODE_OF_CONDUCT.md)
+  [Code of Conduct](https://github.com/kubeshop/testkube/blob/main/CODE_OF_CONDUCT.md).
 
-## 🎭 Target audience
+## 🎭 Target Audience
 
 Since we are creating a product for Testers and Developers our target audience is pretty straight forward. Sometimes wo do also like to include DevOps people into our considerations.
 
-## 💅 Design relevant materials
+## 💅 Design Relevant Materials
 
-We currently aim to to build a more comprehensive Design System which will also include some guidance on Component usage, Wording, and patterns. 
+We currently aim to to build a more comprehensive Design System which will also include some guidance on Component usage, Wording, and Patterns. 
 
 For now – here is a list of design relevant information and materials:
 
@@ -56,7 +56,6 @@ https://www.figma.com/file/59vZTaJ6O2wTk0Qyqh2IJJ/Testkube-CLI?t=CBjcXzIKoEcG2AG
 
 ## 🎓 License
 
-All design work is licensed under the
-[MIT](https://mit-license.org/)
+All design work is licensed under [MIT](https://mit-license.org/).
 
 [(Back to top)](#-table-of-contents)
@@ -39,6 +39,10 @@ refresh-config:
 	wget "https://raw.githubusercontent.com/kubeshop/helm-charts/develop/charts/testkube-api/slack-config.json" -O config/slack-config.json &
 	wget "https://raw.githubusercontent.com/kubeshop/helm-charts/develop/charts/testkube-api/slack-template.json" -O config/slack-template.json
 
+
+generate-protobuf: use-env-file 
+	protoc --go_out=. --go_opt=paths=source_relative --go-grpc_out=. --go-grpc_opt=paths=source_relative pkg/logs/pb/logs.proto
+
 just-run-api: use-env-file 
 	TESTKUBE_DASHBOARD_URI=$(DASHBOARD_URI) APISERVER_CONFIG=testkube-api-server-config-testkube TESTKUBE_ANALYTICS_ENABLED=$(TESTKUBE_ANALYTICS_ENABLED) TESTKUBE_NAMESPACE=$(NAMESPACE) SCRAPPERENABLED=true STORAGE_SSL=true DEBUG=$(DEBUG) APISERVER_PORT=8088 go run  -ldflags='$(LD_FLAGS)' cmd/api-server/main.go
 

@@ -13,7 +13,7 @@
   <a href="https://testkube.io">Website</a>&nbsp;|&nbsp;
   <a href="https://docs.testkube.io">Documentation</a>&nbsp;|&nbsp; 
   <a href="https://twitter.com/testkube_io">Twitter</a>&nbsp;|&nbsp; 
-  <a href="https://discord.gg/hfq44wtR6Q">Discord</a>&nbsp;|&nbsp; 
+  <a href="https://testkubeworkspace.slack.com/join/shared_invite/zt-2arhz5vmu-U2r3WZ69iPya5Fw0hMhRDg#/shared-invite/email">Slack</a>&nbsp;|&nbsp; 
   <a href="https://kubeshop.io/category/testkube">Blog</a>
 </p>
 
@@ -112,4 +112,4 @@ Go to [contribution document](CONTRIBUTING.md) to read more how can you help us
 
 # Feedback
 Whether it helps you or not - we'd LOVE to hear from you.  Please let us know what you think and of course, how we can make it better.
-Please join our growing community on [Discord](https://discord.com/invite/6zupCZFQbe)
+Please join our growing community on [Slack](https://testkubeworkspace.slack.com/join/shared_invite/zt-2arhz5vmu-U2r3WZ69iPya5Fw0hMhRDg#/shared-invite/email)