mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-21 01:26:28 +00:00
Update serve_hostname version from 1.1 to v1.4
This commit is contained in:
parent
2bb6f74bf9
commit
f22ddf1ea8
@ -57,7 +57,7 @@ spec:
|
||||
kubernetes.io/cluster-service: "true"
|
||||
spec:
|
||||
containers:
|
||||
- image: gcr.io/google_containers/serve_hostname:1.1
|
||||
- image: gcr.io/google_containers/serve_hostname:v1.4
|
||||
name: addon-test
|
||||
ports:
|
||||
- containerPort: 9376
|
||||
@ -87,7 +87,7 @@ spec:
|
||||
kubernetes.io/cluster-service: "true"
|
||||
spec:
|
||||
containers:
|
||||
- image: gcr.io/google_containers/serve_hostname:1.1
|
||||
- image: gcr.io/google_containers/serve_hostname:v1.4
|
||||
name: addon-test
|
||||
ports:
|
||||
- containerPort: 9376
|
||||
@ -155,7 +155,7 @@ spec:
|
||||
kubernetes.io/cluster-service: "true"
|
||||
spec:
|
||||
containers:
|
||||
- image: gcr.io/google_containers/serve_hostname:1.1
|
||||
- image: gcr.io/google_containers/serve_hostname:v1.4
|
||||
name: invalid-addon-test
|
||||
ports:
|
||||
- containerPort: 9376
|
||||
|
@ -73,7 +73,7 @@ var _ = KubeDescribe("Daemon set [Serial]", func() {
|
||||
|
||||
f = NewDefaultFramework("daemonsets")
|
||||
|
||||
image := "gcr.io/google_containers/serve_hostname:1.1"
|
||||
image := "gcr.io/google_containers/serve_hostname:v1.4"
|
||||
dsName := "daemon-set"
|
||||
|
||||
var ns string
|
||||
|
@ -70,7 +70,7 @@ func etcdFailTest(framework *Framework, failCommand, fixCommand string) {
|
||||
|
||||
checkExistingRCRecovers(framework)
|
||||
|
||||
ServeImageOrFail(framework, "basic", "gcr.io/google_containers/serve_hostname:1.1")
|
||||
ServeImageOrFail(framework, "basic", "gcr.io/google_containers/serve_hostname:v1.4")
|
||||
}
|
||||
|
||||
// For this duration, etcd will be failed by executing a failCommand on the master.
|
||||
|
@ -53,7 +53,7 @@ var _ = KubeDescribe("Events", func() {
|
||||
Containers: []api.Container{
|
||||
{
|
||||
Name: "p",
|
||||
Image: "gcr.io/google_containers/serve_hostname:1.1",
|
||||
Image: "gcr.io/google_containers/serve_hostname:v1.4",
|
||||
Ports: []api.ContainerPort{{ContainerPort: 80}},
|
||||
},
|
||||
},
|
||||
|
@ -97,7 +97,7 @@ var _ = KubeDescribe("Load capacity", func() {
|
||||
loadTests := []Load{
|
||||
// The container will consume 1 cpu and 512mb of memory.
|
||||
{podsPerNode: 3, image: "jess/stress", command: []string{"stress", "-c", "1", "-m", "2"}},
|
||||
{podsPerNode: 30, image: "gcr.io/google_containers/serve_hostname:1.1"},
|
||||
{podsPerNode: 30, image: "gcr.io/google_containers/serve_hostname:v1.4"},
|
||||
}
|
||||
|
||||
for _, testArg := range loadTests {
|
||||
|
@ -584,7 +584,7 @@ var _ = KubeDescribe("Pods", func() {
|
||||
Containers: []api.Container{
|
||||
{
|
||||
Name: "srv",
|
||||
Image: "gcr.io/google_containers/serve_hostname:1.1",
|
||||
Image: "gcr.io/google_containers/serve_hostname:v1.4",
|
||||
Ports: []api.ContainerPort{{ContainerPort: 9376}},
|
||||
},
|
||||
},
|
||||
|
@ -33,14 +33,14 @@ var _ = KubeDescribe("ReplicationController", func() {
|
||||
framework := NewDefaultFramework("replication-controller")
|
||||
|
||||
It("should serve a basic image on each replica with a public image [Conformance]", func() {
|
||||
ServeImageOrFail(framework, "basic", "gcr.io/google_containers/serve_hostname:1.1")
|
||||
ServeImageOrFail(framework, "basic", "gcr.io/google_containers/serve_hostname:v1.4")
|
||||
})
|
||||
|
||||
It("should serve a basic image on each replica with a private image", func() {
|
||||
// requires private images
|
||||
SkipUnlessProviderIs("gce", "gke")
|
||||
|
||||
ServeImageOrFail(framework, "private", "b.gcr.io/k8s_authenticated_test/serve_hostname:1.1")
|
||||
ServeImageOrFail(framework, "private", "b.gcr.io/k8s_authenticated_test/serve_hostname:v1.4")
|
||||
})
|
||||
})
|
||||
|
||||
|
@ -35,14 +35,14 @@ var _ = KubeDescribe("ReplicaSet", func() {
|
||||
framework := NewDefaultFramework("replicaset")
|
||||
|
||||
It("should serve a basic image on each replica with a public image [Conformance]", func() {
|
||||
ReplicaSetServeImageOrFail(framework, "basic", "gcr.io/google_containers/serve_hostname:1.1")
|
||||
ReplicaSetServeImageOrFail(framework, "basic", "gcr.io/google_containers/serve_hostname:v1.4")
|
||||
})
|
||||
|
||||
It("should serve a basic image on each replica with a private image", func() {
|
||||
// requires private images
|
||||
SkipUnlessProviderIs("gce", "gke")
|
||||
|
||||
ReplicaSetServeImageOrFail(framework, "private", "b.gcr.io/k8s_authenticated_test/serve_hostname:1.1")
|
||||
ReplicaSetServeImageOrFail(framework, "private", "b.gcr.io/k8s_authenticated_test/serve_hostname:v1.4")
|
||||
})
|
||||
})
|
||||
|
||||
|
@ -43,7 +43,7 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
serveHostnameImage = "gcr.io/google_containers/serve_hostname:1.1"
|
||||
serveHostnameImage = "gcr.io/google_containers/serve_hostname:v1.4"
|
||||
resizeNodeReadyTimeout = 2 * time.Minute
|
||||
resizeNodeNotReadyTimeout = 2 * time.Minute
|
||||
nodeReadinessTimeout = 3 * time.Minute
|
||||
|
@ -1295,7 +1295,7 @@ func startServeHostnameService(c *client.Client, ns, name string, port, replicas
|
||||
maxContainerFailures := 0
|
||||
config := RCConfig{
|
||||
Client: c,
|
||||
Image: "gcr.io/google_containers/serve_hostname:1.1",
|
||||
Image: "gcr.io/google_containers/serve_hostname:v1.4",
|
||||
Name: name,
|
||||
Namespace: ns,
|
||||
PollInterval: 3 * time.Second,
|
||||
|
@ -35,7 +35,7 @@ var _ = KubeDescribe("Ubernetes Lite", func() {
|
||||
framework := NewDefaultFramework("ubernetes-lite")
|
||||
var zoneCount int
|
||||
var err error
|
||||
image := "gcr.io/google_containers/serve_hostname:1.1"
|
||||
image := "gcr.io/google_containers/serve_hostname:v1.4"
|
||||
BeforeEach(func() {
|
||||
if zoneCount <= 0 {
|
||||
zoneCount, err = getZoneCount(framework.Client)
|
||||
|
@ -177,7 +177,7 @@ func main() {
|
||||
Containers: []api.Container{
|
||||
{
|
||||
Name: "serve-hostname",
|
||||
Image: "gcr.io/google_containers/serve_hostname:1.1",
|
||||
Image: "gcr.io/google_containers/serve_hostname:v1.4",
|
||||
Ports: []api.ContainerPort{{ContainerPort: 9376}},
|
||||
},
|
||||
},
|
||||
|
@ -200,7 +200,7 @@ func main() {
|
||||
Containers: []api.Container{
|
||||
{
|
||||
Name: "serve-hostname",
|
||||
Image: "gcr.io/google_containers/serve_hostname:1.1",
|
||||
Image: "gcr.io/google_containers/serve_hostname:v1.4",
|
||||
Ports: []api.ContainerPort{{ContainerPort: 9376}},
|
||||
},
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user