Skip to content

Commit

Permalink
Revendor g/g v1.71. (#36)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Gerrit91
Gerrit91 authored Nov 17, 2023
1 parent 08a41df commit caa00aa
Show file tree
Hide file tree
Showing 5 changed files with 152 additions and 303 deletions.
35 changes: 18 additions & 17 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,17 @@ VERIFY := true
LEADER_ELECTION := false
IGNORE_OPERATION_ANNOTATION := false

CGO_ENABLED := 0
GO111MODULE := on
GOLANGCI_LINT_VERSION := v1.48.0
GO_VERSION := 1.21

ifeq ($(CI),true)
DOCKER_TTY_ARG=""
else
DOCKER_TTY_ARG=t
endif

CGO_ENABLED := 0
export GO111MODULE := on

### Build commands

Expand All @@ -52,19 +60,20 @@ install: revendor $(CONTROLLER_GEN) $(GEN_CRD_API_REFERENCE_DOCS) $(HELM) $(MOCK

.PHONY: revendor
revendor:
go mod vendor
go mod tidy
chmod +x vendor/github.com/gardener/gardener/hack/*.sh
@GO111MODULE=on go mod vendor
@GO111MODULE=on go mod tidy
@chmod +x $(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/*
@chmod +x $(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/.ci/*

.PHONY: generate
generate:
generate: $(HELM)
@$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/generate.sh ./charts/... ./cmd/... ./pkg/...

.PHONE: generate-in-docker
generate-in-docker:
docker run --rm -it -v $(PWD):/go/src/github.com/metal-stack/os-metal-extension golang:1.19 \
generate-in-docker: revendor $(HELM) $(YQ)
docker run --rm -it -v $(PWD):/go/src/github.com/metal-stack/os-metal-extension golang:$(GO_VERSION) \
sh -c "cd /go/src/github.com/metal-stack/os-metal-extension \
&& make revendor install generate \
&& make generate \
&& chown -R $(shell id -u):$(shell id -g) ."

.PHONY: docker-image
Expand All @@ -74,11 +83,3 @@ docker-image:
.PHONY: docker-push
docker-push:
@docker push $(IMAGE_PREFIX)/os-metal-extension:$(IMAGE_TAG)

### Debug / Development commands
.PHONY: start-os-metal
start-os-metal:
@LEADER_ELECTION_NAMESPACE=garden go run \
-ldflags $(LD_FLAGS) \
./cmd \
--leader-election=$(LEADER_ELECTION)
5 changes: 5 additions & 0 deletions charts/os-metal/templates/deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ spec:
labels:
app.kubernetes.io/name: gardener-extension-os-metal
app.kubernetes.io/instance: {{ .Release.Name }}
networking.gardener.cloud/to-runtime-apiserver: allowed
networking.gardener.cloud/to-dns: allowed
networking.gardener.cloud/to-public-networks: allowed
networking.gardener.cloud/to-private-networks: allowed
networking.resources.gardener.cloud/to-all-shoots-kube-apiserver-tcp-443: allowed
spec:
serviceAccountName: gardener-extension-os-metal
containers:
Expand Down
2 changes: 1 addition & 1 deletion example/controller-registration.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: os-metal
type: helm
providerConfig:
chart: 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
chart: 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
values:
image:
tag: 0.0.1
Expand Down
58 changes: 29 additions & 29 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,25 @@ go 1.21
require (
github.com/ahmetb/gen-crd-api-reference-docs v0.3.0
github.com/flatcar/container-linux-config-transpiler v0.9.4
github.com/gardener/gardener v1.60.0
github.com/gardener/gardener v1.71.6
github.com/go-logr/logr v1.2.4
github.com/golang/mock v1.6.0
github.com/onsi/ginkgo v1.16.5
github.com/spf13/cobra v1.7.0
k8s.io/api v0.25.0
k8s.io/apimachinery v0.25.0
k8s.io/api v0.26.3
k8s.io/apimachinery v0.26.3
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
k8s.io/code-generator v0.25.0
k8s.io/component-base v0.25.0
k8s.io/code-generator v0.26.3
k8s.io/component-base v0.26.3
k8s.io/utils v0.0.0-20230209194617-a36077c30491
sigs.k8s.io/controller-runtime v0.13.0
sigs.k8s.io/controller-runtime v0.14.6
)

require (
github.com/BurntSushi/toml v1.2.1 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver v1.5.0 // indirect
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/ajeddeloh/go-json v0.0.0-20200220154158-5ae607161559 // indirect
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
github.com/beorn7/perks v1.0.1 // indirect
Expand All @@ -35,17 +33,20 @@ require (
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
github.com/cyphar/filepath-securejoin v0.2.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/flatcar/ignition v0.36.2 // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/gardener/etcd-druid v0.12.3 // indirect
github.com/fluent/fluent-operator/v2 v2.2.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/gardener/etcd-druid v0.15.3 // indirect
github.com/gardener/hvpa-controller v0.3.1 // indirect
github.com/gardener/machine-controller-manager v0.48.1 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-logr/zapr v1.2.3 // indirect
github.com/go-openapi/errors v0.20.3 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/swag v0.19.14 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/gobuffalo/flect v1.0.2 // indirect
Expand All @@ -65,7 +66,7 @@ require (
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kubernetes-csi/external-snapshotter/v2 v2.1.5 // indirect
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
Expand Down Expand Up @@ -103,34 +104,33 @@ require (
golang.org/x/tools v0.12.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03 // indirect
google.golang.org/genproto v0.0.0-20221018160656-63c7b68cfc55 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
istio.io/api v0.0.0-20221013011440-bc935762d2b9 // indirect
istio.io/client-go v1.15.3 // indirect
k8s.io/apiextensions-apiserver v0.25.0 // indirect
k8s.io/apiserver v0.25.0 // indirect
istio.io/api v0.0.0-20230217221049-9d422bf48675 // indirect
istio.io/client-go v1.17.1 // indirect
k8s.io/apiextensions-apiserver v0.26.3 // indirect
k8s.io/autoscaler v0.0.0-20190805135949-100e91ba756e // indirect
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
k8s.io/helm v2.16.1+incompatible // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/klog/v2 v2.80.1 // indirect
k8s.io/kube-aggregator v0.25.0 // indirect
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
k8s.io/metrics v0.25.0 // indirect
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20220706173534-cd0058ad295c // indirect
sigs.k8s.io/controller-tools v0.10.0 // indirect
k8s.io/klog/v2 v2.90.1 // indirect
k8s.io/kube-aggregator v0.26.3 // indirect
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
k8s.io/kubelet v0.26.3 // indirect
k8s.io/metrics v0.26.3 // indirect
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20221212190805-d4f1e822ca11 // indirect
sigs.k8s.io/controller-tools v0.11.3 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace (
github.com/ajeddeloh/yaml => github.com/ajeddeloh/yaml v0.0.0-20170912190910-6b94386aeefd // indirect
k8s.io/client-go => k8s.io/client-go v0.25.0
k8s.io/klog/v2 => k8s.io/klog/v2 v2.30.0
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.0
k8s.io/client-go => k8s.io/client-go v0.26.3
// for some reason, newer gengo versions will fail with "hit an unsupported type"
k8s.io/gengo => k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c // indirect
)
Loading

0 comments on commit caa00aa

Please sign in to comment.