Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ipxe to 23.1.2023 #12

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@ jobs:
name: Build
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.19
uses: actions/setup-go@v2
- name: Set up Go 1.20
uses: actions/setup-go@v3
with:
go-version: 1.19
go-version: "1.20"
id: go

- name: Check out code into the Go module directory
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Lint
uses: golangci/golangci-lint-action@v2
uses: golangci/golangci-lint-action@v3
with:
args: -p bugs -p unused --timeout=3m

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM golang:1.19-bullseye as builder
FROM golang:1.20-bullseye as builder
WORKDIR /work
COPY . .
RUN apt update \
&& apt install --yes --no-install-recommends \
liblzma-dev \
&& make ipxe pixie

FROM alpine:3.16
FROM alpine:3.17
RUN apk -U add ca-certificates
COPY --from=builder /work/build/pixie /pixie
ENTRYPOINT ["/pixie"]
1 change: 1 addition & 0 deletions api/api.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package api

// MetalConfig is consumed by metal-hammer to get all options to open a grpc connection to the metal-api
// nolint:musttag
type MetalConfig struct {
Debug bool
GRPCAddress string `json:"address,omitempty"`
Expand Down
48 changes: 23 additions & 25 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,51 +1,49 @@
module github.com/metal-stack/pixie

go 1.19
go 1.20

require (
github.com/metal-stack/metal-api v0.21.4
github.com/metal-stack/metal-api v0.22.3
github.com/metal-stack/v v1.0.3
github.com/pin/tftp/v3 v3.0.0
github.com/prometheus/client_golang v1.13.0
github.com/prometheus/client_golang v1.14.0
github.com/spf13/cobra v1.6.1
github.com/spf13/viper v1.13.0
github.com/stretchr/testify v1.8.1
go.uber.org/zap v1.23.0
golang.org/x/crypto v0.1.0
golang.org/x/net v0.1.0
google.golang.org/grpc v1.50.1
github.com/spf13/viper v1.15.0
github.com/stretchr/testify v1.8.2
go.uber.org/zap v1.24.0
golang.org/x/crypto v0.7.0
golang.org/x/net v0.8.0
google.golang.org/grpc v1.53.0
)

require (
github.com/benbjohnson/clock v1.3.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.7 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/spf13/afero v1.9.2 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/spf13/afero v1.9.5 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.4.1 // indirect
github.com/subosito/gotenv v1.4.2 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
golang.org/x/sys v0.1.0 // indirect
golang.org/x/text v0.4.0 // indirect
google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71 // indirect
google.golang.org/protobuf v1.28.1 // indirect
go.uber.org/multierr v1.10.0 // indirect
golang.org/x/sys v0.6.0 // indirect
golang.org/x/text v0.8.0 // indirect
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
185 changes: 48 additions & 137 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ipxe/IPXE_COMMIT_SHA
Original file line number Diff line number Diff line change
@@ -1 +1 @@
70995397e5bdfd3431e12971aa40630c7014785f
62a1d5c0f5bc52227ba43ccb7924694d661449a2
2 changes: 2 additions & 0 deletions pixiecore/boot.ipxe
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ set x:int32 0

set user-class pixiecore

echo metal-stack pixie

# Try to get a filename from ProxyDHCP, retrying a couple of times if
# we fail.
:loop
Expand Down
9 changes: 9 additions & 0 deletions pixiecore/cli/grpccmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package cli

import (
"fmt"
"net/url"
"os"

"github.com/metal-stack/pixie/api"
Expand Down Expand Up @@ -115,10 +116,18 @@ func getMetalAPIConfig(cmd *cobra.Command) (*api.MetalConfig, error) {
if err != nil {
return nil, fmt.Errorf("error reading flag: %w", err)
}
_, err = url.Parse(metalAPIUrl)
if err != nil {
return nil, fmt.Errorf("unable to parse metal-api-url: %w", err)
}
pixieAPIUrl, err := cmd.Flags().GetString("pixie-api-url")
if err != nil {
return nil, fmt.Errorf("error reading flag: %w", err)
}
_, err = url.Parse(pixieAPIUrl)
if err != nil {
return nil, fmt.Errorf("unable to parse pixie-api-url: %w", err)
}
metalHammerDebug, err := cmd.Flags().GetBool("metal-hammer-debug")
if err != nil {
return nil, fmt.Errorf("error reading flag: %w", err)
Expand Down