Merge pull request #27961 from maisem/os-distribution

Automatic merge from submit-queue

Splitting OS_DISTRIBUTION into NODE_OS_DISTRIBUTION and MASTER_OS_DISTRIBUTION

fixes #26183 
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()

hack/ginkgo-e2e.sh

@@ -119,8 +119,9 @@ export PATH=$(dirname "${e2e_test}"):"${PATH}"
   --repo-root="${KUBE_ROOT}" \
   --node-instance-group="${NODE_INSTANCE_GROUP:-}" \
   --prefix="${KUBE_GCE_INSTANCE_PREFIX:-e2e}" \
-  ${OS_DISTRIBUTION:+"--os-distro=${OS_DISTRIBUTION}"} \
   ${KUBE_CONTAINER_RUNTIME:+"--container-runtime=${KUBE_CONTAINER_RUNTIME}"} \
+  ${MASTER_OS_DISTRIBUTION:+"--master-os-distro=${MASTER_OS_DISTRIBUTION}"} \
+  ${NODE_OS_DISTRIBUTION:+"--node-os-distro=${NODE_OS_DISTRIBUTION}"} \
   ${NUM_NODES:+"--num-nodes=${NUM_NODES}"} \
   ${E2E_CLEAN_START:+"--clean-start=true"} \
   ${E2E_MIN_STARTUP_PODS:+"--minStartupPods=${E2E_MIN_STARTUP_PODS}"} \

hack/jenkins/e2e-runner.sh

@@ -215,7 +215,7 @@ if [[ -n "${JENKINS_GCI_IMAGE_FAMILY:-}" ]]; then
   GCI_STAGING_PROJECT=container-vm-image-staging
   export KUBE_GCE_MASTER_PROJECT="${GCI_STAGING_PROJECT}"
   export KUBE_GCE_MASTER_IMAGE="$(get_latest_gci_image "${GCI_STAGING_PROJECT}" "${JENKINS_GCI_IMAGE_FAMILY}")"
-  export KUBE_OS_DISTRIBUTION="gci"
+  export KUBE_MASTER_OS_DISTRIBUTION="gci"
   if [[ "${JENKINS_GCI_IMAGE_FAMILY}" == "gci-canary-test" ]]; then
     # The family "gci-canary-test" is reserved for a special type of GCI images
     # that are used to continuously validate Docker releases.

hack/verify-flags/exceptions.txt

@@ -13,7 +13,7 @@ cluster/gce/configure-vm.sh:  api_servers: '${KUBERNETES_MASTER_NAME}'
 cluster/gce/configure-vm.sh:  cloud_config: ${CLOUD_CONFIG}
 cluster/gce/configure-vm.sh:  env-to-grains "runtime_config"
 cluster/gce/configure-vm.sh:  kubelet_api_servers: '${KUBELET_APISERVER}'
-cluster/gce/coreos/helper.sh:# cloud_config yaml file should be passed
+cluster/gce/coreos/node-helper.sh:# cloud_config yaml file should be passed
 cluster/gce/gci/configure-helper.sh:      reconcile_cidr="false"
 cluster/gce/gci/configure-helper.sh:  local api_servers="--master=https://${KUBERNETES_MASTER_NAME}"
 cluster/gce/gci/configure-helper.sh:  local reconcile_cidr="true"

hack/verify-flags/known-flags.txt

@@ -281,6 +281,7 @@ make-symlinks
 manifest-url
 manifest-url-header
 masquerade-all
+master-os-distro
 master-service-namespace
 max-concurrency
 max-connection-bytes-per-sec
@@ -328,6 +329,7 @@ node-labels
 node-monitor-grace-period
 node-monitor-period
 node-name
+node-os-distro
 node-startup-grace-period
 node-status-update-frequency
 node-sync-period
@@ -340,7 +342,6 @@ oidc-issuer-url
 oidc-username-claim
 only-idl
 oom-score-adj
-os-distro
 out-version
 outofdisk-transition-frequency
 output-base