Skip to content

Commit

Permalink
feat: make MachineIDMetadataKey public
Browse files Browse the repository at this point in the history
Make the header constant public so the providers can import it.

Also bump Go, deps & rekres.

Signed-off-by: Utku Ozdemir <[email protected]>
  • Loading branch information
utkuozdemir committed Dec 6, 2024
1 parent 6bcca60 commit f427806
Show file tree
Hide file tree
Showing 7 changed files with 79 additions and 69 deletions.
6 changes: 3 additions & 3 deletions .kres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ spec:
- name: EXTENSIONS_REPO
defaultValue: https://github.com/siderolabs/extensions.git
- name: EXTENSIONS_REF
defaultValue: v1.9.0-alpha.3
defaultValue: v1.9.0-beta.0
- name: EXTENSIONS_PATH
defaultValue: guest-agents/metal-agent
- name: EXTENSION_DIGESTS_IMAGE
Expand All @@ -66,7 +66,7 @@ spec:
- name: IMAGER_TAG
# this must point to a commit where Talos agent mode logic was introduced,
# i.e., not older than https://github.com/siderolabs/talos/commit/2136358d65ddf6ad040ed62c835b335f99a59399
defaultValue: v1.9.0-alpha.3
defaultValue: v1.9.0-beta.0
- name: PUSH_TAG
defaultValue: "" # if specified, needs to be a semver tag for the extension validation to not fail
- name: OUTPUT_REGISTRY_AND_USERNAME
Expand All @@ -92,7 +92,7 @@ spec:
hack/boot-assets/push.sh
variables: # MAKE SURE to have the same values in the image-boot-assets step as well
- name: IMAGER_TAG
defaultValue: v1.9.0-alpha.3 # point to the same one above
defaultValue: v1.9.0-beta.0 # point to the same one above
- name: PUSH_TAG
defaultValue: "" # point to the same one above
- name: OUTPUT_REGISTRY_AND_USERNAME
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# syntax = docker/dockerfile-upstream:1.11.1-labs
# syntax = docker/dockerfile-upstream:1.12.0-labs

# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2024-11-26T21:50:10Z by kres 232fe63.
# Generated on 2024-12-06T12:12:05Z by kres 1ebe796.

ARG TOOLCHAIN

# runs markdownlint
FROM docker.io/oven/bun:1.1.36-alpine AS lint-markdown
FROM docker.io/oven/bun:1.1.38-alpine AS lint-markdown
WORKDIR /src
RUN bun i [email protected] [email protected]
COPY .markdownlint.json .
Expand Down
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2024-11-26T21:50:10Z by kres 232fe63.
# Generated on 2024-12-06T12:26:36Z by kres 1ebe796.

# common variables

Expand All @@ -21,11 +21,11 @@ PROTOBUF_GO_VERSION ?= 1.35.2
GRPC_GO_VERSION ?= 1.5.1
GRPC_GATEWAY_VERSION ?= 2.24.0
VTPROTOBUF_VERSION ?= 0.6.0
GOIMPORTS_VERSION ?= 0.27.0
GOIMPORTS_VERSION ?= 0.28.0
DEEPCOPY_VERSION ?= v0.5.6
GOLANGCILINT_VERSION ?= v1.62.0
GOLANGCILINT_VERSION ?= v1.62.2
GOFUMPT_VERSION ?= v0.7.0
GO_VERSION ?= 1.23.3
GO_VERSION ?= 1.23.4
GO_BUILDFLAGS ?=
GO_LDFLAGS ?=
CGO_ENABLED ?= 0
Expand Down Expand Up @@ -74,11 +74,11 @@ TOOLCHAIN ?= docker.io/golang:1.23-alpine
# extra variables

EXTENSIONS_REPO ?= https://github.com/siderolabs/extensions.git
EXTENSIONS_REF ?= v1.9.0-alpha.3
EXTENSIONS_REF ?= v1.9.0-beta.0
EXTENSIONS_PATH ?= guest-agents/metal-agent
EXTENSION_DIGESTS_IMAGE ?= ghcr.io/siderolabs/extensions
IMAGER_REGISTRY_AND_USERNAME ?= ghcr.io/siderolabs
IMAGER_TAG ?= v1.9.0-alpha.3
IMAGER_TAG ?= v1.9.0-beta.0
PUSH_TAG ?=
OUTPUT_REGISTRY_AND_USERNAME ?= ghcr.io/siderolabs
TEMP_REGISTRY ?= 127.0.0.1:5005
Expand Down
34 changes: 17 additions & 17 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
module github.com/siderolabs/talos-metal-agent

go 1.23.3
go 1.23.4

replace github.com/pensando/goipmi v0.0.0-20240603174436-eb122d901c23 => github.com/siderolabs/goipmi v0.0.0-20211214143420-35f956689e67
replace github.com/pensando/goipmi => github.com/siderolabs/goipmi v0.0.0-20211214143420-35f956689e67

require (
github.com/cosi-project/runtime v0.7.2
github.com/cosi-project/runtime v0.7.5
github.com/jhump/grpctunnel v0.3.0
github.com/pensando/goipmi v0.0.0-20240603174436-eb122d901c23
github.com/planetscale/vtprotobuf v0.6.1-0.20240917153116-6f2963f01587
github.com/planetscale/vtprotobuf v0.6.1-0.20241121165744-79df5c4772f2
github.com/siderolabs/go-procfs v0.1.2
github.com/siderolabs/talos v1.9.0-alpha.3
github.com/siderolabs/talos/pkg/machinery v1.9.0-alpha.3
github.com/siderolabs/talos v1.9.0-beta.0
github.com/siderolabs/talos/pkg/machinery v1.9.0-beta.0
github.com/spf13/cobra v1.8.1
go.uber.org/zap v1.27.0
golang.org/x/sync v0.9.0
google.golang.org/grpc v1.68.0
golang.org/x/sync v0.10.0
google.golang.org/grpc v1.68.1
google.golang.org/protobuf v1.35.2
)

require (
cel.dev/expr v0.18.0 // indirect
cel.dev/expr v0.19.0 // indirect
github.com/ProtonMail/go-crypto v1.1.3 // indirect
github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f // indirect
github.com/ProtonMail/gopenpgp/v2 v2.8.1 // indirect
Expand Down Expand Up @@ -50,7 +50,7 @@ require (
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
github.com/siderolabs/crypto v0.5.0 // indirect
github.com/siderolabs/crypto v0.5.1 // indirect
github.com/siderolabs/gen v0.7.0 // indirect
github.com/siderolabs/go-api-signature v0.3.6 // indirect
github.com/siderolabs/go-blockdevice/v2 v2.0.6 // indirect
Expand All @@ -61,13 +61,13 @@ require (
github.com/stoewer/go-strcase v1.3.0 // indirect
github.com/stretchr/objx v0.5.2 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.29.0 // indirect
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
golang.org/x/net v0.31.0 // indirect
golang.org/x/sys v0.27.0 // indirect
golang.org/x/text v0.20.0 // indirect
golang.org/x/crypto v0.30.0 // indirect
golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d // indirect
golang.org/x/net v0.32.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.8.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241206012308-a4fef0638583 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241206012308-a4fef0638583 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit f427806

Please sign in to comment.