Skip to content

Commit

Permalink
[ci:component:github.com/gardener/machine-controller-manager:v0.50.1-…
Browse files Browse the repository at this point in the history 
…>v0.52.0] (#112)

* Upgrade github.com_gardener_machine-controller-manager

from v0.50.1 to v0.52.0

* adapt 0.52.0 MCM: rem git-go,Makefile,ginkgov2

---------

Co-authored-by: elankath <[email protected]>
  • Loading branch information
@gardener-robot-ci-1 @elankath
gardener-robot-ci-1 and elankath authored Jan 30, 2024
1 parent f589ad7 commit 147efab
Show file tree
Hide file tree
Showing 1,450 changed files with 56,912 additions and 113,668 deletions.
13 changes: 10 additions & 3 deletions .ci/local_integration_test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,21 @@ set -e
# For the test step concourse will set the following environment variables:
# SOURCE_PATH - path to component repository root directory.


mcm_repo_link="dev/mcm"
if [[ ! -d "$mcm_repo_link" ]]; then
echo "Error: MCM Repo expected at: $mcm_repo_link
For running local Integration Tests, kindly checkout MCM Repo locally and execute 'ln -sf <absolutePathToMcmRepo> $mcm_repo_link'"
exit 1
fi

cd test/integration/controller
if ! hash ginkgo; then
# Install Ginkgo (test framework) to be able to execute the tests.
echo "Fetching Ginkgo frawework"
GO111MODULE=off go get -u github.com/onsi/ginkgo/ginkgo
GO111MODULE=off go install github.com/onsi/ginkgo/v2/ginkgo
echo "Successfully fetched Ginkgo frawework"
fi

echo "Starting integration tests..."

ginkgo -v
ginkgo -v --show-node-events --poll-progress-after=480s --poll-progress-interval=90s
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ main
# Output of the go coverage tool
*coverprofile.out*
.ci/controllers-test/logs/*
test/integration/controller/controller.test
2 changes: 1 addition & 1 deletion MCM_VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.50.1
v0.52.0
8 changes: 4 additions & 4 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@ clean:

.PHONY: test-integration
test-integration:
@if [[ -f $(PWD)/$(CONTROL_KUBECONFIG) ]]; then export CONTROL_KUBECONFIG=$(PWD)/$(CONTROL_KUBECONFIG); fi; \
if [[ -f $(PWD)/$(TARGET_KUBECONFIG) ]]; then export TARGET_KUBECONFIG=$(PWD)/$(TARGET_KUBECONFIG); fi; \
if [[ -f $(PWD)/$(MACHINECLASS_V1) ]]; then export MACHINECLASS_V1=$(PWD)/$(MACHINECLASS_V1); fi; \
if [[ -f $(PWD)/$(MACHINECLASS_V2) ]]; then export MACHINECLASS_V2=$(PWD)/$(MACHINECLASS_V2); fi; \
@if [[ -f $(PWD)/$(CONTROL_KUBECONFIG) ]]; then export CONTROL_KUBECONFIG=$(PWD)/$(CONTROL_KUBECONFIG); elif [[ -f $(CONTROL_KUBECONFIG) ]]; then export CONTROL_KUBECONFIG=$(CONTROL_KUBECONFIG);else echo "No such file exists for CONTROL_KUBECONFIG";exit 1; fi; \
if [[ -f $(PWD)/$(TARGET_KUBECONFIG) ]]; then export TARGET_KUBECONFIG=$(PWD)/$(TARGET_KUBECONFIG); elif [[ -f $(TARGET_KUBECONFIG) ]]; then export TARGET_KUBECONFIG=$(TARGET_KUBECONFIG);else echo "No such file exists for TARGET_KUBECONFIG";exit 1; fi; \
if [[ -f "$(PWD)/$(MACHINECLASS_V1)" ]]; then export MACHINECLASS_V1="$(PWD)/$(MACHINECLASS_V1)"; elif [[ -f "$(MACHINECLASS_V1)" ]]; then export MACHINECLASS_V1="$(MACHINECLASS_V1)"; fi; \
if [[ -f "$(PWD)/$(MACHINECLASS_V2)" ]]; then export MACHINECLASS_V2="$(PWD)/$(MACHINECLASS_V2)"; elif [[ -f "$(MACHINECLASS_V2)" ]]; then export MACHINECLASS_V2="$(MACHINECLASS_V2)"; fi; \
export MC_CONTAINER_IMAGE=$(MC_IMAGE); \
export MCM_CONTAINER_IMAGE=$(MCM_IMAGE); \
export CONTROL_CLUSTER_NAMESPACE=$(CONTROL_NAMESPACE); \
Expand Down
82 changes: 33 additions & 49 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,63 +5,54 @@ go 1.21
require (
github.com/ahmetb/gen-crd-api-reference-docs v0.3.0
github.com/gardener/gardener v1.79.0
github.com/gardener/machine-controller-manager v0.50.1
github.com/gardener/machine-controller-manager v0.52.0
github.com/gophercloud/gophercloud v1.7.0
github.com/gophercloud/utils v0.0.0-20230523080330-de873b9cf00d
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.27.7
github.com/prometheus/client_golang v1.15.1
github.com/onsi/ginkgo/v2 v2.13.0
github.com/onsi/gomega v1.29.0
github.com/prometheus/client_golang v1.16.0
github.com/spf13/pflag v1.0.5
go.uber.org/mock v0.2.0
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
k8s.io/api v0.27.5
k8s.io/apimachinery v0.27.5
k8s.io/code-generator v0.27.5
k8s.io/component-base v0.27.5
k8s.io/klog/v2 v2.90.1
k8s.io/utils v0.0.0-20230209194617-a36077c30491
k8s.io/api v0.28.2
k8s.io/apimachinery v0.28.2
k8s.io/code-generator v0.28.2
k8s.io/component-base v0.28.2
k8s.io/klog/v2 v2.100.1
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
)

require (
github.com/Masterminds/semver v1.5.0 // indirect
github.com/Microsoft/go-winio v0.4.16 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
github.com/acomagu/bufpipe v1.0.3 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/bronze1man/yaml2json v0.0.0-20211227013850-8972abeaea25 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
github.com/emirpasic/gods v1.12.0 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-git/gcfg v1.5.0 // indirect
github.com/go-git/go-billy/v5 v5.3.1 // indirect
github.com/go-git/go-git/v5 v5.4.2 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/zapr v1.2.4 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.1 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/gobuffalo/flect v0.3.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/hashicorp/go-uuid v1.0.3 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
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/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
Expand All @@ -70,43 +61,36 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/onsi/ginkgo/v2 v2.9.5 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/sergi/go-diff v1.1.0 // indirect
github.com/spf13/afero v1.8.2 // indirect
github.com/spf13/cobra v1.6.1 // indirect
github.com/xanzy/ssh-agent v0.3.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.7.0 // indirect
github.com/spf13/cobra v1.7.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/crypto v0.6.0 // indirect
golang.org/x/mod v0.10.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/oauth2 v0.5.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
golang.org/x/mod v0.13.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.9.1 // indirect
golang.org/x/tools v0.14.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.27.5 // indirect
k8s.io/apiserver v0.27.5 // indirect
k8s.io/client-go v0.27.5 // indirect
k8s.io/cluster-bootstrap v0.27.5 // indirect
k8s.io/apiextensions-apiserver v0.28.2 // indirect
k8s.io/apiserver v0.28.2 // indirect
k8s.io/client-go v0.28.2 // indirect
k8s.io/cluster-bootstrap v0.28.2 // indirect
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20221212190805-d4f1e822ca11 // indirect
sigs.k8s.io/controller-tools v0.11.4 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
Expand Down
Loading

0 comments on commit 147efab

Please sign in to comment.