Merge pull request operator-framework#403 from ecordell/1.11-updates

1.11 updates
ecordell · Aug 5, 2018 · 4350f4d · 4350f4d
2 parents afc2752 + 3ab0cb4
commit 4350f4d
Show file tree

Hide file tree

Showing 17 changed files with 191 additions and 191 deletions.
diff --git a/deploy/chart/templates/12-alm-operator.deployment.yaml b/deploy/chart/templates/12-alm-operator.deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: alm-operator

diff --git a/deploy/chart/templates/13-catalog-operator.deployment.yaml b/deploy/chart/templates/13-catalog-operator.deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: catalog-operator

diff --git a/deploy/chart/templates/17-alm-servicebroker.deployment.yaml b/deploy/chart/templates/17-alm-servicebroker.deployment.yaml
@@ -1,5 +1,5 @@
 {{ if .Values.servicebroker }}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: alm-service-broker

diff --git a/pkg/api/client/clientfakes/fake_install_strategy_deployment_interface.go b/pkg/api/client/clientfakes/fake_install_strategy_deployment_interface.go
diff --git a/pkg/api/client/deployment_install_client.go b/pkg/api/client/deployment_install_client.go
@@ -5,7 +5,7 @@ import (
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/operatorclient"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/ownerutil"
 	"github.com/pkg/errors"
-	appsv1beta2 "k8s.io/api/apps/v1beta2"
+	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	v1beta1rbac "k8s.io/api/rbac/v1beta1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -18,11 +18,11 @@ type InstallStrategyDeploymentInterface interface {
 	CreateRole(role *v1beta1rbac.Role) (*v1beta1rbac.Role, error)
 	CreateRoleBinding(roleBinding *v1beta1rbac.RoleBinding) (*v1beta1rbac.RoleBinding, error)
 	EnsureServiceAccount(serviceAccount *corev1.ServiceAccount, owner ownerutil.Owner) (*corev1.ServiceAccount, error)
-	CreateDeployment(deployment *appsv1beta2.Deployment) (*appsv1beta2.Deployment, error)
-	CreateOrUpdateDeployment(deployment *appsv1beta2.Deployment) (*appsv1beta2.Deployment, error)
+	CreateDeployment(deployment *appsv1.Deployment) (*appsv1.Deployment, error)
+	CreateOrUpdateDeployment(deployment *appsv1.Deployment) (*appsv1.Deployment, error)
 	DeleteDeployment(name string) error
 	GetServiceAccountByName(serviceAccountName string) (*corev1.ServiceAccount, error)
-	FindAnyDeploymentsMatchingNames(depNames []string) ([]*appsv1beta2.Deployment, error)
+	FindAnyDeploymentsMatchingNames(depNames []string) ([]*appsv1.Deployment, error)
 }
 
 type InstallStrategyDeploymentClientForNamespace struct {
@@ -79,7 +79,7 @@ func (c *InstallStrategyDeploymentClientForNamespace) EnsureServiceAccount(servi
 	return c.opClient.UpdateServiceAccount(foundAccount)
 }
 
-func (c *InstallStrategyDeploymentClientForNamespace) CreateDeployment(deployment *appsv1beta2.Deployment) (*appsv1beta2.Deployment, error) {
+func (c *InstallStrategyDeploymentClientForNamespace) CreateDeployment(deployment *appsv1.Deployment) (*appsv1.Deployment, error) {
 	return c.opClient.CreateDeployment(deployment)
 }
 
@@ -90,7 +90,7 @@ func (c *InstallStrategyDeploymentClientForNamespace) DeleteDeployment(name stri
 	return c.opClient.DeleteDeployment(c.Namespace, name, immediateForegroundDelete)
 }
 
-func (c *InstallStrategyDeploymentClientForNamespace) CreateOrUpdateDeployment(deployment *appsv1beta2.Deployment) (*appsv1beta2.Deployment, error) {
+func (c *InstallStrategyDeploymentClientForNamespace) CreateOrUpdateDeployment(deployment *appsv1.Deployment) (*appsv1.Deployment, error) {
 	d, _, err := c.opClient.CreateOrRollingUpdateDeployment(deployment)
 	return d, err
 }
@@ -99,8 +99,8 @@ func (c *InstallStrategyDeploymentClientForNamespace) GetServiceAccountByName(se
 	return c.opClient.KubernetesInterface().CoreV1().ServiceAccounts(c.Namespace).Get(serviceAccountName, metav1.GetOptions{})
 }
 
-func (c *InstallStrategyDeploymentClientForNamespace) FindAnyDeploymentsMatchingNames(depNames []string) ([]*appsv1beta2.Deployment, error) {
-	var deployments []*appsv1beta2.Deployment
+func (c *InstallStrategyDeploymentClientForNamespace) FindAnyDeploymentsMatchingNames(depNames []string) ([]*appsv1.Deployment, error) {
+	var deployments []*appsv1.Deployment
 	for _, depName := range depNames {
 		fetchedDep, err := c.opClient.GetDeployment(c.Namespace, depName)
 

diff --git a/pkg/controller/install/deployment.go b/pkg/controller/install/deployment.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	log "github.com/sirupsen/logrus"
-	"k8s.io/api/apps/v1beta2"
+	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	rbac "k8s.io/api/rbac/v1beta1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -25,8 +25,8 @@ type StrategyDeploymentPermissions struct {
 
 // StrategyDeploymentSpec contains the name and spec for the deployment ALM should create
 type StrategyDeploymentSpec struct {
-	Name string                 `json:"name"`
-	Spec v1beta2.DeploymentSpec `json:"spec"`
+	Name string                `json:"name"`
+	Spec appsv1.DeploymentSpec `json:"spec"`
 }
 
 // StrategyDetailsDeployment represents the parsed details of a Deployment
@@ -104,7 +104,7 @@ func (i *StrategyDeploymentInstaller) installPermissions(perms []StrategyDeploym
 func (i *StrategyDeploymentInstaller) installDeployments(deps []StrategyDeploymentSpec) error {
 	for _, d := range deps {
 		// Create or Update Deployment
-		dep := &v1beta2.Deployment{Spec: d.Spec}
+		dep := &appsv1.Deployment{Spec: d.Spec}
 		dep.SetName(d.Name)
 		dep.SetNamespace(i.owner.GetNamespace())
 		ownerutil.AddNonBlockingOwner(dep, i.owner)
@@ -209,7 +209,7 @@ func (i *StrategyDeploymentInstaller) checkForDeployments(deploymentSpecs []Stra
 	}
 
 	// compare deployments to see if any need to be created/updated
-	existingMap := map[string]*v1beta2.Deployment{}
+	existingMap := map[string]*appsv1.Deployment{}
 	for _, d := range existingDeployments {
 		existingMap[d.GetName()] = d
 	}