mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-17 23:57:49 +00:00
Merge pull request #122359 from bart0sh/PR128-cluster-gce-upgrade-cos-image-family
cluster/gce: upgrade cos-97-lts -> cos-109-lts
This commit is contained in:
commit
e94a712fbd
@ -90,7 +90,7 @@ fi
|
|||||||
# By default, the latest image from the image family will be used unless an
|
# By default, the latest image from the image family will be used unless an
|
||||||
# explicit image will be set.
|
# explicit image will be set.
|
||||||
GCI_VERSION=${KUBE_GCI_VERSION:-}
|
GCI_VERSION=${KUBE_GCI_VERSION:-}
|
||||||
IMAGE_FAMILY=${KUBE_IMAGE_FAMILY:-cos-97-lts}
|
IMAGE_FAMILY=${KUBE_IMAGE_FAMILY:-cos-109-lts}
|
||||||
export MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
|
export MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
|
||||||
export MASTER_IMAGE_FAMILY=${KUBE_GCE_MASTER_IMAGE_FAMILY:-${IMAGE_FAMILY}}
|
export MASTER_IMAGE_FAMILY=${KUBE_GCE_MASTER_IMAGE_FAMILY:-${IMAGE_FAMILY}}
|
||||||
export MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-cos-cloud}
|
export MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-cos-cloud}
|
||||||
|
@ -103,7 +103,7 @@ ALLOWED_NOTREADY_NODES=${ALLOWED_NOTREADY_NODES:-$(($(get-num-nodes) / 100))}
|
|||||||
# By default, the latest image from the image family will be used unless an
|
# By default, the latest image from the image family will be used unless an
|
||||||
# explicit image will be set.
|
# explicit image will be set.
|
||||||
GCI_VERSION=${KUBE_GCI_VERSION:-}
|
GCI_VERSION=${KUBE_GCI_VERSION:-}
|
||||||
IMAGE_FAMILY=${KUBE_IMAGE_FAMILY:-cos-97-lts}
|
IMAGE_FAMILY=${KUBE_IMAGE_FAMILY:-cos-109-lts}
|
||||||
export MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
|
export MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
|
||||||
export MASTER_IMAGE_FAMILY=${KUBE_GCE_MASTER_IMAGE_FAMILY:-${IMAGE_FAMILY}}
|
export MASTER_IMAGE_FAMILY=${KUBE_GCE_MASTER_IMAGE_FAMILY:-${IMAGE_FAMILY}}
|
||||||
export MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-cos-cloud}
|
export MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-cos-cloud}
|
||||||
|
Loading…
Reference in New Issue
Block a user