WIP: Bump cloud-provider-gcp to k8s v1.24 #333

Fedosin · 2022-05-23T20:17:39Z

Ran:
go mod tidy && ./tools/update_vendor.sh

k8s-ci-robot · 2022-05-23T20:18:07Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: Fedosin
To complete the pull request process, please assign cheftako after the PR has been reviewed.
You can assign the PR to them by writing /assign @cheftako in a comment when ready.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Fedosin · 2022-05-23T21:00:13Z

/test cloud-provider-gcp-e2e-full

jprzychodzen · 2022-05-24T15:02:22Z

Before that we should probably do #331 to have a clean cut for 1.23.

/hold

go.mod

Ran: go mod tidy && ./tools/update_vendor.sh && ./tools/update_bazel.sh

jprzychodzen · 2022-06-22T14:26:57Z

I see diffs between k/k release-1.24 branch and this commit (regarding the cluster directory). Are those changes by design?

jprzychodzen · 2022-06-22T14:27:04Z

/assign

k8s-ci-robot · 2022-06-22T15:49:24Z

@Fedosin: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
cloud-provider-gcp-e2e-full	`5b92f53`	link	true	`/test cloud-provider-gcp-e2e-full`

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

k8s-ci-robot · 2022-06-23T00:35:35Z

@Fedosin: PR needs rebase.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

jprzychodzen

I've reviewed /cluster part. It seems that some of stuff needs to be different from k/k repository, to enable running CCM.

jprzychodzen · 2022-06-23T15:02:03Z

cluster/common.sh

@@ -311,10 +311,9 @@ function set_binary_version() {
 function find-tar() {
  local -r tarball=$1
  locations=(
-    "${KUBE_ROOT}/bazel-bin/release/${tarball}"


It seems that this is reverting CCM specific code change, there are some other. I'm doing upgrade to newest release-1.23 k/k /cluster directory to identify all differences between k/k and cloud-provider-gcp differences in #341

jprzychodzen · 2022-06-23T15:02:35Z

cluster/common.sh

@@ -506,13 +505,8 @@ EOF
 # If KUBERNETES_SKIP_CONFIRM is set to y, we'll automatically download binaries
 # without prompting.
 function verify-kube-binaries() {
-  # TODO: @cheftako Remove the hack to get a local kubectl from existing tars.


I'm not sure if we can change that (it might be cloud-provider-gcp specific)

jprzychodzen · 2022-06-23T15:03:16Z

cluster/gce/config-common.sh

@@ -27,7 +27,10 @@ function get-num-nodes {
 #   NUM_NODES
 #   NUM_WINDOWS_NODES
 function get-master-size {
-  local suggested_master_size=2


This needs to be different. We are running additional controller on master machine

Added setting on presubmit level, no need to revert this anymore

See kubernetes/test-infra#26662

Actually, it's still needed (and also node size override to n1-standard-4), as kubetest2 does not support presets.

jprzychodzen · 2022-06-23T15:03:53Z

cluster/gce/config-default.sh

@@ -419,10 +404,7 @@ EVICTION_HARD="${EVICTION_HARD:-memory.available<250Mi,nodefs.available<10%,node
 SCHEDULING_ALGORITHM_PROVIDER="${SCHEDULING_ALGORITHM_PROVIDER:-}"

 # Optional: install a default StorageClass
-ENABLE_DEFAULT_STORAGE_CLASS="${ENABLE_DEFAULT_STORAGE_CLASS:-true}"


422-425 are cloud-provider-gcp specific.

jprzychodzen · 2022-06-23T15:04:28Z

cluster/gce/config-default.sh

 # TLS_CIPHER_SUITES defines cipher suites allowed to be used by kube-apiserver.
 # If this variable is unset or empty, kube-apiserver will allow its default set of cipher suites.
 export TLS_CIPHER_SUITES=""

-# Optional: Enable credential sidecar.


570 - 582 are cloud-provider-specific, we need them.

jprzychodzen · 2022-06-23T15:19:09Z

cluster/gce/util.sh

@@ -1336,9 +1273,6 @@ ${var_name}: ${var_value}
 EOF
    done
  fi
-  cat >>$file <<EOF
-ENABLE_CREDENTIAL_SIDECAR: $(yaml-quote ${ENABLE_CREDENTIAL_SIDECAR:-false})


jprzychodzen · 2022-06-23T15:19:17Z

cluster/gce/util.sh

@@ -1379,8 +1313,6 @@ KUBE_POD_LOG_READERS_GROUP: 2007
 KONNECTIVITY_SERVER_RUNASUSER: 2008
 KONNECTIVITY_SERVER_RUNASGROUP: 2008
 KONNECTIVITY_SERVER_SOCKET_WRITER_GROUP: 2008
-CLOUD_CONTROLLER_MANAGER_RUNASUSER: 2009


jprzychodzen · 2022-06-23T15:21:05Z

cluster/get-kube-binaries.sh

@@ -97,7 +97,7 @@ function detect_client_info() {
  if [ -n "${KUBERNETES_CLIENT_ARCH-}" ]; then
    CLIENT_ARCH="${KUBERNETES_CLIENT_ARCH}"
  else
-    # TODO: migrate the kube::util::host_platform function out of hack/lib and


Might be reverted, to keep in line with usage of util.sh from /cluster

jprzychodzen · 2022-06-23T15:21:35Z

cluster/kubectl.sh

@@ -32,15 +32,25 @@ set -o pipefail

 KUBE_ROOT=${KUBE_ROOT:-$(dirname "${BASH_SOURCE[0]}")/..}
 source "${KUBE_ROOT}/cluster/kube-util.sh"
-source "${KUBE_ROOT}/cluster/clientbin.sh"


This file is tricky, I'm not sure if we need to use cloud-provider-gcp version, or we are free to use k/k

jprzychodzen · 2022-06-23T15:22:14Z

cluster/log-dump/log-dump.sh

@@ -41,7 +41,7 @@ readonly master_ssh_supported_providers="gce aws"
 readonly node_ssh_supported_providers="gce gke aws"
 readonly gcloud_supported_providers="gce gke"

-readonly master_logfiles="kube-apiserver.log kube-apiserver-audit.log kube-scheduler.log kube-controller-manager.log etcd.log etcd-events.log glbc.log cluster-autoscaler.log kube-addon-manager.log konnectivity-server.log fluentd.log kubelet.cov cloud-controller-manager.log"


Please revert, so we will gather logs from ccm.

jprzychodzen · 2022-07-27T08:41:55Z

/close

It has already happened.

k8s-ci-robot · 2022-07-27T08:42:16Z

@jprzychodzen: Closed this PR.

In response to this:

/close

It has already happened.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels May 23, 2022

k8s-ci-robot requested review from jpbetz and mikedanese May 23, 2022 20:18

Fedosin force-pushed the bump_k8s_124 branch 2 times, most recently from 5874b8d to 377810d Compare May 23, 2022 20:38

Fedosin force-pushed the bump_k8s_124 branch 6 times, most recently from 1c43ac9 to eeb6ba3 Compare May 24, 2022 12:22

k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels May 24, 2022

Fedosin force-pushed the bump_k8s_124 branch from eeb6ba3 to 55974dd Compare May 30, 2022 13:07

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 30, 2022

JoelSpeed reviewed May 30, 2022

View reviewed changes

go.mod Show resolved Hide resolved

Fedosin added 4 commits May 30, 2022 16:55

Bump cloud-provider-gcp to k8s v1.24

f2b9786

Ran: go mod tidy && ./tools/update_vendor.sh && ./tools/update_bazel.sh

Uprade to Kubernetes 1.24.0 in WORKSPACE

92cd9f7

Fix breaking changes introduced after upgrading to 1.24

e474b18

Bump providers to k8s v1.24

ca7dd74

Fedosin force-pushed the bump_k8s_124 branch from 55974dd to e2006e7 Compare May 30, 2022 15:05

Fedosin force-pushed the bump_k8s_124 branch 2 times, most recently from 33a8cb6 to 883c4b9 Compare June 22, 2022 13:32

k8s-ci-robot assigned jprzychodzen Jun 22, 2022

Fedosin force-pushed the bump_k8s_124 branch from 883c4b9 to ac9f1d6 Compare June 22, 2022 15:06

Sync cluster/gce folder with kubernetes release-v1.24 branch

5b92f53

Fedosin force-pushed the bump_k8s_124 branch from ac9f1d6 to 5b92f53 Compare June 22, 2022 15:44

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 23, 2022

jprzychodzen reviewed Jun 23, 2022

View reviewed changes

Fedosin mentioned this pull request Jun 23, 2022

Bug 2087042: UPSTREAM: 333: Bump providers to k8s v1.24 openshift/cloud-provider-gcp#17

Merged

k8s-ci-robot closed this Jul 27, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WIP: Bump cloud-provider-gcp to k8s v1.24 #333

WIP: Bump cloud-provider-gcp to k8s v1.24 #333

Fedosin commented May 23, 2022

k8s-ci-robot commented May 23, 2022

Fedosin commented May 23, 2022

jprzychodzen commented May 24, 2022

jprzychodzen commented Jun 22, 2022

jprzychodzen commented Jun 22, 2022

k8s-ci-robot commented Jun 22, 2022 •

edited

k8s-ci-robot commented Jun 23, 2022

jprzychodzen left a comment

jprzychodzen Jun 23, 2022

jprzychodzen Jun 23, 2022

jprzychodzen Jun 23, 2022

jprzychodzen Jun 24, 2022

jprzychodzen Jun 24, 2022

jprzychodzen Jun 23, 2022

jprzychodzen Jun 23, 2022

jprzychodzen Jun 23, 2022

jprzychodzen Jun 23, 2022

jprzychodzen Jun 23, 2022

jprzychodzen Jun 23, 2022

jprzychodzen Jun 23, 2022

jprzychodzen commented Jul 27, 2022

k8s-ci-robot commented Jul 27, 2022

WIP: Bump cloud-provider-gcp to k8s v1.24 #333

WIP: Bump cloud-provider-gcp to k8s v1.24 #333

Conversation

Fedosin commented May 23, 2022

k8s-ci-robot commented May 23, 2022

Fedosin commented May 23, 2022

jprzychodzen commented May 24, 2022

jprzychodzen commented Jun 22, 2022

jprzychodzen commented Jun 22, 2022

k8s-ci-robot commented Jun 22, 2022 • edited

k8s-ci-robot commented Jun 23, 2022

jprzychodzen left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jprzychodzen commented Jul 27, 2022

k8s-ci-robot commented Jul 27, 2022

k8s-ci-robot commented Jun 22, 2022 •

edited