DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update dependencies client-go to release-11.0 and kubernetes-1.14.0

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2019-03-28 20:43:18 -03:00
parent 7e21a2ddfb
commit 14a9e9f3fa
No known key found for this signature in database
GPG key ID: 786136016A8BA02A
10 changed files with 116 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

7
test/e2e/framework/k8s.go
View file

@ -23,6 +23,7 @@ import (
. "github.com/onsi/gomega"
appsv1 "k8s.io/api/apps/v1"
api "k8s.io/api/core/v1"
core "k8s.io/api/core/v1"
extensions "k8s.io/api/extensions/v1beta1"
@ -108,11 +109,11 @@ func (f *Framework) EnsureService(service *core.Service) *core.Service {
}
// EnsureDeployment creates a Deployment object or returns it if it already exists.
func (f *Framework) EnsureDeployment(deployment *extensions.Deployment) (*extensions.Deployment, error) {
d, err := f.KubeClientSet.Extensions().Deployments(deployment.Namespace).Update(deployment)
func (f *Framework) EnsureDeployment(deployment *appsv1.Deployment) (*appsv1.Deployment, error) {
d, err := f.KubeClientSet.AppsV1().Deployments(deployment.Namespace).Update(deployment)
if err != nil {
if k8sErrors.IsNotFound(err) {
return f.KubeClientSet.Extensions().Deployments(deployment.Namespace).Create(deployment)
return f.KubeClientSet.AppsV1().Deployments(deployment.Namespace).Create(deployment)
}
return nil, err
}