deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

openshift: use deploy/api/v1 instead of unversioned deploy/api

Browse Source
This commit is contained in:
Tomas Kral 2016-07-20 16:33:57 +02:00
parent 3db5069ff5
commit 02a899a644
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cli/app/app.go
View File

@ -35,13 +35,14 @@ import (
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions"
//client "k8s.io/kubernetes/pkg/client/unversioned" //client "k8s.io/kubernetes/pkg/client/unversioned"
//cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" //cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/pkg/util/intstr"
deployapi "github.com/openshift/origin/pkg/deploy/api" deployapi "github.com/openshift/origin/pkg/deploy/api/v1"
"github.com/fatih/structs" "github.com/fatih/structs"
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
@ -401,7 +402,7 @@ func initDeploymentConfig(name string, service ServiceConfig) *deployapi.Deploym
Kind: "DeploymentConfig", Kind: "DeploymentConfig",
APIVersion: "v1", APIVersion: "v1",
}, },
ObjectMeta: api.ObjectMeta{ ObjectMeta: v1.ObjectMeta{
Name: name, Name: name,
Labels: map[string]string{"service": name}, Labels: map[string]string{"service": name},
}, },
@ -409,12 +410,12 @@ func initDeploymentConfig(name string, service ServiceConfig) *deployapi.Deploym
Replicas: 1, Replicas: 1,
Selector: map[string]string{"service": name}, Selector: map[string]string{"service": name},
//UniqueLabelKey: p.Name, //UniqueLabelKey: p.Name,
Template: &api.PodTemplateSpec{ Template: &v1.PodTemplateSpec{
ObjectMeta: api.ObjectMeta{ ObjectMeta: v1.ObjectMeta{
Labels: map[string]string{"service": name}, Labels: map[string]string{"service": name},
}, },
Spec: api.PodSpec{ Spec: v1.PodSpec{
Containers: []api.Container{ Containers: []v1.Container{
{ {
Name: name, Name: name,
Image: service.Image, Image: service.Image,