Skip to content

Commit

Permalink
chore: Upgrade Go version and dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
tibordp committed Mar 14, 2024
1 parent 85cc39e commit 694fcd1
Show file tree
Hide file tree
Showing 6 changed files with 163 additions and 233 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: "1.20"
go-version: "1.22"

- name: Build
run: go build -v ./...
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM golang:1.20 AS ip-tables-wrapper
FROM golang:1.22 AS ip-tables-wrapper

WORKDIR /tmp/
RUN git clone https://github.com/kubernetes-sigs/iptables-wrappers.git
RUN cd iptables-wrappers && \
make build


FROM golang:1.20 AS builder
FROM golang:1.22 AS builder

WORKDIR $GOPATH/src/github.com/tibordp/wigglenet

Expand All @@ -22,7 +22,7 @@ COPY internal internal
RUN CGO_ENABLED=0 GOOS=linux go build -a -o \
/wigglenetd ./cmd/wigglenet

FROM alpine:3.17
FROM alpine:3.19
RUN apk --no-cache add ca-certificates bash iptables ip6tables
COPY --from=ip-tables-wrapper /tmp/iptables-wrappers/bin/iptables-wrapper /iptables-wrapper
COPY --from=ip-tables-wrapper /tmp/iptables-wrappers/iptables-wrapper-installer.sh /iptables-wrapper-installer.sh
Expand Down
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,10 @@ restart:
logs:
kubectl --context=kind-kind logs -n kube-system -l app=wigglenet

PATCH_COMMAND=mkdir -p /etc/wigglenet && tee /etc/wigglenet/cidrs.txt

patch-ipv6-cidr:
echo "2001:db8:0:1::/64" | docker exec -i kind-control-plane tee /etc/wigglenet/cidrs.txt
echo "2001:db8:0:2::/64" | docker exec -i kind-worker tee /etc/wigglenet/cidrs.txt
echo "2001:db8:0:3::/64" | docker exec -i kind-worker2 tee /etc/wigglenet/cidrs.txt
echo "2001:db8:0:4::/64" | docker exec -i kind-worker3 tee /etc/wigglenet/cidrs.txt
echo "2001:db8:0:1::/64" | docker exec -i kind-control-plane sh -c "$(PATCH_COMMAND)"
echo "2001:db8:0:2::/64" | docker exec -i kind-worker sh -c "$(PATCH_COMMAND)"
echo "2001:db8:0:3::/64" | docker exec -i kind-worker2 sh -c "$(PATCH_COMMAND)"
echo "2001:db8:0:4::/64" | docker exec -i kind-worker3 sh -c "$(PATCH_COMMAND)"
114 changes: 57 additions & 57 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
module github.com/tibordp/wigglenet

go 1.20
go 1.22

require (
github.com/containernetworking/cni v1.1.2
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mdlayher/socket v0.4.1 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/stretchr/testify v1.8.2
github.com/mdlayher/socket v0.5.0 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/stretchr/testify v1.9.0
github.com/vishvananda/netlink v1.1.0
github.com/vishvananda/netns v0.0.4 // indirect
golang.org/x/crypto v0.8.0 // indirect
golang.org/x/net v0.9.0 // indirect
golang.org/x/oauth2 v0.7.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/term v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.30.0 // indirect
k8s.io/api v0.27.1
k8s.io/apimachinery v0.27.1
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/oauth2 v0.18.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/protobuf v1.33.0 // indirect
k8s.io/api v0.29.2
k8s.io/apimachinery v0.29.2
k8s.io/client-go v1.5.2
k8s.io/klog/v2 v2.100.1
k8s.io/kubernetes v1.27.1
k8s.io/utils v0.0.0-20230505201702-9f6742963106
sigs.k8s.io/yaml v1.3.0 // indirect
k8s.io/klog/v2 v2.120.1
k8s.io/kubernetes v1.29.2
k8s.io/utils v0.0.0-20240310230437-4693a0247e57
sigs.k8s.io/yaml v1.4.0 // indirect
)

require golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/josharian/native v1.1.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
Expand All @@ -51,42 +51,42 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
golang.org/x/sync v0.2.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.zx2c4.com/wireguard v0.0.0-20230325221338-052af4a8072b // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)

replace (
k8s.io/api => k8s.io/api v0.27.0
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.0
k8s.io/apimachinery => k8s.io/apimachinery v0.27.0
k8s.io/apiserver => k8s.io/apiserver v0.27.0
k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.0
k8s.io/client-go => k8s.io/client-go v0.27.0
k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.0
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.0
k8s.io/code-generator => k8s.io/code-generator v0.27.0
k8s.io/component-base => k8s.io/component-base v0.27.0
k8s.io/component-helpers => k8s.io/component-helpers v0.27.0
k8s.io/controller-manager => k8s.io/controller-manager v0.27.0
k8s.io/cri-api => k8s.io/cri-api v0.27.0
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.0
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.0
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.0
k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.0
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.0
k8s.io/kubectl => k8s.io/kubectl v0.27.0
k8s.io/kubelet => k8s.io/kubelet v0.27.0
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.0
k8s.io/metrics => k8s.io/metrics v0.27.0
k8s.io/mount-utils => k8s.io/mount-utils v0.27.0
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.0
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.0
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.27.0
k8s.io/api => k8s.io/api v0.29.0
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.0
k8s.io/apimachinery => k8s.io/apimachinery v0.29.0
k8s.io/apiserver => k8s.io/apiserver v0.29.0
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.0
k8s.io/client-go => k8s.io/client-go v0.29.0
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.0
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.0
k8s.io/code-generator => k8s.io/code-generator v0.29.0
k8s.io/component-base => k8s.io/component-base v0.29.0
k8s.io/component-helpers => k8s.io/component-helpers v0.29.0
k8s.io/controller-manager => k8s.io/controller-manager v0.29.0
k8s.io/cri-api => k8s.io/cri-api v0.29.0
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.0
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.0
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.0
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.0
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.0
k8s.io/kubectl => k8s.io/kubectl v0.29.0
k8s.io/kubelet => k8s.io/kubelet v0.29.0
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.0
k8s.io/metrics => k8s.io/metrics v0.29.0
k8s.io/mount-utils => k8s.io/mount-utils v0.29.0
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.0
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.0
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.0
)
Loading

0 comments on commit 694fcd1

Please sign in to comment.