Skip to content

Commit

Permalink
Update dependencies, build with go-1.16, use mcm v0.40 (#14)
Browse files Browse the repository at this point in the history
  • Loading branch information
majst01 authored Oct 19, 2021
1 parent d78892c commit 1992c9d
Show file tree
Hide file tree
Showing 7 changed files with 695 additions and 418 deletions.
1 change: 0 additions & 1 deletion .github/workflows/latest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ jobs:
- name: Lint
uses: golangci/golangci-lint-action@v2
with:
version: v1.32.2
args: --timeout=3m

- name: Build
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/pull_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ jobs:
- name: Lint
uses: golangci/golangci-lint-action@v2
with:
version: v1.32.2
args: --timeout=3m

- name: Build
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ jobs:
- name: Lint
uses: golangci/golangci-lint-action@v2
with:
version: v1.32.2
args: --timeout=3m

- name: Build
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM golang:1.15 AS builder
FROM golang:1.16 AS builder
WORKDIR /work
COPY . .
RUN make build

FROM alpine:3.12
FROM alpine:3.14
RUN apk add --update bash curl tzdata
WORKDIR /
COPY --from=builder /work/bin/machine-controller /machine-controller
Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ build:
-o bin/machine-controller \
-ldflags "-X main.version=${VERSION}-$(git rev-parse HEAD)" \
cmd/machine-controller/main.go
strip bin/machine-controller

.PHONY: docker-image
docker-image:
Expand Down
55 changes: 20 additions & 35 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,49 +1,34 @@
module github.com/metal-stack/machine-controller-manager-provider-metal

go 1.15
go 1.16

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/gardener/machine-controller-manager v0.35.2
github.com/go-openapi/validate v0.20.0 // indirect
github.com/gogo/protobuf v1.3.1 // indirect
github.com/google/go-cmp v0.5.4 // indirect
github.com/gardener/machine-controller-manager v0.41.0
github.com/google/gofuzz v1.2.0 // indirect
github.com/googleapis/gnostic v0.4.0 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/imdario/mergo v0.3.11 // indirect
github.com/lestrrat-go/jwx v1.0.6 // indirect
github.com/metal-stack/masterdata-api v0.8.4 // indirect
github.com/metal-stack/metal-go v0.11.1
github.com/metal-stack/metal-lib v0.6.6
github.com/onsi/ginkgo v1.14.2
github.com/onsi/gomega v1.10.3
github.com/prometheus/client_golang v1.9.0 // indirect
github.com/prometheus/common v0.15.0 // indirect
github.com/metal-stack/metal-go v0.15.7
github.com/metal-stack/metal-lib v0.9.0
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.16.0
github.com/spf13/pflag v1.0.5
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad // indirect
golang.org/x/net v0.0.0-20201224014010-6772e930b67b // indirect
golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5 // indirect
golang.org/x/sys v0.0.0-20210104204734-6f8348627aad // indirect
golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf // indirect
golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 // indirect
google.golang.org/appengine v1.6.7 // indirect
k8s.io/api v0.17.14
k8s.io/apimachinery v0.17.14
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
k8s.io/api v0.20.6
k8s.io/apimachinery v0.20.6
k8s.io/client-go v1.5.1 // indirect
k8s.io/cluster-bootstrap v0.17.14 // indirect
k8s.io/component-base v0.17.14
k8s.io/component-base v0.20.6
k8s.io/klog v1.0.0
sigs.k8s.io/yaml v1.2.0 // indirect
)

replace (
github.com/prometheus/client_golang => github.com/prometheus/client_golang v0.9.2
k8s.io/api => k8s.io/api v0.17.14
k8s.io/apimachinery => k8s.io/apimachinery v0.17.14
k8s.io/apiserver => k8s.io/apiserver v0.17.14
k8s.io/client-go => k8s.io/client-go v0.17.14
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.17.14
k8s.io/code-generator => k8s.io/code-generator v0.17.14
// k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf
github.com/go-logr/logr => github.com/go-logr/logr v0.4.0
k8s.io/api => k8s.io/api v0.20.6
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.6
k8s.io/apimachinery => k8s.io/apimachinery v0.20.6
k8s.io/apiserver => k8s.io/apiserver v0.20.6
k8s.io/client-go => k8s.io/client-go v0.20.6
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.6
k8s.io/code-generator => k8s.io/code-generator v0.20.6
)
Loading

0 comments on commit 1992c9d

Please sign in to comment.