Skip to content

Commit

Permalink
chore: bump agent Talos version and deps
Browse files Browse the repository at this point in the history 
Bump Go deps including Talos machinery.

Bump the Talos version used to boot into the agent mode.

Bump the version of the local boot assets with Talos v1.9.0.

Signed-off-by: Utku Ozdemir <[email protected]>
  • Loading branch information
@utkuozdemir
utkuozdemir committed Dec 18, 2024
1 parent d2369e4 commit d5f562a
Show file tree
Hide file tree
Showing 8 changed files with 147 additions and 149 deletions.
2 changes: 1 addition & 1 deletion .github/renovate.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"description": "THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.\n\nGenerated on 2024-12-16T23:04:25Z by kres 318187b.\n\n",
"description": "THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.",
"prHeader": "Update Request | Renovate Bot",
"extends": [
":dependencyDashboard",
Expand Down
2 changes: 1 addition & 1 deletion .kres.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ spec:
source: /usr/libexec/
destination: /var/lib/ipxe/arm64
-
stage: ghcr.io/siderolabs/talos-metal-agent-boot-assets:v1.9.0-beta.1-agent-v0.1.0-beta.0 # to be used with --use-local-boot-assets for local development
stage: ghcr.io/siderolabs/talos-metal-agent-boot-assets:v1.9.0-agent-v0.1.0-beta.1 # to be used with --use-local-boot-assets for local development
# stage: 127.0.0.1:5005/siderolabs/talos-metal-agent-boot-assets:v0.0.1-local # for local development, to be replaced with the line above and rekres-ed
source: /
destination: /assets
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2024-12-16T23:04:25Z by kres 318187b.
# Generated on 2024-12-18T11:15:26Z by kres b9507d6.

ARG TOOLCHAIN

Expand Down Expand Up @@ -225,7 +225,7 @@ COPY --from=ghcr.io/siderolabs/ipmitool:v1.8.0-16-g71d23b4 / /
COPY --from=ghcr.io/siderolabs/ipxe:v1.8.0-16-g71d23b4 /usr/libexec/zbin /bin/zbin
COPY --from=ipxe-linux-amd64 /usr/libexec/ /var/lib/ipxe/amd64
COPY --from=ipxe-linux-arm64 /usr/libexec/ /var/lib/ipxe/arm64
COPY --from=ghcr.io/siderolabs/talos-metal-agent-boot-assets:v1.9.0-beta.1-agent-v0.1.0-beta.0 / /assets
COPY --from=ghcr.io/siderolabs/talos-metal-agent-boot-assets:v1.9.0-agent-v0.1.0-beta.1 / /assets
LABEL org.opencontainers.image.source=https://github.com/siderolabs/omni-infra-provider-bare-metal
ENTRYPOINT ["/provider"]

32 changes: 12 additions & 20 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,32 +34,17 @@ For local development using Talos running on QEMU, follow these steps:
docker run -d -p 5005:5000 --restart always --name local registry:2
```

3. Start Talos nodes on QEMU, set to PXE boot:
3. Build `qemu-up` command line tool, and use it to start some QEMU machines:

```bash
talosctl cluster create \
--provisioner=qemu \
--cidr=172.20.0.0/24 \
--controlplanes=3 \
--workers=0 \
--disable-dhcp-hostname=true \
--with-bootloader=true \
--with-apply-config=false \
--skip-injecting-config=true \
--wait=false \
--with-init-node=true \
--default-boot-order=nc \
--pxe-booted \
--memory=8192 \
--cpus=6 \
--with-uefi=false \
--with-uuid-hostnames
make qemu-up
sudo -E _out/qemu-up-linux-amd64
```

4. (Optional) If you have made local changes to the [Talos Metal agent](https://github.com/siderolabs/talos-metal-agent), follow these steps to use your local version:
1. Build and push Talos Metal Agent boot assets image following [these instructions](https://github.com/siderolabs/talos-metal-agent/blob/main/README.md).
2. Replace the `ghcr.io/siderolabs/talos-metal-agent-boot-assets` image reference in [.kres.yaml](.kres.yaml) with your built image,
e.g., `127.0.0.1:5005/siderolabs/talos-metal-agent-boot-assets:v1.9.0-alpha.2-agent-v0.1.0-alpha.0-1-gbf1282b-dirty`.
e.g., `127.0.0.1:5005/siderolabs/talos-metal-agent-boot-assets:v1.9.0-agent-v0.1.0-beta.1-1-gbf1282b-dirty`.
3. Re-kres the project to propagate this change into `Dockerfile`:

```bash
Expand Down Expand Up @@ -88,7 +73,7 @@ For local development using Talos running on QEMU, follow these steps:
--use-local-boot-assets \
--agent-test-mode \
--api-power-mgmt-state-dir=/api-power-mgmt-state \
--dhcp-proxy-iface-or-ip=172.20.0.1 \
--dhcp-proxy-iface-or-ip=172.42.0.1 \
--debug
```

Expand All @@ -104,3 +89,10 @@ For local development using Talos running on QEMU, follow these steps:
- `--api-power-mgmt-state-dir`: Specifies where to read the API power management address of the nodes.
- `--dhcp-proxy-iface-or-ip`: Specifies the IP address or interface name for running the DHCP proxy
(e.g., the IP address of the QEMU bridge interface).
The tool `qemu-up` uses the subnet `172.42.0.0/24` by default, and the bridge IP address on the host is `172.42.0.1`.

7. When you are done with the development/testing, destroy all QEMU machines and their network bridge:

```bash
sudo -E _out/qemu-up-linux-amd64 --destroy
```
81 changes: 41 additions & 40 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,33 +8,33 @@ replace (
)

require (
github.com/cosi-project/runtime v0.7.5
github.com/cosi-project/runtime v0.8.0
github.com/google/uuid v1.6.0
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.2.0
github.com/hashicorp/go-multierror v1.1.1
github.com/insomniacslk/dhcp v0.0.0-20240829085014-a3a4c1f04475
github.com/insomniacslk/dhcp v0.0.0-20241203100832-a481575ed0ef
github.com/jhump/grpctunnel v0.3.0
github.com/pensando/goipmi v0.0.0-20240603174436-eb122d901c23
github.com/pin/tftp/v3 v3.1.0
github.com/planetscale/vtprotobuf v0.6.1-0.20241121165744-79df5c4772f2
github.com/siderolabs/gen v0.7.0
github.com/siderolabs/image-factory v0.6.2
github.com/siderolabs/gen v0.8.0
github.com/siderolabs/image-factory v0.6.3
github.com/siderolabs/net v0.4.0
github.com/siderolabs/omni/client v0.0.0-20241205095318-ce403382d64c
github.com/siderolabs/talos v1.9.0-beta.0
github.com/siderolabs/talos-metal-agent v0.1.0-alpha.3
github.com/siderolabs/talos/pkg/machinery v1.9.0-beta.0
github.com/siderolabs/omni/client v0.45.0
github.com/siderolabs/talos v1.9.0
github.com/siderolabs/talos-metal-agent v0.1.0-beta.0
github.com/siderolabs/talos/pkg/machinery v1.9.0
github.com/spf13/cobra v1.8.1
github.com/stmcginnis/gofish v0.20.0
go.uber.org/zap v1.27.0
golang.org/x/net v0.32.0
golang.org/x/sync v0.10.0
google.golang.org/grpc v1.68.1
google.golang.org/protobuf v1.35.2
google.golang.org/grpc v1.69.0
google.golang.org/protobuf v1.36.0
)

require (
cel.dev/expr v0.19.0 // indirect
cel.dev/expr v0.19.1 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/ProtonMail/go-crypto v1.1.3 // indirect
github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f // indirect
Expand All @@ -47,18 +47,18 @@ require (
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cloudflare/circl v1.5.0 // indirect
github.com/containerd/go-cni v1.1.10 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
github.com/containerd/go-cni v1.1.11 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
github.com/containernetworking/cni v1.2.3 // indirect
github.com/containernetworking/plugins v1.6.0 // indirect
github.com/containernetworking/plugins v1.6.1 // indirect
github.com/coreos/go-iptables v0.8.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/docker v27.3.1+incompatible // indirect
github.com/docker/docker v27.4.0+incompatible // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/emicklei/dot v1.6.3 // indirect
github.com/emicklei/dot v1.6.4 // indirect
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/florianl/go-tc v0.4.4 // indirect
Expand All @@ -73,7 +73,7 @@ require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/cel-go v0.22.1 // indirect
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
github.com/google/gnostic-models v0.6.9 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/go-containerregistry v0.20.2 // indirect
github.com/google/gofuzz v1.2.0 // indirect
Expand All @@ -82,14 +82,14 @@ require (
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-getter/v2 v2.2.3 // indirect
github.com/hashicorp/go-safetemp v1.0.0 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/josharian/native v1.1.0 // indirect
github.com/jsimonetti/rtnetlink/v2 v2.0.2 // indirect
github.com/jsimonetti/rtnetlink/v2 v2.0.3-0.20241216183107-2d6e9f8ad3f2 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.17.11 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mailru/easyjson v0.9.0 // indirect
github.com/mdlayher/ethtool v0.2.0 // indirect
github.com/mdlayher/genetlink v1.3.2 // indirect
github.com/mdlayher/netlink v1.7.2 // indirect
Expand All @@ -103,13 +103,13 @@ require (
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/opencontainers/runtime-spec v1.2.0 // indirect
github.com/pierrec/lz4/v4 v4.1.21 // indirect
github.com/pierrec/lz4/v4 v4.1.22 // indirect
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.1 // indirect
github.com/siderolabs/go-api-signature v0.3.6 // indirect
github.com/siderolabs/go-blockdevice/v2 v2.0.6 // indirect
github.com/siderolabs/go-blockdevice/v2 v2.0.8 // indirect
github.com/siderolabs/go-cmd v0.1.3 // indirect
github.com/siderolabs/go-kubernetes v0.2.17 // indirect
github.com/siderolabs/go-pointer v1.0.0 // indirect
Expand All @@ -122,38 +122,39 @@ require (
github.com/stoewer/go-strcase v1.3.0 // indirect
github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 // indirect
github.com/ulikunitz/xz v0.5.12 // indirect
github.com/vbatts/tar-split v0.11.5 // indirect
github.com/vbatts/tar-split v0.11.6 // indirect
github.com/vishvananda/netlink v1.3.0 // indirect
github.com/vishvananda/netns v0.0.4 // indirect
github.com/vishvananda/netns v0.0.5 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect
go.opentelemetry.io/otel v1.32.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
go.opentelemetry.io/otel v1.33.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0 // indirect
go.opentelemetry.io/otel/metric v1.32.0 // indirect
go.opentelemetry.io/otel/metric v1.33.0 // indirect
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
go.opentelemetry.io/otel/trace v1.32.0 // indirect
go.opentelemetry.io/otel/trace v1.33.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.30.0 // indirect
golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d // indirect
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
golang.org/x/oauth2 v0.24.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/term v0.27.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-20241206012308-a4fef0638583 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241206012308-a4fef0638583 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241216192217-9240e9c98484 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241216192217-9240e9c98484 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gotest.tools/v3 v3.5.1 // indirect
k8s.io/api v0.32.0-rc.1 // indirect
k8s.io/apimachinery v0.32.0-rc.1 // indirect
k8s.io/client-go v0.32.0-rc.1 // indirect
k8s.io/api v0.32.0 // indirect
k8s.io/apimachinery v0.32.0 // indirect
k8s.io/client-go v0.32.0 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078 // indirect
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/knftables v0.0.17 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
sigs.k8s.io/knftables v0.0.18 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
Loading

0 comments on commit d5f562a

Please sign in to comment.