mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Merge pull request #41973 from wojtek-t/build_non_alpha_3_0_17_etcd_image
Automatic merge from submit-queue (batch tested with PRs 42162, 41973, 42015, 42115, 41923) Release 3.0.17 etcd image
This commit is contained in:
commit
1a35155025
@ -36,7 +36,7 @@
|
|||||||
"containers":[
|
"containers":[
|
||||||
{
|
{
|
||||||
"name": "etcd-container",
|
"name": "etcd-container",
|
||||||
"image": "gcr.io/google_containers/etcd:{{ pillar.get('etcd_docker_tag', '3.0.17-alpha.1') }}",
|
"image": "gcr.io/google_containers/etcd:{{ pillar.get('etcd_docker_tag', '3.0.17') }}",
|
||||||
"resources": {
|
"resources": {
|
||||||
"requests": {
|
"requests": {
|
||||||
"cpu": {{ cpulimit }}
|
"cpu": {{ cpulimit }}
|
||||||
|
@ -30,7 +30,7 @@ const (
|
|||||||
KubeSchedulerImage = "scheduler"
|
KubeSchedulerImage = "scheduler"
|
||||||
KubeProxyImage = "proxy"
|
KubeProxyImage = "proxy"
|
||||||
|
|
||||||
etcdVersion = "3.0.14-kubeadm"
|
etcdVersion = "3.0.17"
|
||||||
)
|
)
|
||||||
|
|
||||||
func GetCoreImage(image string, cfg *kubeadmapi.MasterConfiguration, overrideImage string) string {
|
func GetCoreImage(image string, cfg *kubeadmapi.MasterConfiguration, overrideImage string) string {
|
||||||
|
@ -43,7 +43,7 @@ spec:
|
|||||||
mountPath: /srv/kubernetes/
|
mountPath: /srv/kubernetes/
|
||||||
readOnly: true
|
readOnly: true
|
||||||
- name: etcd
|
- name: etcd
|
||||||
image: gcr.io/google_containers/etcd:3.0.17-alpha.1
|
image: gcr.io/google_containers/etcd:3.0.17
|
||||||
command:
|
command:
|
||||||
- /usr/local/bin/etcd
|
- /usr/local/bin/etcd
|
||||||
- --data-dir
|
- --data-dir
|
||||||
|
@ -652,7 +652,7 @@ func createAPIServer(clientset client.Interface, namespace, name, image, credent
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
Name: "etcd",
|
Name: "etcd",
|
||||||
Image: "gcr.io/google_containers/etcd:3.0.17-alpha.1",
|
Image: "gcr.io/google_containers/etcd:3.0.17",
|
||||||
Command: []string{
|
Command: []string{
|
||||||
"/usr/local/bin/etcd",
|
"/usr/local/bin/etcd",
|
||||||
"--data-dir",
|
"--data-dir",
|
||||||
|
@ -829,7 +829,7 @@ func fakeInitHostFactory(apiserverServiceType v1.ServiceType, federationName, na
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
Name: "etcd",
|
Name: "etcd",
|
||||||
Image: "gcr.io/google_containers/etcd:3.0.17-alpha.1",
|
Image: "gcr.io/google_containers/etcd:3.0.17",
|
||||||
Command: []string{
|
Command: []string{
|
||||||
"/usr/local/bin/etcd",
|
"/usr/local/bin/etcd",
|
||||||
"--data-dir",
|
"--data-dir",
|
||||||
|
@ -50,7 +50,7 @@ INSTANCE_PREFIX="${INSTANCE_PREFIX:-}"
|
|||||||
SERVICE_CLUSTER_IP_RANGE="${SERVICE_CLUSTER_IP_RANGE:-}"
|
SERVICE_CLUSTER_IP_RANGE="${SERVICE_CLUSTER_IP_RANGE:-}"
|
||||||
|
|
||||||
# Etcd related variables.
|
# Etcd related variables.
|
||||||
ETCD_IMAGE="${ETCD_IMAGE:-3.0.17-alpha.1}"
|
ETCD_IMAGE="${ETCD_IMAGE:-3.0.17}"
|
||||||
ETCD_VERSION="${ETCD_VERSION:-}"
|
ETCD_VERSION="${ETCD_VERSION:-}"
|
||||||
|
|
||||||
# Controller-manager related variables.
|
# Controller-manager related variables.
|
||||||
|
Loading…
Reference in New Issue
Block a user