diff --git a/cmd/kubeless/function/function.go b/cmd/kubeless/function/function.go index 4242432e2..bd461db1c 100644 --- a/cmd/kubeless/function/function.go +++ b/cmd/kubeless/function/function.go @@ -33,7 +33,7 @@ import ( kubelessApi "github.com/kubeless/kubeless/pkg/apis/kubeless/v1beta1" "github.com/kubeless/kubeless/pkg/client/clientset/versioned" "github.com/spf13/cobra" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" @@ -359,7 +359,7 @@ func getFunctionDescription(funcName, ns, handler, file, deps, runtime, runtimeI } func getDeploymentStatus(cli kubernetes.Interface, funcName, ns string) (string, error) { - dpm, err := cli.ExtensionsV1beta1().Deployments(ns).Get(funcName, metav1.GetOptions{}) + dpm, err := cli.AppsV1().Deployments(ns).Get(funcName, metav1.GetOptions{}) if err != nil { return "", err } diff --git a/cmd/kubeless/function/function_test.go b/cmd/kubeless/function/function_test.go index b875b0bdd..347492a52 100644 --- a/cmd/kubeless/function/function_test.go +++ b/cmd/kubeless/function/function_test.go @@ -28,9 +28,9 @@ import ( "testing" kubelessApi "github.com/kubeless/kubeless/pkg/apis/kubeless/v1beta1" + appsv1 "k8s.io/api/apps/v1" "k8s.io/api/autoscaling/v2beta1" - "k8s.io/api/core/v1" - "k8s.io/api/extensions/v1beta1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" @@ -129,8 +129,8 @@ func TestGetFunctionDescription(t *testing.T) { FunctionContentType: "text", Deps: "dependencies", Timeout: "10", - Deployment: v1beta1.Deployment{ - Spec: v1beta1.DeploymentSpec{ + Deployment: appsv1.Deployment{ + Spec: appsv1.DeploymentSpec{ Template: v1.PodTemplateSpec{ Spec: v1.PodSpec{ Containers: []v1.Container{ @@ -237,8 +237,8 @@ func TestGetFunctionDescription(t *testing.T) { Checksum: "sha256:1958eb96d7d3cadedd0f327f09322eb7db296afb282ed91aa66cb4ab0dcc3c9f", Deps: "dependencies2", Timeout: "20", - Deployment: v1beta1.Deployment{ - Spec: v1beta1.DeploymentSpec{ + Deployment: appsv1.Deployment{ + Spec: appsv1.DeploymentSpec{ Template: v1.PodTemplateSpec{ Spec: v1.PodSpec{ Containers: []v1.Container{ @@ -401,8 +401,8 @@ func TestGetFunctionDescription(t *testing.T) { FunctionContentType: "url", Deps: "dependencies", Timeout: "10", - Deployment: v1beta1.Deployment{ - Spec: v1beta1.DeploymentSpec{ + Deployment: appsv1.Deployment{ + Spec: appsv1.DeploymentSpec{ Template: v1.PodTemplateSpec{ Spec: v1.PodSpec{ Containers: []v1.Container{ diff --git a/cmd/kubeless/function/list_test.go b/cmd/kubeless/function/list_test.go index 8db3e9ec9..6da24f893 100644 --- a/cmd/kubeless/function/list_test.go +++ b/cmd/kubeless/function/list_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "k8s.io/api/core/v1" - "k8s.io/api/extensions/v1beta1" + appsv1 "k8s.io/api/apps/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" @@ -58,8 +58,8 @@ func TestList(t *testing.T) { Function: "ffunction", Runtime: "fruntime", Deps: "fdeps", - Deployment: v1beta1.Deployment{ - Spec: v1beta1.DeploymentSpec{ + Deployment: appsv1.Deployment{ + Spec: appsv1.DeploymentSpec{ Template: v1.PodTemplateSpec{ Spec: v1.PodSpec{ Containers: []v1.Container{{}}, @@ -82,8 +82,8 @@ func TestList(t *testing.T) { Function: "bfunction", Runtime: "nodejs6", Deps: "{\"dependencies\": {\"test\": \"^1.0.0\"}}", - Deployment: v1beta1.Deployment{ - Spec: v1beta1.DeploymentSpec{ + Deployment: appsv1.Deployment{ + Spec: appsv1.DeploymentSpec{ Template: v1.PodTemplateSpec{ Spec: v1.PodSpec{ Containers: []v1.Container{ @@ -124,8 +124,8 @@ func TestList(t *testing.T) { Function: "ffunction", Runtime: "fruntime", Deps: "fdeps", - Deployment: v1beta1.Deployment{ - Spec: v1beta1.DeploymentSpec{ + Deployment: appsv1.Deployment{ + Spec: appsv1.DeploymentSpec{ Template: v1.PodTemplateSpec{ Spec: v1.PodSpec{ Containers: []v1.Container{{}}, @@ -140,22 +140,22 @@ func TestList(t *testing.T) { client := fFake.NewSimpleClientset(listObj.Items[0], listObj.Items[1], listObj.Items[2]) - deploymentFoo := v1beta1.Deployment{ + deploymentFoo := appsv1.Deployment{ ObjectMeta: metav1.ObjectMeta{ Name: "foo", Namespace: "myns", }, - Status: v1beta1.DeploymentStatus{ + Status: appsv1.DeploymentStatus{ Replicas: int32(1), ReadyReplicas: int32(1), }, } - deploymentBar := v1beta1.Deployment{ + deploymentBar := appsv1.Deployment{ ObjectMeta: metav1.ObjectMeta{ Name: "bar", Namespace: "myns", }, - Status: v1beta1.DeploymentStatus{ + Status: appsv1.DeploymentStatus{ Replicas: int32(2), ReadyReplicas: int32(0), }, diff --git a/cmd/kubeless/function/top_test.go b/cmd/kubeless/function/top_test.go index 46fd0bc33..933867a33 100644 --- a/cmd/kubeless/function/top_test.go +++ b/cmd/kubeless/function/top_test.go @@ -25,8 +25,8 @@ import ( "strings" "testing" - "k8s.io/api/core/v1" - "k8s.io/api/extensions/v1beta1" + appsv1 "k8s.io/api/apps/v1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/client-go/kubernetes" @@ -280,8 +280,8 @@ func TestTop(t *testing.T) { Function: function1Name, Runtime: "pyruntime", Deps: "pydeps", - Deployment: v1beta1.Deployment{ - Spec: v1beta1.DeploymentSpec{ + Deployment: appsv1.Deployment{ + Spec: appsv1.DeploymentSpec{ Template: v1.PodTemplateSpec{ Spec: v1.PodSpec{ Containers: []v1.Container{{}}, @@ -301,8 +301,8 @@ func TestTop(t *testing.T) { Function: function2Name, Runtime: "goruntime", Deps: "godeps", - Deployment: v1beta1.Deployment{ - Spec: v1beta1.DeploymentSpec{ + Deployment: appsv1.Deployment{ + Spec: appsv1.DeploymentSpec{ Template: v1.PodTemplateSpec{ Spec: v1.PodSpec{ Containers: []v1.Container{{}}, @@ -317,22 +317,22 @@ func TestTop(t *testing.T) { client := fFake.NewSimpleClientset(listObj.Items[0], listObj.Items[1]) - deploymentPy := v1beta1.Deployment{ + deploymentPy := appsv1.Deployment{ ObjectMeta: metav1.ObjectMeta{ Name: function1Name, Namespace: namespace, }, - Status: v1beta1.DeploymentStatus{ + Status: appsv1.DeploymentStatus{ Replicas: int32(1), ReadyReplicas: int32(1), }, } - deploymentGo := v1beta1.Deployment{ + deploymentGo := appsv1.Deployment{ ObjectMeta: metav1.ObjectMeta{ Name: function2Name, Namespace: namespace, }, - Status: v1beta1.DeploymentStatus{ + Status: appsv1.DeploymentStatus{ Replicas: int32(1), ReadyReplicas: int32(1), }, diff --git a/pkg/apis/kubeless/v1beta1/function.go b/pkg/apis/kubeless/v1beta1/function.go index d40eaec44..2b34d1e53 100644 --- a/pkg/apis/kubeless/v1beta1/function.go +++ b/pkg/apis/kubeless/v1beta1/function.go @@ -17,9 +17,9 @@ limitations under the License. package v1beta1 import ( + appsv1 "k8s.io/api/apps/v1" "k8s.io/api/autoscaling/v2beta1" - "k8s.io/api/core/v1" - "k8s.io/api/extensions/v1beta1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -42,7 +42,7 @@ type FunctionSpec struct { Runtime string `json:"runtime"` // Function runtime to use Timeout string `json:"timeout"` // Maximum timeout for the function to complete its execution Deps string `json:"deps"` // Function dependencies - Deployment v1beta1.Deployment `json:"deployment" protobuf:"bytes,3,opt,name=template"` + Deployment appsv1.Deployment `json:"deployment" protobuf:"bytes,3,opt,name=template"` ServiceSpec v1.ServiceSpec `json:"service"` HorizontalPodAutoscaler v2beta1.HorizontalPodAutoscaler `json:"horizontalPodAutoscaler" protobuf:"bytes,3,opt,name=horizontalPodAutoscaler"` } diff --git a/pkg/controller/function_controller.go b/pkg/controller/function_controller.go index dc3fe2a09..4b78b8146 100644 --- a/pkg/controller/function_controller.go +++ b/pkg/controller/function_controller.go @@ -24,9 +24,9 @@ import ( monitoringv1alpha1 "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1alpha1" "github.com/sirupsen/logrus" + appsv1 "k8s.io/api/apps/v1" "k8s.io/api/autoscaling/v2beta1" corev1 "k8s.io/api/core/v1" - "k8s.io/api/extensions/v1beta1" apiequality "k8s.io/apimachinery/pkg/api/equality" k8sErrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -300,7 +300,7 @@ func (c *FunctionController) ensureK8sResources(funcObj *kubelessApi.Function) e } funcObj.ObjectMeta.Labels["function"] = funcObj.ObjectMeta.Name - deployment := v1beta1.Deployment{} + deployment := appsv1.Deployment{} if deploymentConfigData, ok := c.config.Data["deployment"]; ok { err := yaml.Unmarshal([]byte(deploymentConfigData), &deployment) if err != nil { diff --git a/pkg/controller/function_controller_test.go b/pkg/controller/function_controller_test.go index 566809cc2..21e3cd1c9 100644 --- a/pkg/controller/function_controller_test.go +++ b/pkg/controller/function_controller_test.go @@ -8,10 +8,9 @@ import ( kubelessApi "github.com/kubeless/kubeless/pkg/apis/kubeless/v1beta1" "github.com/kubeless/kubeless/pkg/langruntime" "github.com/sirupsen/logrus" + appsv1 "k8s.io/api/apps/v1" "k8s.io/api/autoscaling/v2beta1" - "k8s.io/api/core/v1" - "k8s.io/api/extensions/v1beta1" - xv1beta1 "k8s.io/api/extensions/v1beta1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" ktesting "k8s.io/client-go/testing" @@ -36,7 +35,7 @@ func TestDeleteK8sResources(t *testing.T) { Name: "foo", } - deploy := xv1beta1.Deployment{ + deploy := appsv1.Deployment{ ObjectMeta: myNsFoo, } @@ -135,11 +134,11 @@ func TestEnsureK8sResourcesWithDeploymentDefinitionFromConfigMap(t *testing.T) { Deps: "deps", Handler: "foo.bar", Runtime: "ruby2.4", - Deployment: v1beta1.Deployment{ + Deployment: appsv1.Deployment{ ObjectMeta: metav1.ObjectMeta{ Annotations: funcAnno, }, - Spec: v1beta1.DeploymentSpec{ + Spec: appsv1.DeploymentSpec{ Replicas: &replicas, Template: v1.PodTemplateSpec{ ObjectMeta: metav1.ObjectMeta{ @@ -209,7 +208,7 @@ func TestEnsureK8sResourcesWithDeploymentDefinitionFromConfigMap(t *testing.T) { }, Data: map[string]string{"deployment": deploymentConfigData, "runtime-images": string(out)}, } - deploymentObjFromConfigMap := v1beta1.Deployment{} + deploymentObjFromConfigMap := appsv1.Deployment{} _ = yaml.Unmarshal([]byte(deploymentConfigData), &deploymentObjFromConfigMap) _, err = clientset.CoreV1().ConfigMaps(namespace).Create(kubelessConfigMap) if err != nil { @@ -233,7 +232,7 @@ func TestEnsureK8sResourcesWithDeploymentDefinitionFromConfigMap(t *testing.T) { if err := controller.ensureK8sResources(&funcObj); err != nil { t.Fatalf("Creating/Updating resources returned err: %v", err) } - dpm, _ := clientset.ExtensionsV1beta1().Deployments(namespace).Get(funcName, metav1.GetOptions{}) + dpm, _ := clientset.AppsV1().Deployments(namespace).Get(funcName, metav1.GetOptions{}) expectedAnnotations := map[string]string{ "bar": "foo", "foo-from-deploy-cm": "bar-from-deploy-cm", @@ -248,9 +247,9 @@ func TestEnsureK8sResourcesWithDeploymentDefinitionFromConfigMap(t *testing.T) { t.Fatalf("Expecting replicas as 10 but received : %d", *dpm.Spec.Replicas) } expectedPodAnnotations := map[string]string{ - "bar": "foo", - "foo-from-deploy-cm": "bar-from-deploy-cm", - "xyz": "valuefromfunc", + "bar": "foo", + "foo-from-deploy-cm": "bar-from-deploy-cm", + "xyz": "valuefromfunc", "podannotation-from-func-crd": "value-from-container", } for i := range expectedPodAnnotations { @@ -284,11 +283,11 @@ func TestEnsureK8sResourcesWithLivenessProbeFromConfigMap(t *testing.T) { Deps: "deps", Handler: "foo.bar", Runtime: "ruby2.4", - Deployment: v1beta1.Deployment{ + Deployment: appsv1.Deployment{ ObjectMeta: metav1.ObjectMeta{ Annotations: funcAnno, }, - Spec: v1beta1.DeploymentSpec{ + Spec: appsv1.DeploymentSpec{ Replicas: &replicas, Template: v1.PodTemplateSpec{ ObjectMeta: metav1.ObjectMeta{ @@ -368,7 +367,7 @@ func TestEnsureK8sResourcesWithLivenessProbeFromConfigMap(t *testing.T) { if err := controller.ensureK8sResources(&funcObj); err != nil { t.Fatalf("Creating/Updating resources returned err: %v", err) } - dpm, _ := clientset.ExtensionsV1beta1().Deployments(namespace).Get(funcName, metav1.GetOptions{}) + dpm, _ := clientset.AppsV1().Deployments(namespace).Get(funcName, metav1.GetOptions{}) expectedLivenessProbe := &v1.Probe{ InitialDelaySeconds: int32(5), PeriodSeconds: int32(10), diff --git a/pkg/langruntime/langruntime.go b/pkg/langruntime/langruntime.go index 0057a9d5b..fc8039cba 100644 --- a/pkg/langruntime/langruntime.go +++ b/pkg/langruntime/langruntime.go @@ -9,8 +9,8 @@ import ( yaml "github.com/ghodss/yaml" "github.com/sirupsen/logrus" - "k8s.io/api/core/v1" - "k8s.io/api/extensions/v1beta1" + appsv1 "k8s.io/api/apps/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/intstr" ) @@ -294,7 +294,7 @@ func (l *Langruntimes) GetBuildContainer(runtime, depsChecksum string, env []v1. } // UpdateDeployment object in case of custom runtime -func (l *Langruntimes) UpdateDeployment(dpm *v1beta1.Deployment, volPath, runtime string) { +func (l *Langruntimes) UpdateDeployment(dpm *appsv1.Deployment, volPath, runtime string) { versionInf, err := l.findRuntimeVersion(runtime) if err != nil { // Not found an image for the given runtime diff --git a/pkg/utils/k8sutil.go b/pkg/utils/k8sutil.go index 2cfb5f1ea..a82bdf5a4 100644 --- a/pkg/utils/k8sutil.go +++ b/pkg/utils/k8sutil.go @@ -28,9 +28,9 @@ import ( kubelessApi "github.com/kubeless/kubeless/pkg/apis/kubeless/v1beta1" "github.com/sirupsen/logrus" + appsv1 "k8s.io/api/apps/v1" "k8s.io/api/autoscaling/v2beta1" - "k8s.io/api/core/v1" - "k8s.io/api/extensions/v1beta1" + v1 "k8s.io/api/core/v1" clientsetAPIExtensions "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" @@ -347,7 +347,7 @@ func DeleteServiceMonitor(smclient monitoringv1alpha1.MonitoringV1alpha1Client, // InitializeEmptyMapsInDeployment initializes all nil maps in a Deployment object // This is done to counteract with side-effects of github.com/imdario/mergo which panics when provided with a nil map in a struct -func initializeEmptyMapsInDeployment(deployment *v1beta1.Deployment) { +func initializeEmptyMapsInDeployment(deployment *appsv1.Deployment) { if deployment.ObjectMeta.Annotations == nil { deployment.Annotations = make(map[string]string) } @@ -369,7 +369,7 @@ func initializeEmptyMapsInDeployment(deployment *v1beta1.Deployment) { } // MergeDeployments merges two deployment objects -func MergeDeployments(destinationDeployment *v1beta1.Deployment, sourceDeployment *v1beta1.Deployment) error { +func MergeDeployments(destinationDeployment *appsv1.Deployment, sourceDeployment *appsv1.Deployment) error { // Initializing nil maps in deployment objects else github.com/imdario/mergo panics initializeEmptyMapsInDeployment(destinationDeployment) initializeEmptyMapsInDeployment(sourceDeployment) diff --git a/pkg/utils/k8sutil_test.go b/pkg/utils/k8sutil_test.go index 86c862ab5..80d89c71d 100644 --- a/pkg/utils/k8sutil_test.go +++ b/pkg/utils/k8sutil_test.go @@ -7,8 +7,8 @@ import ( "io/ioutil" "testing" + appsv1 "k8s.io/api/apps/v1" v2beta1 "k8s.io/api/autoscaling/v2beta1" - "k8s.io/api/extensions/v1beta1" extensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" fakeextensionsapi "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -100,7 +100,7 @@ func TestDeleteAutoscaleResource(t *testing.T) { } func TestInitializeEmptyMapsInDeployment(t *testing.T) { - deployment := v1beta1.Deployment{} + deployment := appsv1.Deployment{} deployment.Spec.Selector = &metav1.LabelSelector{} initializeEmptyMapsInDeployment(&deployment) if deployment.ObjectMeta.Annotations == nil { @@ -126,7 +126,7 @@ func TestInitializeEmptyMapsInDeployment(t *testing.T) { func TestMergeDeployments(t *testing.T) { var replicas int32 replicas = 10 - destinationDeployment := v1beta1.Deployment{ + destinationDeployment := appsv1.Deployment{ ObjectMeta: metav1.ObjectMeta{ Annotations: map[string]string{ "foo1-deploy": "bar", @@ -134,13 +134,13 @@ func TestMergeDeployments(t *testing.T) { }, } - sourceDeployment := v1beta1.Deployment{ + sourceDeployment := appsv1.Deployment{ ObjectMeta: metav1.ObjectMeta{ Annotations: map[string]string{ "foo2-deploy": "bar", }, }, - Spec: v1beta1.DeploymentSpec{ + Spec: appsv1.DeploymentSpec{ Replicas: &replicas, }, } diff --git a/pkg/utils/kubelessutil.go b/pkg/utils/kubelessutil.go index 1e5598de8..8014f1e5c 100644 --- a/pkg/utils/kubelessutil.go +++ b/pkg/utils/kubelessutil.go @@ -26,15 +26,16 @@ import ( "strconv" "strings" + "io/ioutil" + monitoringv1alpha1 "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1alpha1" "github.com/ghodss/yaml" kubelessApi "github.com/kubeless/kubeless/pkg/apis/kubeless/v1beta1" "github.com/kubeless/kubeless/pkg/langruntime" "github.com/sirupsen/logrus" - "io/ioutil" + appsv1 "k8s.io/api/apps/v1" batchv1 "k8s.io/api/batch/v1" - "k8s.io/api/core/v1" - "k8s.io/api/extensions/v1beta1" + v1 "k8s.io/api/core/v1" clientsetAPIExtensions "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" k8sErrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -578,8 +579,8 @@ func EnsureFuncDeployment(client kubernetes.Interface, funcObj *kubelessApi.Func MatchLabels: funcObj.ObjectMeta.Labels, } - dpm.Spec.Strategy = v1beta1.DeploymentStrategy{ - RollingUpdate: &v1beta1.RollingUpdateDeployment{ + dpm.Spec.Strategy = appsv1.DeploymentStrategy{ + RollingUpdate: &appsv1.RollingUpdateDeployment{ MaxUnavailable: &maxUnavailable, }, } @@ -683,12 +684,12 @@ func EnsureFuncDeployment(client kubernetes.Interface, funcObj *kubelessApi.Func } } - _, err = client.ExtensionsV1beta1().Deployments(funcObj.ObjectMeta.Namespace).Create(dpm) + _, err = client.AppsV1().Deployments(funcObj.ObjectMeta.Namespace).Create(dpm) if err != nil && k8sErrors.IsAlreadyExists(err) { // In case the Deployment already exists we should update // just certain fields (to avoid race conditions) - var newDpm *v1beta1.Deployment - newDpm, err = client.ExtensionsV1beta1().Deployments(funcObj.ObjectMeta.Namespace).Get(funcObj.ObjectMeta.Name, metav1.GetOptions{}) + var newDpm *appsv1.Deployment + newDpm, err = client.AppsV1().Deployments(funcObj.ObjectMeta.Namespace).Get(funcObj.ObjectMeta.Name, metav1.GetOptions{}) if err != nil { return err } @@ -707,7 +708,7 @@ func EnsureFuncDeployment(client kubernetes.Interface, funcObj *kubelessApi.Func return err } // Use `Patch` to do a rolling update - _, err = client.ExtensionsV1beta1().Deployments(funcObj.ObjectMeta.Namespace).Patch(newDpm.Name, types.MergePatchType, data) + _, err = client.AppsV1().Deployments(funcObj.ObjectMeta.Namespace).Patch(newDpm.Name, types.MergePatchType, data) if err != nil { return err } diff --git a/pkg/utils/kubelessutil_test.go b/pkg/utils/kubelessutil_test.go index a33d0d06b..4e0ed53eb 100644 --- a/pkg/utils/kubelessutil_test.go +++ b/pkg/utils/kubelessutil_test.go @@ -9,8 +9,8 @@ import ( kubelessApi "github.com/kubeless/kubeless/pkg/apis/kubeless/v1beta1" "github.com/kubeless/kubeless/pkg/langruntime" - "k8s.io/api/core/v1" - "k8s.io/api/extensions/v1beta1" + appsv1 "k8s.io/api/apps/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" @@ -471,8 +471,8 @@ func getDefaultFunc(name, ns string) *kubelessApi.Function { }, Type: v1.ServiceTypeClusterIP, }, - Deployment: v1beta1.Deployment{ - Spec: v1beta1.DeploymentSpec{ + Deployment: appsv1.Deployment{ + Spec: appsv1.DeploymentSpec{ Template: v1.PodTemplateSpec{ Spec: v1.PodSpec{ Containers: []v1.Container{ @@ -546,7 +546,7 @@ func TestEnsureDeployment(t *testing.T) { if err != nil { t.Errorf("Unexpected error: %s", err) } - dpm, err := clientset.ExtensionsV1beta1().Deployments(ns).Get(f1Name, metav1.GetOptions{}) + dpm, err := clientset.AppsV1().Deployments(ns).Get(f1Name, metav1.GetOptions{}) if err != nil { t.Errorf("Unexpected error: %s", err) } @@ -669,7 +669,7 @@ func TestEnsureDeploymentWithoutFuncNorHandler(t *testing.T) { if err != nil { t.Errorf("Unexpected error: %s", err) } - _, err = clientset.ExtensionsV1beta1().Deployments(ns).Get(funcName, metav1.GetOptions{}) + _, err = clientset.AppsV1().Deployments(ns).Get(funcName, metav1.GetOptions{}) if err != nil { t.Errorf("Unexpected error: %s", err) } @@ -685,7 +685,7 @@ func TestEnsureDeploymentWithImage(t *testing.T) { if err != nil { t.Errorf("Unexpected error: %s", err) } - dpm, err := clientset.ExtensionsV1beta1().Deployments(ns).Get(funcName, metav1.GetOptions{}) + dpm, err := clientset.AppsV1().Deployments(ns).Get(funcName, metav1.GetOptions{}) if err != nil { t.Errorf("Unexpected error: %s", err) } @@ -705,7 +705,7 @@ func TestEnsureDeploymentWithoutFunc(t *testing.T) { if err != nil { t.Errorf("Unexpected error: %s", err) } - dpm, err := clientset.ExtensionsV1beta1().Deployments(ns).Get(funcName, metav1.GetOptions{}) + dpm, err := clientset.AppsV1().Deployments(ns).Get(funcName, metav1.GetOptions{}) if err != nil { t.Errorf("Unexpected error: %s", err) } @@ -747,7 +747,7 @@ func TestEnsureUpdateDeployment(t *testing.T) { func TestAvoidDeploymentOverwrite(t *testing.T) { f1Name := "f1" clientset, or, ns, lr := prepareDeploymentTest(f1Name) - clientset.ExtensionsV1beta1().Deployments(ns).Create(&v1beta1.Deployment{ + clientset.AppsV1().Deployments(ns).Create(&appsv1.Deployment{ ObjectMeta: metav1.ObjectMeta{ Name: f1Name, Namespace: ns, @@ -784,7 +784,7 @@ func TestDeploymentWithTimeout(t *testing.T) { if err != nil { t.Errorf("Unexpected error: %s", err) } - dpm, err := clientset.ExtensionsV1beta1().Deployments(ns).Get(funcName, metav1.GetOptions{}) + dpm, err := clientset.AppsV1().Deployments(ns).Get(funcName, metav1.GetOptions{}) if err != nil { t.Errorf("Unexpected error: %s", err) } @@ -802,7 +802,7 @@ func TestDeploymentWithPrebuiltImage(t *testing.T) { if err != nil { t.Errorf("Unexpected error: %s", err) } - dpm, err := clientset.ExtensionsV1beta1().Deployments(ns).Get(funcName, metav1.GetOptions{}) + dpm, err := clientset.AppsV1().Deployments(ns).Get(funcName, metav1.GetOptions{}) if err != nil { t.Errorf("Unexpected error: %s", err) } @@ -835,7 +835,7 @@ func TestDeploymentWithVolumes(t *testing.T) { if err != nil { t.Errorf("Unexpected error: %s", err) } - dpm, err := clientset.ExtensionsV1beta1().Deployments(ns).Get(funcName, metav1.GetOptions{}) + dpm, err := clientset.AppsV1().Deployments(ns).Get(funcName, metav1.GetOptions{}) if err != nil { t.Errorf("Unexpected error: %s", err) }