Skip to content

Commit

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

* Upgrade github_com_gardener_machine-controller-manager

from v0.51.1 to v0.52.0

* adopt go-git removal

* update TARGET_RESOURCE_GROUP to TARGET_CLUSTER_NAME in pipeline IT script

---------

Co-authored-by: gardener-robot-ci-1 <gardener.ci.user@gmail.com>
Co-authored-by: elankath <tarun.ramakrishna.elankath@sap.com>
Co-authored-by: Rishabh Patel <rishabh.patel@sap.com>
  • Loading branch information
4 people authored Jan 24, 2024
1 parent efef94a commit b3a39b9
Show file tree
Hide file tree
Showing 416 changed files with 63 additions and 78,165 deletions.
7 changes: 7 additions & 0 deletions .ci/local_integration_test
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ 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.
Expand Down
11 changes: 10 additions & 1 deletion .ci/pipeline_integration_test
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ NC='\033[0m' # No Color

mkdir -p dev

mcm_repo_path="dev/mcm"
logs_path=.ci/controllers-test/logs
TEST_RESULT=
cli_path=/cc/utils/cli.py
Expand All @@ -15,7 +16,7 @@ TEST_SHOOT=gcp-ci-it
CREDENTIALS_SECRET_NAME=shoot-operator-gcp-team
GARDEN_CORE_NAMESPACE=garden-core
KUBECONFIG_EXPIRY=10800
export TARGET_RESOURCE_GROUP=$TEST_SHOOT # Due to some azure assumption in IT code in MCM. TODO: remove this in later release of MCM
export TARGET_CLUSTER_NAME=$TEST_SHOOT

#these variables are accessed in test/integration/controller so prefixed by ${SOURCE_PATH} for absolute path
declare CONTROL_KUBECONFIG=${SOURCE_PATH}/dev/control_kubeconfig.yaml
Expand Down Expand Up @@ -181,6 +182,14 @@ function setup_environment() {
setup_ginkgo
fi

# Clone MCM Repo into $mcm_repo_path
if [[ ! -d "$mcm_repo_path" ]]; then
printf "Cloning machine-controller-manager repo into %s.\n" "$mcm_repo_path"
local cloneCmd="git clone https://github.com/gardener/machine-controller-manager.git $mcm_repo_path --recursive"
printf "Executing %s...\n" "$cloneCmd"
eval $cloneCmd
fi

#fetching kubeconfigs and machineClass from secret_server
fetch_service_account_kubeconfig
fetch_oot_cluster_kubeconfig
Expand Down
2 changes: 1 addition & 1 deletion MCM_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.51.1
v0.52.0
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ test-integration:
export CONTROL_CLUSTER_NAMESPACE=$(CONTROL_NAMESPACE); \
export MACHINE_CONTROLLER_MANAGER_DEPLOYMENT_NAME=$(MACHINE_CONTROLLER_MANAGER_DEPLOYMENT_NAME); \
if [[ -z "${IS_CONTROL_CLUSTER_SEED}" ]]; then export IS_CONTROL_CLUSTER_SEED=true; fi; \
if [[ -z "${TARGET_RESOURCE_GROUP}" ]]; then echo "Please set env-var TARGET_RESOURCE_GROUP to cluster name ">&2; exit 1; fi; \
if [[ -z "${TARGET_CLUSTER_NAME}" ]]; then echo "Please set env-var TARGET_CLUSTER_NAME ">&2; exit 1; fi; \
export TAGS_ARE_STRINGS=$(TAGS_ARE_STRINGS); \
.ci/local_integration_test
#########################################
Expand Down
15 changes: 1 addition & 14 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/gardener/machine-controller-manager-provider-gcp
go 1.21

require (
github.com/gardener/machine-controller-manager v0.51.1
github.com/gardener/machine-controller-manager v0.52.0
github.com/onsi/ginkgo/v2 v2.13.0
github.com/onsi/gomega v1.29.0
github.com/pkg/errors v0.9.1
Expand All @@ -23,19 +23,12 @@ require (
cloud.google.com/go/compute v1.23.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
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/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/emirpasic/gods v1.12.0 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // 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.3.0 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
Expand All @@ -54,23 +47,18 @@ require (
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // 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/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
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/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/sergi/go-diff v1.1.0 // indirect
github.com/spf13/cobra v1.7.0 // indirect
github.com/xanzy/ssh-agent v0.3.0 // indirect
go.opencensus.io v0.24.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/sys v0.14.0 // indirect
Expand All @@ -83,7 +71,6 @@ require (
google.golang.org/grpc v1.57.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/inf.v0 v0.9.1 // 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.28.2 // indirect
Expand Down
Loading

0 comments on commit b3a39b9

Please sign in to comment.