chore: support platform for dependencies

Support setting platform for `image` dependencies. Also `rekres` and bump deps. Signed-off-by: Noel Georgi <[email protected]>
siderolabs · Mar 5, 2024 · 7f7f851 · 7f7f851
1 parent 2ad4508
commit 7f7f851
Show file tree

Hide file tree

Showing 20 changed files with 191 additions and 141 deletions.
diff --git a/.conform.yaml b/.conform.yaml
@@ -1,37 +1,48 @@
 # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
 #
-# Generated on 2022-08-29T16:54:01Z by kres bb965bb.
+# Generated on 2024-03-05T05:52:53Z by kres latest.
 
----
 policies:
-- type: commit
-  spec:
-    dco: true
-    gpg:
-      required: true
-      identity:
-        gitHubOrganization: siderolabs
-    spellcheck:
-      locale: US
-    maximumOfOneCommit: true
-    header:
-      length: 89
-      imperative: true
-      case: lower
-      invalidLastCharacters: .
-    body:
-      required: true
-    conventional:
-      types: ["chore","docs","perf","refactor","style","test","release"]
-      scopes: [".*"]
-- type: license
-  spec:
-    skipPaths:
-      - .git/
-      - testdata/
-    includeSuffixes:
-      - .go
-    excludeSuffixes:
-      - .pb.go
-      - .pb.gw.go
-    header: "// This Source Code Form is subject to the terms of the Mozilla Public\u000A// License, v. 2.0. If a copy of the MPL was not distributed with this\u000A// file, You can obtain one at http://mozilla.org/MPL/2.0/.\u000A"
+  - type: commit
+    spec:
+      dco: true
+      gpg:
+        required: true
+        identity:
+          gitHubOrganization: siderolabs
+      spellcheck:
+        locale: US
+      maximumOfOneCommit: true
+      header:
+        length: 89
+        imperative: true
+        case: lower
+        invalidLastCharacters: .
+      body:
+        required: true
+      conventional:
+        types:
+          - chore
+          - docs
+          - perf
+          - refactor
+          - style
+          - test
+          - release
+        scopes:
+          - .*
+  - type: license
+    spec:
+      root: .
+      skipPaths:
+        - .git/
+        - testdata/
+      includeSuffixes:
+        - .go
+      excludeSuffixes:
+        - .pb.go
+        - .pb.gw.go
+      header: |
+        // This Source Code Form is subject to the terms of the Mozilla Public
+        // License, v. 2.0. If a copy of the MPL was not distributed with this
+        // file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
 #
-# Generated on 2023-10-30T17:28:15Z by kres latest.
+# Generated on 2024-03-05T05:52:53Z by kres latest.
 
 name: default
 concurrency:
@@ -22,17 +22,16 @@ jobs:
     permissions:
       actions: read
       contents: write
+      issues: read
       packages: write
       pull-requests: read
     runs-on:
       - self-hosted
       - generic
     if: (!startsWith(github.head_ref, 'renovate/') && !startsWith(github.head_ref, 'dependabot/'))
-    outputs:
-      labels: ${{ steps.workflow-run-info.outputs.pullRequestLabels }}
     services:
       buildkitd:
-        image: moby/buildkit:v0.12.2
+        image: moby/buildkit:v0.12.5
         options: --privileged
         ports:
           - 1234:1234
@@ -50,6 +49,7 @@ jobs:
         with:
           driver: remote
           endpoint: tcp://localhost:1234
+        timeout-minutes: 1
       - name: base
         run: |
           make base
@@ -90,11 +90,6 @@ jobs:
           REGISTRY: registry.dev.siderolabs.io
         run: |
           make integration
-      - name: Retrieve workflow info
-        id: workflow-run-info
-        uses: potiuk/get-workflow-origin@v1_5
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
       - name: Generate Checksums
         if: startsWith(github.ref, 'refs/tags/')
         run: |

diff --git a/.github/workflows/slack-notify.yaml b/.github/workflows/slack-notify.yaml
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
 #
-# Generated on 2023-10-30T17:28:15Z by kres latest.
+# Generated on 2024-03-05T05:52:53Z by kres latest.
 
 name: slack-notify
 "on":
@@ -14,14 +14,15 @@ jobs:
     runs-on:
       - self-hosted
       - generic
-    if: ${{ github.event.workflow_run.conclusion != 'skipped' }}
+    if: github.event.workflow_run.conclusion != 'skipped'
     steps:
-      - name: Retrieve Workflow Run Info
-        id: retrieve-workflow-run-info
-        uses: potiuk/get-workflow-origin@v1_5
-        with:
-          sourceRunId: ${{ github.event.workflow_run.id }}
-          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Get PR number
+        id: get-pr-number
+        if: github.event.workflow_run.event == 'pull_request'
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          echo pull_request_number=$(gh pr view -R ${{ github.repository }} ${{ github.event.workflow_run.head_repository.owner.login }}:${{ github.event.workflow_run.head_branch }} --json number --jq .number) >> $GITHUB_OUTPUT
       - name: Slack Notify
         uses: slackapi/slack-github-action@v1
         with:
@@ -38,7 +39,7 @@ jobs:
                                 "fields": [
                                     {
                                         "type": "mrkdwn",
-                                        "text": "${{ github.event.workflow_run.event == 'pull_request' && format('*Pull Request:* {0} (`{1}`)\n<{2}/pull/{3}|{4}>', github.repository, github.ref_name, github.event.repository.html_url, steps.retrieve-workflow-run-info.outputs.pullRequestNumber, github.event.workflow_run.display_title) || format('*Build:* {0}#{1} (`{2}`)', github.repository, github.sha, github.ref_name) }}"
+                                        "text": "${{ github.event.workflow_run.event == 'pull_request' && format('*Pull Request:* {0} (`{1}`)\n<{2}/pull/{3}|{4}>', github.repository, github.ref_name, github.event.repository.html_url, steps.get-pr-number.outputs.pull_request_number, github.event.workflow_run.display_title) || format('*Build:* {0} (`{1}`)\n<{2}/commit/{3}|{4}>', github.repository, github.ref_name, github.event.repository.html_url, github.sha, github.event.workflow_run.display_title) }}"
                                     },
                                     {
                                         "type": "mrkdwn",

diff --git a/.golangci.yml b/.golangci.yml
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
 #
-# Generated on 2023-10-30T17:28:15Z by kres latest.
+# Generated on 2024-03-05T05:52:53Z by kres latest.
 
 # options for analysis running
 run:
@@ -74,8 +74,6 @@ linters-settings:
   govet:
     check-shadowing: true
     enable-all: true
-    disable:
-      - loopclosure
   lll:
     line-length: 200
     tab-width: 4
@@ -153,6 +151,7 @@ linters:
     - inamedparam
     - testifylint # complains about our assert recorder and has a number of false positives for assert.Greater(t, thing, 1)
     - protogetter # complains about us using Value field on typed spec, instead of GetValue which has a different signature
+    - perfsprint # complains about us using fmt.Sprintf in non-performance critical code, updating just kres took too long
     # abandoned linters for which golangci shows the warning that the repo is archived by the owner
     - interfacer
     - maligned

diff --git a/.kres.yaml b/.kres.yaml
@@ -26,7 +26,7 @@ spec:
 ---
 kind: service.CodeCov
 spec:
-  targetThreshold: 7
+  targetThreshold: 1
 ---
 kind: golang.Generate
 spec:

diff --git a/Dockerfile b/Dockerfile
@@ -2,18 +2,18 @@
 
 # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
 #
-# Generated on 2023-10-30T17:28:15Z by kres latest.
+# Generated on 2024-03-05T05:52:53Z by kres latest.
 
 ARG TOOLCHAIN
 
-FROM ghcr.io/siderolabs/ca-certificates:v1.6.0-alpha.0-10-gd3d7d29 AS image-ca-certificates
+FROM ghcr.io/siderolabs/ca-certificates:v1.6.0 AS image-ca-certificates
 
-FROM ghcr.io/siderolabs/fhs:v1.6.0-alpha.0-10-gd3d7d29 AS image-fhs
+FROM ghcr.io/siderolabs/fhs:v1.6.0 AS image-fhs
 
 # runs markdownlint
-FROM docker.io/node:20.8.0-alpine3.18 AS lint-markdown
+FROM docker.io/node:21.6.2-alpine3.19 AS lint-markdown
 WORKDIR /src
-RUN npm i -g markdownlint-cli@0.37.0
+RUN npm i -g markdownlint-cli@0.39.0
 RUN npm i [email protected]
 COPY .markdownlint.json .
 COPY ./CHANGELOG.md ./CHANGELOG.md

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
 #
-# Generated on 2023-10-30T17:28:15Z by kres latest.
+# Generated on 2024-03-05T05:52:53Z by kres latest.
 
 # common variables
 
@@ -14,20 +14,19 @@ WITH_RACE ?= false
 REGISTRY ?= ghcr.io
 USERNAME ?= siderolabs
 REGISTRY_AND_USERNAME ?= $(REGISTRY)/$(USERNAME)
-PROTOBUF_GO_VERSION ?= 1.31.0
+PROTOBUF_GO_VERSION ?= 1.32.0
 GRPC_GO_VERSION ?= 1.3.0
-GRPC_GATEWAY_VERSION ?= 2.18.0
-VTPROTOBUF_VERSION ?= 0.5.0
-DEEPCOPY_VERSION ?= v0.5.5
-GOLANGCILINT_VERSION ?= v1.55.1
-GOFUMPT_VERSION ?= v0.5.0
-GO_VERSION ?= 1.21.3
-GOIMPORTS_VERSION ?= v0.14.0
+GRPC_GATEWAY_VERSION ?= 2.19.1
+VTPROTOBUF_VERSION ?= 0.6.0
+DEEPCOPY_VERSION ?= v0.5.6
+GOLANGCILINT_VERSION ?= v1.56.2
+GOFUMPT_VERSION ?= v0.6.0
+GO_VERSION ?= 1.22.0
+GOIMPORTS_VERSION ?= v0.18.0
 GO_BUILDFLAGS ?=
 GO_LDFLAGS ?=
 CGO_ENABLED ?= 0
 GOTOOLCHAIN ?= local
-GOEXPERIMENT ?= loopvar
 TESTPKGS ?= ./...
 KRES_IMAGE ?= ghcr.io/siderolabs/kres:latest
 CONFORMANCE_IMAGE ?= ghcr.io/siderolabs/conform:latest
@@ -65,7 +64,7 @@ COMMON_ARGS += --build-arg=GOLANGCILINT_VERSION="$(GOLANGCILINT_VERSION)"
 COMMON_ARGS += --build-arg=GOIMPORTS_VERSION="$(GOIMPORTS_VERSION)"
 COMMON_ARGS += --build-arg=GOFUMPT_VERSION="$(GOFUMPT_VERSION)"
 COMMON_ARGS += --build-arg=TESTPKGS="$(TESTPKGS)"
-TOOLCHAIN ?= docker.io/golang:1.21-alpine
+TOOLCHAIN ?= docker.io/golang:1.22-alpine
 
 # extra variables
 
@@ -92,6 +91,23 @@ To create a builder instance, run:
 
 	docker buildx create --name local --use
 
+If running builds that needs to be cached aggresively create a builder instance with the following:
+
+	docker buildx create --name local --use --config=config.toml
+
+config.toml contents:
+
+[worker.oci]
+  gc = true
+  gckeepstorage = 50000
+
+  [[worker.oci.gcpolicy]]
+    keepBytes = 10737418240
+    keepDuration = 604800
+    filters = [ "type==source.local", "type==exec.cachemount", "type==source.git.checkout"]
+  [[worker.oci.gcpolicy]]
+    all = true
+    keepBytes = 53687091200
 
 If you already have a compatible builder instance, you may use that instead.
 
@@ -113,7 +129,7 @@ endif
 ifneq (, $(filter $(WITH_DEBUG), t true TRUE y yes 1))
 GO_BUILDFLAGS += -tags sidero.debug
 else
-GO_LDFLAGS += -s -w
+GO_LDFLAGS += -s
 endif
 
 all: unit-tests bldr image-bldr integration.test integration lint
@@ -140,7 +156,7 @@ lint-gofumpt:  ## Runs gofumpt linter.
 .PHONY: fmt
 fmt:  ## Formats the source code
 	@docker run --rm -it -v $(PWD):/src -w /src golang:$(GO_VERSION) \
-		bash -c "export GOEXPERIMENT=loopvar; export GOTOOLCHAIN=local; \
+		bash -c "export GOTOOLCHAIN=local; \
 		export GO111MODULE=on; export GOPROXY=https://proxy.golang.org; \
 		go install mvdan.cc/gofumpt@$(GOFUMPT_VERSION) && \
 		gofumpt -w ."
@@ -222,7 +238,7 @@ integration: integration.test bldr
 .PHONY: rekres
 rekres:
 	@docker pull $(KRES_IMAGE)
-	@docker run --rm --net=host -v $(PWD):/src -w /src -e GITHUB_TOKEN $(KRES_IMAGE)
+	@docker run --rm --net=host --user $(shell id -u):$(shell id -g) -v $(PWD):/src -w /src -e GITHUB_TOKEN $(KRES_IMAGE)
 
 .PHONY: help
 help:  ## This help menu.

diff --git a/cmd/bldr/cmd/eval.go b/cmd/bldr/cmd/eval.go
@@ -27,7 +27,7 @@ var evalCmd = &cobra.Command{
  Variables are looked up for the target specified as the '--target' flag.'.
  `,
 	Args: cobra.ExactArgs(1),
-	Run: func(cmd *cobra.Command, args []string) {
+	Run: func(_ *cobra.Command, args []string) {
 		context := options.GetVariables().Copy()
 
 		for _, buildArg := range evalCmdFlags.buildArgs {

diff --git a/cmd/bldr/cmd/frontend.go b/cmd/bldr/cmd/frontend.go
@@ -30,7 +30,7 @@ Run with:
 
   docker buildx build -f ./Pkgfile --target <target> .
 `,
-	Run: func(cmd *cobra.Command, args []string) {
+	Run: func(_ *cobra.Command, _ []string) {
 		if err := grpcclient.RunFromEnvironment(
 			appcontext.Context(),
 			func(ctx context.Context, c client.Client) (*client.Result, error) {

diff --git a/cmd/bldr/cmd/graph.go b/cmd/bldr/cmd/graph.go
@@ -25,7 +25,7 @@ Typical usage:
   bldr graph | dot -Tpng > graph.png
 `,
 	Args: cobra.NoArgs,
-	Run: func(cmd *cobra.Command, args []string) {
+	Run: func(_ *cobra.Command, _ []string) {
 		loader := solver.FilesystemPackageLoader{
 			Root:    pkgRoot,
 			Context: options.GetVariables(),

diff --git a/cmd/bldr/cmd/llb.go b/cmd/bldr/cmd/llb.go
@@ -30,7 +30,7 @@ var llbCmd = &cobra.Command{
 and outputs buildkit LLB to stdout. This can be used as 'bldr pack ... | buildctl ...'.
 `,
 	Args: cobra.NoArgs,
-	Run: func(cmd *cobra.Command, args []string) {
+	Run: func(_ *cobra.Command, _ []string) {
 		loader := solver.FilesystemPackageLoader{
 			Root:    pkgRoot,
 			Context: options.GetVariables(),

diff --git a/cmd/bldr/cmd/update.go b/cmd/bldr/cmd/update.go
@@ -122,7 +122,7 @@ var updateCmd = &cobra.Command{
 	Use:   "update",
 	Short: "Update pkgs",
 	Args:  cobra.NoArgs,
-	Run: func(cmd *cobra.Command, args []string) {
+	Run: func(_ *cobra.Command, _ []string) {
 		if !updateCmdFlag.dry {
 			log.Fatal("Real update is not implemented yet; pass `--dry` flag.")
 		}

diff --git a/cmd/bldr/cmd/validate.go b/cmd/bldr/cmd/validate.go
@@ -87,7 +87,7 @@ var validateCmd = &cobra.Command{
 	Long: `This command scans directory tree for pkg.yaml files,
 loads them and validates for errors. `,
 	Args: cobra.NoArgs,
-	Run: func(cmd *cobra.Command, args []string) {
+	Run: func(_ *cobra.Command, _ []string) {
 		loader := solver.FilesystemPackageLoader{
 			Root:    pkgRoot,
 			Context: options.GetVariables(),

diff --git a/cmd/bldr/cmd/version.go b/cmd/bldr/cmd/version.go
@@ -17,7 +17,7 @@ var versionCmd = &cobra.Command{
 	Short: "Prints Bldr version.",
 	Long:  `Prints Bldr version.`,
 	Args:  cobra.NoArgs,
-	Run: func(cmd *cobra.Command, _ []string) {
+	Run: func(_ *cobra.Command, _ []string) {
 		line := fmt.Sprintf("%s version %s (%s)", version.Name, version.Tag, version.SHA)
 		fmt.Println(line)
 	},