vmware-tanzu
/
velero
mirror of https://github.com/vmware-tanzu/velero.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove references to apps/v1beta1 API group (#1673) 

* Remove references to apps/v1beta1 API group

In Kubernetes v1.16, the apps/v1 API group will be the default served
for relevant resources.

Update any references to apps/v1beta1 for fowards compatibility.

Fixes #1672

Signed-off-by: Nolan Brubaker <brubakern@vmware.com>

* Update API group on plugin commands

Signed-off-by: Nolan Brubaker <brubakern@vmware.com>
pull/1681/head
Nolan Brubaker 2019-07-17 17:03:48 -04:00 committed by Steve Kriss
parent 1d54996fce
commit 3124570c7f
8 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelogs/unreleased/1673-nrb Normal file
View File

@ -0,0 +1 @@
Update Velero Deployment to use apps/v1 API group. `velero install` and `velero plugin add/remove` commands will now require Kubernetes 1.9+

2
examples/minio/00-minio-deployment.yaml
View File

@ -19,7 +19,7 @@ metadata:
name: velero name: velero
--- ---
apiVersion: apps/v1beta1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
namespace: velero namespace: velero

2
examples/nginx-app/base.yaml
View File

@ -21,7 +21,7 @@ metadata:
app: nginx app: nginx
--- ---
apiVersion: apps/v1beta1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: nginx-deployment name: nginx-deployment

2
examples/nginx-app/with-pv.yaml
View File

@ -37,7 +37,7 @@ spec:
storage: 50Mi storage: 50Mi
--- ---
apiVersion: apps/v1beta1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: nginx-deployment name: nginx-deployment

4
pkg/cmd/cli/plugin/add.go
View File

@ -55,7 +55,7 @@ func NewAddCommand(f client.Factory) *cobra.Command {
cmd.CheckError(err) cmd.CheckError(err)
} }
veleroDeploy, err := kubeClient.AppsV1beta1().Deployments(f.Namespace()).Get(veleroDeployment, metav1.GetOptions{}) veleroDeploy, err := kubeClient.AppsV1().Deployments(f.Namespace()).Get(veleroDeployment, metav1.GetOptions{})
if err != nil { if err != nil {
cmd.CheckError(err) cmd.CheckError(err)
} }
@ -125,7 +125,7 @@ func NewAddCommand(f client.Factory) *cobra.Command {
patchBytes, err := jsonpatch.CreateMergePatch(original, updated) patchBytes, err := jsonpatch.CreateMergePatch(original, updated)
cmd.CheckError(err) cmd.CheckError(err)
_, err = kubeClient.AppsV1beta1().Deployments(veleroDeploy.Namespace).Patch(veleroDeploy.Name, types.MergePatchType, patchBytes) _, err = kubeClient.AppsV1().Deployments(veleroDeploy.Namespace).Patch(veleroDeploy.Name, types.MergePatchType, patchBytes)
cmd.CheckError(err) cmd.CheckError(err)
}, },
} }

4
pkg/cmd/cli/plugin/remove.go
View File

@ -40,7 +40,7 @@ func NewRemoveCommand(f client.Factory) *cobra.Command {
cmd.CheckError(err) cmd.CheckError(err)
} }
veleroDeploy, err := kubeClient.AppsV1beta1().Deployments(f.Namespace()).Get(veleroDeployment, metav1.GetOptions{}) veleroDeploy, err := kubeClient.AppsV1().Deployments(f.Namespace()).Get(veleroDeployment, metav1.GetOptions{})
if err != nil { if err != nil {
cmd.CheckError(err) cmd.CheckError(err)
} }
@ -72,7 +72,7 @@ func NewRemoveCommand(f client.Factory) *cobra.Command {
patchBytes, err := jsonpatch.CreateMergePatch(original, updated) patchBytes, err := jsonpatch.CreateMergePatch(original, updated)
cmd.CheckError(err) cmd.CheckError(err)
_, err = kubeClient.AppsV1beta1().Deployments(veleroDeploy.Namespace).Patch(veleroDeploy.Name, types.MergePatchType, patchBytes) _, err = kubeClient.AppsV1().Deployments(veleroDeploy.Namespace).Patch(veleroDeploy.Name, types.MergePatchType, patchBytes)
cmd.CheckError(err) cmd.CheckError(err)
}, },
} }

10
pkg/install/deployment.go
View File

@ -19,7 +19,7 @@ package install
import ( import (
"strings" "strings"
appsv1beta1 "k8s.io/api/apps/v1beta1" appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
) )
@ -74,7 +74,7 @@ func WithRestoreOnly() podTemplateOption {
} }
} }
func Deployment(namespace string, opts ...podTemplateOption) *appsv1beta1.Deployment { func Deployment(namespace string, opts ...podTemplateOption) *appsv1.Deployment {
// TODO: Add support for server args // TODO: Add support for server args
c := &podTemplateConfig{ c := &podTemplateConfig{
image: DefaultImage, image: DefaultImage,
@ -94,13 +94,13 @@ func Deployment(namespace string, opts ...podTemplateOption) *appsv1beta1.Deploy
containerLabels := labels() containerLabels := labels()
containerLabels["deploy"] = "velero" containerLabels["deploy"] = "velero"
deployment := &appsv1beta1.Deployment{ deployment := &appsv1.Deployment{
ObjectMeta: objectMeta(namespace, "velero"), ObjectMeta: objectMeta(namespace, "velero"),
TypeMeta: metav1.TypeMeta{ TypeMeta: metav1.TypeMeta{
Kind: "Deployment", Kind: "Deployment",
APIVersion: appsv1beta1.SchemeGroupVersion.String(), APIVersion: appsv1.SchemeGroupVersion.String(),
}, },
Spec: appsv1beta1.DeploymentSpec{ Spec: appsv1.DeploymentSpec{
Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"deploy": "velero"}}, Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"deploy": "velero"}},
Template: corev1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{

10
pkg/install/install.go
View File

@ -23,7 +23,7 @@ import (
"time" "time"
"github.com/pkg/errors" "github.com/pkg/errors"
appsv1beta1 "k8s.io/api/apps/v1beta1" appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
apiextv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" apiextv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
@ -120,11 +120,11 @@ func crdsAreReady(factory client.DynamicFactory, crdKinds []string) (bool, error
return areReady, nil return areReady, nil
} }
func isAvailable(c appsv1beta1.DeploymentCondition) bool { func isAvailable(c appsv1.DeploymentCondition) bool {
// Make sure that the deployment has been available for at least 10 seconds. // Make sure that the deployment has been available for at least 10 seconds.
// This is because the deployment can show as Ready momentarily before the pods fall into a CrashLoopBackOff. // This is because the deployment can show as Ready momentarily before the pods fall into a CrashLoopBackOff.
// See podutils.IsPodAvailable upstream for similar logic with pods // See podutils.IsPodAvailable upstream for similar logic with pods
if c.Type == appsv1beta1.DeploymentAvailable && c.Status == corev1.ConditionTrue { if c.Type == appsv1.DeploymentAvailable && c.Status == corev1.ConditionTrue {
if !c.LastTransitionTime.IsZero() && c.LastTransitionTime.Add(10*time.Second).Before(time.Now()) { if !c.LastTransitionTime.IsZero() && c.LastTransitionTime.Add(10*time.Second).Before(time.Now()) {
return true return true
} }
@ -134,7 +134,7 @@ func isAvailable(c appsv1beta1.DeploymentCondition) bool {
// DeploymentIsReady will poll the kubernetes API server to see if the velero deployment is ready to service user requests. // DeploymentIsReady will poll the kubernetes API server to see if the velero deployment is ready to service user requests.
func DeploymentIsReady(factory client.DynamicFactory, namespace string) (bool, error) { func DeploymentIsReady(factory client.DynamicFactory, namespace string) (bool, error) {
gvk := schema.FromAPIVersionAndKind(appsv1beta1.SchemeGroupVersion.String(), "Deployment") gvk := schema.FromAPIVersionAndKind(appsv1.SchemeGroupVersion.String(), "Deployment")
apiResource := metav1.APIResource{ apiResource := metav1.APIResource{
Name: "deployments", Name: "deployments",
Namespaced: true, Namespaced: true,
@ -154,7 +154,7 @@ func DeploymentIsReady(factory client.DynamicFactory, namespace string) (bool, e
return false, errors.Wrap(err, "error waiting for deployment to be ready") return false, errors.Wrap(err, "error waiting for deployment to be ready")
} }
deploy := new(appsv1beta1.Deployment) deploy := new(appsv1.Deployment)
if err := runtime.DefaultUnstructuredConverter.FromUnstructured(unstructuredDeployment.Object, deploy); err != nil { if err := runtime.DefaultUnstructuredConverter.FromUnstructured(unstructuredDeployment.Object, deploy); err != nil {
return false, errors.Wrap(err, "error converting deployment from unstructured") return false, errors.Wrap(err, "error converting deployment from unstructured")
} }