convert extensions to apps

Signed-off-by: Huamin Chen <hchen@redhat.com>

Documentation/edgefs-cluster-crd.md

@@ -364,7 +364,7 @@ metadata:
   name: privileged-psp-user
 rules:
 - apiGroups:
-  - extensions
+  - apps
   resources:
   - podsecuritypolicies
   resourceNames:

Documentation/rbac.md

@@ -83,7 +83,7 @@ metadata:
   name: privileged-psp-user
 rules:
 - apiGroups:
-  - extensions
+  - apps
   resources:
   - podsecuritypolicies
   resourceNames:

cluster/charts/rook-ceph/templates/clusterrole.yaml

@@ -25,7 +25,7 @@ rules:
   - update
   - delete
 - apiGroups:
-  - extensions
+  - apps
   resources:
   - deployments
   - daemonsets
@@ -154,7 +154,7 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 rules:
 - apiGroups:
-  - extensions
+  - apps
   resources:
   - podsecuritypolicies
   resourceNames:

cluster/charts/rook-ceph/templates/role.yaml

@@ -22,7 +22,7 @@ rules:
   - update
   - delete
 - apiGroups:
-  - extensions
+  - apps
   resources:
   - daemonsets
   verbs:

cluster/examples/kubernetes/ceph/operator.yaml

@@ -204,7 +204,7 @@ rules:
   - update
   - delete
 - apiGroups:
-  - extensions
+  - apps
   resources:
   - deployments
   - daemonsets
@@ -241,7 +241,7 @@ rules:
   - update
   - delete
 - apiGroups:
-  - extensions
+  - apps
   resources:
   - daemonsets
   verbs:

cluster/examples/kubernetes/ceph/upgrade-from-v0.8-replace.yaml

@@ -41,7 +41,7 @@ rules:
   - update
   - delete
 - apiGroups:
-  - extensions
+  - apps
   resources:
   - deployments
   - daemonsets

cluster/examples/kubernetes/edgefs/cluster.yaml

@@ -83,7 +83,7 @@ metadata:
   name: privileged-psp-user
 rules:
 - apiGroups:
-  - extensions
+  - apps
   resources:
   - podsecuritypolicies
   resourceNames:

pkg/operator/ceph/agent/agent.go

@@ -27,7 +27,7 @@ import (
 	"github.com/coreos/pkg/capnslog"
 	"github.com/rook/rook/pkg/operator/k8sutil"
 	"k8s.io/api/core/v1"
-	extensions "k8s.io/api/extensions/v1beta1"
+	apps "k8s.io/api/apps/v1beta2"
 	kserrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
@@ -103,13 +103,13 @@ func (a *Agent) createAgentDaemonSet(namespace, agentImage, serviceAccount strin
 	}
 
 	privileged := true
-	ds := &extensions.DaemonSet{
+	ds := &apps.DaemonSet{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: agentDaemonsetName,
 		},
-		Spec: extensions.DaemonSetSpec{
-			UpdateStrategy: extensions.DaemonSetUpdateStrategy{
-				Type: extensions.RollingUpdateDaemonSetStrategyType,
+		Spec: apps.DaemonSetSpec{
+			UpdateStrategy: apps.DaemonSetUpdateStrategy{
+				Type: apps.RollingUpdateDaemonSetStrategyType,
 			},
 			Template: v1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
@@ -235,13 +235,13 @@ func (a *Agent) createAgentDaemonSet(namespace, agentImage, serviceAccount strin
 		}
 	}
 
-	_, err = a.clientset.Extensions().DaemonSets(namespace).Create(ds)
+	_, err = a.clientset.AppsV1beta2().DaemonSets(namespace).Create(ds)
 	if err != nil {
 		if !kserrors.IsAlreadyExists(err) {
 			return fmt.Errorf("failed to create rook-ceph-agent daemon set. %+v", err)
 		}
 		logger.Infof("rook-ceph-agent daemonset already exists, updating ...")
-		_, err = a.clientset.Extensions().DaemonSets(namespace).Update(ds)
+		_, err = a.clientset.AppsV1beta2().DaemonSets(namespace).Update(ds)
 		if err != nil {
 			return fmt.Errorf("failed to update rook-ceph-agent daemon set. %+v", err)
 		}

pkg/operator/ceph/agent/agent_test.go

@@ -62,7 +62,7 @@ func TestStartAgentDaemonset(t *testing.T) {
 	assert.Nil(t, err)
 
 	// check daemonset parameters
-	agentDS, err := clientset.Extensions().DaemonSets(namespace).Get("rook-ceph-agent", metav1.GetOptions{})
+	agentDS, err := clientset.AppsV1beta2().DaemonSets(namespace).Get("rook-ceph-agent", metav1.GetOptions{})
 	assert.Nil(t, err)
 	assert.Equal(t, namespace, agentDS.Namespace)
 	assert.Equal(t, "rook-ceph-agent", agentDS.Name)
@@ -177,7 +177,7 @@ func TestStartAgentDaemonsetWithToleration(t *testing.T) {
 	assert.Nil(t, err)
 
 	// check daemonset toleration
-	agentDS, err := clientset.Extensions().DaemonSets(namespace).Get("rook-ceph-agent", metav1.GetOptions{})
+	agentDS, err := clientset.AppsV1beta2().DaemonSets(namespace).Get("rook-ceph-agent", metav1.GetOptions{})
 	assert.Nil(t, err)
 	assert.Equal(t, 1, len(agentDS.Spec.Template.Spec.Tolerations))
 	assert.Equal(t, "mysa", agentDS.Spec.Template.Spec.ServiceAccountName)

pkg/operator/ceph/cluster/mgr/mgr.go

@@ -126,7 +126,7 @@ func (c *Cluster) Start() error {
 		// start the deployment
 		d := c.makeDeployment(mgrConfig, dashboardPort)
 		logger.Debugf("starting mgr deployment: %+v", d)
-		_, err := c.context.Clientset.ExtensionsV1beta1().Deployments(c.Namespace).Create(d)
+		_, err := c.context.Clientset.AppsV1beta2().Deployments(c.Namespace).Create(d)
 		if err != nil {
 			if !errors.IsAlreadyExists(err) {
 				return fmt.Errorf("failed to create mgr deployment %s. %+v", resourceName, err)

pkg/operator/ceph/cluster/mgr/mgr_test.go

@@ -29,13 +29,13 @@ import (
 	exectest "github.com/rook/rook/pkg/util/exec/test"
 	"github.com/stretchr/testify/assert"
 	"k8s.io/api/core/v1"
-	extensions "k8s.io/api/extensions/v1beta1"
+	apps "k8s.io/api/apps/v1beta2"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 func TestStartMGR(t *testing.T) {
-	var deploymentsUpdated *[]*extensions.Deployment
+	var deploymentsUpdated *[]*apps.Deployment
 	updateDeploymentAndWait, deploymentsUpdated = testopk8s.UpdateDeploymentAndWaitStub()
 
 	executor := &exectest.MockExecutor{
@@ -86,7 +86,7 @@ func validateStart(t *testing.T, c *Cluster) {
 		}
 		logger.Infof("Looking for cephmgr replica %d", i)
 		daemonName := mgrNames[i]
-		_, err := c.context.Clientset.ExtensionsV1beta1().Deployments(c.Namespace).Get(fmt.Sprintf("rook-ceph-mgr-%s", daemonName), metav1.GetOptions{})
+		_, err := c.context.Clientset.AppsV1beta2().Deployments(c.Namespace).Get(fmt.Sprintf("rook-ceph-mgr-%s", daemonName), metav1.GetOptions{})
 		assert.Nil(t, err)
 	}
 

pkg/operator/ceph/cluster/mgr/spec.go

@@ -25,15 +25,15 @@ import (
 	opspec "github.com/rook/rook/pkg/operator/ceph/spec"
 	"github.com/rook/rook/pkg/operator/k8sutil"
 	"k8s.io/api/core/v1"
-	extensions "k8s.io/api/extensions/v1beta1"
+	apps "k8s.io/api/apps/v1beta2"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 const (
 	mgrDaemonCommand = "ceph-mgr"
 )
 
-func (c *Cluster) makeDeployment(mgrConfig *mgrConfig, port int) *extensions.Deployment {
+func (c *Cluster) makeDeployment(mgrConfig *mgrConfig, port int) *apps.Deployment {
 	podSpec := v1.PodTemplateSpec{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:   mgrConfig.ResourceName,
@@ -61,16 +61,16 @@ func (c *Cluster) makeDeployment(mgrConfig *mgrConfig, port int) *extensions.Dep
 	c.placement.ApplyToPodSpec(&podSpec.Spec)
 
 	replicas := int32(1)
-	d := &extensions.Deployment{
+	d := &apps.Deployment{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      mgrConfig.ResourceName,
 			Namespace: c.Namespace,
 		},
-		Spec: extensions.DeploymentSpec{
+		Spec: apps.DeploymentSpec{
 			Template: podSpec,
 			Replicas: &replicas,
-			Strategy: extensions.DeploymentStrategy{
-				Type: extensions.RecreateDeploymentStrategyType,
+			Strategy: apps.DeploymentStrategy{
+				Type: apps.RecreateDeploymentStrategyType,
 			},
 		},
 	}

pkg/operator/ceph/cluster/mon/health.go

@@ -301,7 +301,7 @@ func (c *Cluster) removeMon(daemonName string) error {
 	var gracePeriod int64
 	propagation := metav1.DeletePropagationForeground
 	options := &metav1.DeleteOptions{GracePeriodSeconds: &gracePeriod, PropagationPolicy: &propagation}
-	if err := c.context.Clientset.Extensions().Deployments(c.Namespace).Delete(resourceName, options); err != nil {
+	if err := c.context.Clientset.AppsV1beta2().Deployments(c.Namespace).Delete(resourceName, options); err != nil {
 		if errors.IsNotFound(err) {
 			logger.Infof("dead mon %s was already gone", resourceName)
 		} else {

pkg/operator/ceph/cluster/mon/health_test.go

@@ -35,13 +35,13 @@ import (
 	"github.com/stretchr/testify/assert"
 	"k8s.io/api/core/v1"
 	"k8s.io/api/extensions/v1beta1"
-	extensions "k8s.io/api/extensions/v1beta1"
+	apps "k8s.io/api/apps/v1beta2"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/kubelet/apis"
 )
 
 func TestCheckHealth(t *testing.T) {
-	var deploymentsUpdated *[]*extensions.Deployment
+	var deploymentsUpdated *[]*apps.Deployment
 	updateDeploymentAndWait, deploymentsUpdated = testopk8s.UpdateDeploymentAndWaitStub()
 
 	executor := &exectest.MockExecutor{
@@ -94,7 +94,7 @@ func TestCheckHealth(t *testing.T) {
 }
 
 func TestCheckHealthNotFound(t *testing.T) {
-	var deploymentsUpdated *[]*extensions.Deployment
+	var deploymentsUpdated *[]*apps.Deployment
 	updateDeploymentAndWait, deploymentsUpdated = testopk8s.UpdateDeploymentAndWaitStub()
 
 	executor := &exectest.MockExecutor{
@@ -207,7 +207,7 @@ func TestCheckHealthTwoMonsOneNode(t *testing.T) {
 		prefix := appName + "-"
 		name := monNames[i]
 		d := c.makeDeployment(&monConfig{ResourceName: prefix + name, DaemonName: name}, "node0")
-		_, err := clientset.ExtensionsV1beta1().Deployments(c.Namespace).Create(d)
+		_, err := clientset.AppsV1beta2().Deployments(c.Namespace).Create(d)
 		assert.Nil(t, err)
 		po := c.makeMonPod(&monConfig{ResourceName: prefix + name, DaemonName: name}, "node0")
 		_, err = clientset.CoreV1().Pods(c.Namespace).Create(po)
@@ -251,7 +251,7 @@ func TestCheckHealthTwoMonsOneNode(t *testing.T) {
 
 	// check if mon b has been deleted
 	var dlist *v1beta1.DeploymentList
-	dlist, err = clientset.ExtensionsV1beta1().Deployments(c.Namespace).List(metav1.ListOptions{})
+	dlist, err = clientset.AppsV1beta2().Deployments(c.Namespace).List(metav1.ListOptions{})
 	assert.Nil(t, err)
 	deleted := true
 	for _, d := range dlist.Items {
@@ -267,7 +267,7 @@ func TestCheckHealthTwoMonsOneNode(t *testing.T) {
 	assert.Nil(t, err)
 
 	// check that nothing has changed
-	dlist, err = clientset.ExtensionsV1beta1().Deployments(c.Namespace).List(metav1.ListOptions{})
+	dlist, err = clientset.AppsV1beta2().Deployments(c.Namespace).List(metav1.ListOptions{})
 	assert.Nil(t, err)
 
 	for _, d := range dlist.Items {
@@ -364,7 +364,7 @@ func TestCheckMonsValid(t *testing.T) {
 }
 
 func TestAddRemoveMons(t *testing.T) {
-	var deploymentsUpdated *[]*extensions.Deployment
+	var deploymentsUpdated *[]*apps.Deployment
 	updateDeploymentAndWait, deploymentsUpdated = testopk8s.UpdateDeploymentAndWaitStub()
 
 	monQuorumResponse := clienttest.MonInQuorumResponse()

pkg/operator/ceph/cluster/mon/mon.go

@@ -556,13 +556,13 @@ func (c *Cluster) startMon(m *monConfig, hostname string) error {
 
 	d := c.makeDeployment(m, hostname)
 	logger.Debugf("Starting mon: %+v", d.Name)
-	_, err := c.context.Clientset.Extensions().Deployments(c.Namespace).Create(d)
+	_, err := c.context.Clientset.AppsV1beta2().Deployments(c.Namespace).Create(d)
 	if err != nil {
 		if !errors.IsAlreadyExists(err) {
 			return fmt.Errorf("failed to create mon %s. %+v", m.ResourceName, err)
 		}
 		logger.Debugf("deployment for mon %s already exists. updating if needed", m.ResourceName)
-		p, err := c.context.Clientset.Extensions().Deployments(c.Namespace).Get(d.Name, metav1.GetOptions{})
+		p, err := c.context.Clientset.AppsV1beta2().Deployments(c.Namespace).Get(d.Name, metav1.GetOptions{})
 		if err != nil {
 			return fmt.Errorf("failed to update mon deployment %s. failed to inspect preexisting deployment. %+v", d.Name, err)
 		}

pkg/operator/ceph/cluster/mon/mon_test.go

@@ -158,7 +158,7 @@ func validateStart(t *testing.T, c *Cluster) {
 	assert.Equal(t, 4, len(s.StringData))
 
 	// there is only one pod created. the other two won't be created since the first one doesn't start
-	_, err = c.context.Clientset.Extensions().Deployments(c.Namespace).Get("rook-ceph-mon-a", metav1.GetOptions{})
+	_, err = c.context.Clientset.AppsV1beta2().Deployments(c.Namespace).Get("rook-ceph-mon-a", metav1.GetOptions{})
 	assert.Nil(t, err)
 }
 

pkg/operator/ceph/cluster/mon/spec.go

@@ -26,7 +26,7 @@ import (
 	opspec "github.com/rook/rook/pkg/operator/ceph/spec"
 	"github.com/rook/rook/pkg/operator/k8sutil"
 	"k8s.io/api/core/v1"
-	extensions "k8s.io/api/extensions/v1beta1"
+	apps "k8s.io/api/apps/v1beta2"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/kubelet/apis"
 )
@@ -49,8 +49,8 @@ func (c *Cluster) getLabels(daemonName string) map[string]string {
 	return labels
 }
 
-func (c *Cluster) makeDeployment(monConfig *monConfig, hostname string) *extensions.Deployment {
-	d := &extensions.Deployment{
+func (c *Cluster) makeDeployment(monConfig *monConfig, hostname string) *apps.Deployment {
+	d := &apps.Deployment{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      monConfig.ResourceName,
 			Namespace: c.Namespace,
@@ -61,14 +61,14 @@ func (c *Cluster) makeDeployment(monConfig *monConfig, hostname string) *extensi
 
 	pod := c.makeMonPod(monConfig, hostname)
 	replicaCount := int32(1)
-	d.Spec = extensions.DeploymentSpec{
+	d.Spec = apps.DeploymentSpec{
 		Template: v1.PodTemplateSpec{
 			ObjectMeta: pod.ObjectMeta,
 			Spec:       pod.Spec,
 		},
 		Replicas: &replicaCount,
-		Strategy: extensions.DeploymentStrategy{
-			Type: extensions.RecreateDeploymentStrategyType,
+		Strategy: apps.DeploymentStrategy{
+			Type: apps.RecreateDeploymentStrategyType,
 		},
 	}