Skip to content

Commit

Permalink
[bingo] Update k3d to 5.7.3
Browse files Browse the repository at this point in the history
Signed-off-by: Weifeng Wang <[email protected]>

Update k3d-k3s-config.yaml
  • Loading branch information
qclaogui committed Aug 2, 2024
1 parent be15528 commit 70b215c
Show file tree
Hide file tree
Showing 7 changed files with 264 additions and 6 deletions.
12 changes: 9 additions & 3 deletions .bingo/Variables.mk
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ $(GORELEASER): $(BINGO_DIR)/goreleaser.mod
@echo "(re)installing $(GOBIN)/goreleaser-v1.26.2"
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=goreleaser.mod -o=$(GOBIN)/goreleaser-v1.26.2 "github.com/goreleaser/goreleaser"

GRR := $(GOBIN)/grr-v0.4.4
$(GRR): $(BINGO_DIR)/grr.mod
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
@echo "(re)installing $(GOBIN)/grr-v0.4.4"
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=grr.mod -o=$(GOBIN)/grr-v0.4.4 "github.com/grafana/grizzly/cmd/grr"

JB := $(GOBIN)/jb-v0.5.1
$(JB): $(BINGO_DIR)/jb.mod
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
Expand All @@ -47,11 +53,11 @@ $(JSONNETFMT): $(BINGO_DIR)/jsonnetfmt.mod
@echo "(re)installing $(GOBIN)/jsonnetfmt-v0.20.0"
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=jsonnetfmt.mod -o=$(GOBIN)/jsonnetfmt-v0.20.0 "github.com/google/go-jsonnet/cmd/jsonnetfmt"

K3D := $(GOBIN)/k3d-v5.7.2
K3D := $(GOBIN)/k3d-v5.7.3
$(K3D): $(BINGO_DIR)/k3d.mod
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
@echo "(re)installing $(GOBIN)/k3d-v5.7.2"
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=k3d.mod -o=$(GOBIN)/k3d-v5.7.2 "github.com/k3d-io/k3d/v5"
@echo "(re)installing $(GOBIN)/k3d-v5.7.3"
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=k3d.mod -o=$(GOBIN)/k3d-v5.7.3 "github.com/k3d-io/k3d/v5"

KUSTOMIZE := $(GOBIN)/kustomize-v5.4.3
$(KUSTOMIZE): $(BINGO_DIR)/kustomize.mod
Expand Down
5 changes: 5 additions & 0 deletions .bingo/grr.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT

go 1.22.5

require github.com/grafana/grizzly v0.4.4 // cmd/grr
243 changes: 243 additions & 0 deletions .bingo/grr.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .bingo/k3d.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ go 1.22.5

replace k8s.io/kubelet => k8s.io/kubelet v0.30.2

require github.com/k3d-io/k3d/v5 v5.7.2
require github.com/k3d-io/k3d/v5 v5.7.3
2 changes: 2 additions & 0 deletions .bingo/k3d.sum
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,8 @@ github.com/k3d-io/k3d/v5 v5.7.1 h1:wr5YzPtntg0k5COKMY1s09JX03JsEue+WKE4Kxmv/gc=
github.com/k3d-io/k3d/v5 v5.7.1/go.mod h1:l35jtnaA3X4z11F6q4P8RCWMUL/XvXPk4EIUJrPyI4A=
github.com/k3d-io/k3d/v5 v5.7.2 h1:eeXDUeFVd98pF/opKKspHv/mwS1v0r2ZZO9WjjcVT/k=
github.com/k3d-io/k3d/v5 v5.7.2/go.mod h1:bFlhRV/R1cPT42ZZzQAHPHUF33CbCT8VSbjtjTr3J1Y=
github.com/k3d-io/k3d/v5 v5.7.3 h1:n0+QvaKMH7j2mTToIMDfiLnE+4goCOeucV23AZJUVjQ=
github.com/k3d-io/k3d/v5 v5.7.3/go.mod h1:bFlhRV/R1cPT42ZZzQAHPHUF33CbCT8VSbjtjTr3J1Y=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/klauspost/compress v1.17.0 h1:Rnbp4K9EjcDuVuHtd0dgA4qNuv9yKDYKK1ulpJwgrqM=
Expand Down
4 changes: 3 additions & 1 deletion .bingo/variables.env
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,13 @@ COPYRIGHT="${GOBIN}/copyright-v0.0.0-20230505153745-6b7392939a60"

GORELEASER="${GOBIN}/goreleaser-v1.26.2"

GRR="${GOBIN}/grr-v0.4.4"

JB="${GOBIN}/jb-v0.5.1"

JSONNETFMT="${GOBIN}/jsonnetfmt-v0.20.0"

K3D="${GOBIN}/k3d-v5.7.2"
K3D="${GOBIN}/k3d-v5.7.3"

KUSTOMIZE="${GOBIN}/kustomize-v5.4.3"

Expand Down
2 changes: 1 addition & 1 deletion kubernetes/k3d-k3s-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ agents: 2
kubeAPI:
hostIP: "127.0.0.1"
hostPort: "6550"
image: rancher/k3s:v1.30.2-k3s1
image: rancher/k3s:v1.30.3-k3s1
ports:
# mapping the ingress port 80 to localhost:8080
- port: 8080:80
Expand Down

0 comments on commit 70b215c

Please sign in to comment.