github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 05:36:12 +00:00
Code Issues Projects Releases Wiki Activity

Removing references to v1beta1 from hack/ and test/

Browse Source
This commit is contained in:
nikhiljindal
2015-04-13 15:55:28 -07:00
parent 86d3072492
commit a2c29d48ec
8 changed files with 86 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/cadvisor.go
View File

@@ -58,7 +58,7 @@ func CheckCadvisorHealthOnAllNodes(c *client.Client, timeout time.Duration) {
for _, node := range nodeList.Items {
// cadvisor is not accessible directly unless its port (4194 by default) is exposed.
// Here, we access '/stats/' REST endpoint on the kubelet which polls cadvisor internally.
statsResource := fmt.Sprintf("api/v1beta1/proxy/minions/%s/stats/", node.Name)
statsResource := fmt.Sprintf("api/v1beta3/proxy/nodes/%s/stats/", node.Name)
By(fmt.Sprintf("Querying stats from node %s using url %s", node.Name, statsResource))
_, err = c.Get().AbsPath(statsResource).Timeout(timeout).Do().Raw()
if err != nil {

3
test/e2e/empty_dir.go
View File

@@ -21,6 +21,7 @@ import (
"path"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
@@ -88,7 +89,7 @@ func testPodWithVolume(path string, source *api.EmptyDirVolumeSource) *api.Pod {
return &api.Pod{
TypeMeta: api.TypeMeta{
Kind: "Pod",
APIVersion: "v1beta1",
APIVersion: latest.Version,
},
ObjectMeta: api.ObjectMeta{
Name: podName,

2
test/e2e/kubectl.go
View File

@@ -54,7 +54,7 @@ var _ = Describe("kubectl", func() {
Describe("update-demo", func() {
var (
updateDemoRoot = filepath.Join(testContext.RepoRoot, "examples/update-demo/v1beta1")
updateDemoRoot = filepath.Join(testContext.RepoRoot, "examples/update-demo/v1beta3")
nautilusPath = filepath.Join(updateDemoRoot, "nautilus-rc.yaml")
kittenPath = filepath.Join(updateDemoRoot, "kitten-rc.yaml")
)

2
test/e2e/monitoring.go
View File

@@ -209,7 +209,7 @@ func testMonitoringUsingHeapsterInfluxdb(c *client.Client) {
if !ok {
Failf("failed to get master http client")
}
proxyUrl := fmt.Sprintf("%s/api/v1beta1/proxy/services/%s/", getMasterHost(), influxdbService)
proxyUrl := fmt.Sprintf("%s/api/v1beta3/proxy/namespaces/default/services/%s/", getMasterHost(), influxdbService)
config := &influxdb.ClientConfig{
Host: proxyUrl,
// TODO(vishh): Infer username and pw from the Pod spec.

3
test/e2e/pd.go
View File

@@ -23,6 +23,7 @@ import (
"time"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
"github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/aws"
"github.com/GoogleCloudPlatform/kubernetes/pkg/fields"
@@ -234,7 +235,7 @@ func testPDPod(diskName, targetHost string, readOnly bool) *api.Pod {
pod := &api.Pod{
TypeMeta: api.TypeMeta{
Kind: "Pod",
APIVersion: "v1beta1",
APIVersion: latest.Version,
},
ObjectMeta: api.ObjectMeta{
Name: "pd-test-" + string(util.NewUUID()),

7
test/e2e/service.go
View File

@@ -25,6 +25,7 @@ import (
"time"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
@@ -74,7 +75,7 @@ var _ = Describe("Services", func() {
pod := &api.Pod{
TypeMeta: api.TypeMeta{
Kind: "Pod",
APIVersion: "v1beta1",
APIVersion: latest.Version,
},
ObjectMeta: api.ObjectMeta{
Name: "dns-test-" + string(util.NewUUID()),
@@ -166,7 +167,7 @@ var _ = Describe("Services", func() {
It("should provide RW and RO services", func() {
svc := api.ServiceList{}
err := c.Get().
AbsPath("/api/v1beta1/proxy/services/kubernetes-ro/api/v1beta1/services").
AbsPath("/api/v1beta3/proxy/namespaces/default/services/kubernetes-ro/api/v1beta3/services").
Do().
Into(&svc)
if err != nil {
@@ -295,7 +296,7 @@ var _ = Describe("Services", func() {
pod := &api.Pod{
TypeMeta: api.TypeMeta{
Kind: "Pod",
APIVersion: "v1beta1",
APIVersion: latest.Version,
},
ObjectMeta: api.ObjectMeta{
Name: "elb-test-" + string(util.NewUUID()),