github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #41973 from wojtek-t/build_non_alpha_3_0_17_etcd_image

Browse Source 
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:
Kubernetes Submit Queue 2017-02-28 22:05:59 -08:00 committed by GitHub
commit 1a35155025
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/saltbase/salt/etcd/etcd.manifest
View File

@ -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 }}

2
cmd/kubeadm/app/images/images.go
View File

@ -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 {

2
federation/manifests/federation-apiserver-deployment.yaml
View File

@ -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

2
federation/pkg/kubefed/init/init.go
View File

@ -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",

2
federation/pkg/kubefed/init/init_test.go
View File

@ -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",

2
test/kubemark/start-kubemark.sh
View File

@ -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.