Move API version to v1

README.md

@@ -70,14 +70,14 @@ $ kubectl describe storageoscluster/example-storageos
 Name:         example-storageos
 Namespace:    default
 Labels:       <none>
-Annotations:  kubectl.kubernetes.io/last-applied-configuration={"apiVersion":"storageos.com/v1alpha1","kind":"StorageOSCluster","metadata":{"annotations":{},"name":"example-storageos","namespace":"default"},"spec":{"...
-API Version:  storageos.com/v1alpha1
+Annotations:  kubectl.kubernetes.io/last-applied-configuration={"apiVersion":"storageos.com/v1","kind":"StorageOSCluster","metadata":{"annotations":{},"name":"example-storageos","namespace":"default"},"spec":{"...
+API Version:  storageos.com/v1
 Kind:         StorageOSCluster
 Metadata:
   Creation Timestamp:  2018-07-21T12:57:11Z
   Generation:          1
   Resource Version:    10939030
-  Self Link:           /apis/storageos.com/v1alpha1/namespaces/default/storageosclusters/example-storageos
+  Self Link:           /apis/storageos.com/v1/namespaces/default/storageosclusters/example-storageos
   UID:                 955b24a4-8ce5-11e8-956a-1866da35eee2
 Spec:
   Join:  test07
@@ -145,7 +145,7 @@ An existing StorageOS cluster can be upgraded to a new version of StorageOS by
 creating an Upgrade Configuration. The cluster-operator takes care of
 downloading the new container image and updating all the nodes with new version
 of StorageOS.
-An example of `StorageOSUpgrade` resource is [storageos_v1alpha1_storageosupgrade_cr.yaml](/deploy/crds/storageos_v1alpha1_storageosupgrade_cr.yaml).
+An example of `StorageOSUpgrade` resource is [storageos_v1_storageosupgrade_cr.yaml](/deploy/crds/storageos_v1_storageosupgrade_cr.yaml).
 
 Only offline upgrade is supported for now by cluster-operator. During the
 upgrade, StorageOS maintenance mode is enabled, the applications that use
@@ -164,8 +164,8 @@ $ kubectl describe storageosupgrades example-storageosupgrade
 Name:         example-storageosupgrade
 Namespace:    default
 Labels:       <none>
-Annotations:  kubectl.kubernetes.io/last-applied-configuration={"apiVersion":"storageos.com/v1alpha1","kind":"StorageOSUpgrade","metadata":{"annotations":{},"name":"example-storageosupgrade","namespace":"default"},...
-API Version:  storageos.com/v1alpha1
+Annotations:  kubectl.kubernetes.io/last-applied-configuration={"apiVersion":"storageos.com/v1","kind":"StorageOSUpgrade","metadata":{"annotations":{},"name":"example-storageosupgrade","namespace":"default"},...
+API Version:  storageos.com/v1
 Kind:         StorageOSUpgrade
 ...
 Spec:
@@ -208,7 +208,7 @@ all nodes or on selected nodes. This can be used to easily perform cleanup
 task. An example would be to create a `Job` resource:
 
 ```yaml
-apiVersion: storageos.com/v1alpha1
+apiVersion: storageos.com/v1
 kind: Job
 metadata:
   name: cleanup-job
@@ -352,7 +352,7 @@ To enable CSI, set `csi.enable` to `true` in the `StorageOSCluster` resource
 config.
 
 ```yaml
-apiVersion: "storageos.com/v1alpha1"
+apiVersion: "storageos.com/v1"
 kind: "StorageOSCluster"
 metadata:
   name: "example-storageos"
@@ -371,7 +371,7 @@ To enable CSI Credentials, ensure that CSI is enabled by setting `csi.enable` to
 `true`:
 
 ```yaml
-apiVersion: "storageos.com/v1alpha1"
+apiVersion: "storageos.com/v1"
 kind: "StorageOSCluster"
 metadata:
   name: "example-storageos"

deploy/crds/storageos_v1alpha1_job_cr.yaml → deploy/crds/storageos_v1_job_cr.yaml

@@ -1,4 +1,4 @@
-apiVersion: storageos.com/v1alpha1
+apiVersion: storageos.com/v1
 kind: Job
 metadata:
   name: example-job

deploy/crds/storageos_v1alpha1_job_crd.yaml → deploy/crds/storageos_v1_job_crd.yaml

@@ -10,4 +10,4 @@ spec:
     plural: jobs
     singular: job
   scope: Namespaced
-  version: v1alpha1
+  version: v1

deploy/crds/storageos_v1alpha1_storageoscluster_cr.yaml → deploy/crds/storageos_v1_storageoscluster_cr.yaml

@@ -1,4 +1,4 @@
-apiVersion: storageos.com/v1alpha1
+apiVersion: storageos.com/v1
 kind: StorageOSCluster
 metadata:
   name: example-storageoscluster

deploy/crds/storageos_v1alpha1_storageoscluster_crd.yaml → deploy/crds/storageos_v1_storageoscluster_crd.yaml

@@ -12,7 +12,7 @@ spec:
     shortNames:
     - stos
   scope: Namespaced
-  version: v1alpha1
+  version: v1
   additionalPrinterColumns:
   - name: Ready
     type: string

deploy/crds/storageos_v1alpha1_storageosupgrade_cr.yaml → deploy/crds/storageos_v1_storageosupgrade_cr.yaml

@@ -1,4 +1,4 @@
-apiVersion: storageos.com/v1alpha1
+apiVersion: storageos.com/v1
 kind: StorageOSUpgrade
 metadata:
   name: example-storageosupgrade

deploy/crds/storageos_v1alpha1_storageosupgrade_crd.yaml → deploy/crds/storageos_v1_storageosupgrade_crd.yaml

@@ -10,4 +10,4 @@ spec:
     plural: storageosupgrades
     singular: storageosupgrade
   scope: Namespaced
-  version: v1alpha1
+  version: v1

deploy/storageos-operators.configmap.yaml

@@ -23,7 +23,7 @@ data:
           shortNames:
           - stos
         scope: Namespaced
-        version: v1alpha1
+        version: v1
         additionalPrinterColumns:
         - name: Ready
           type: string
@@ -139,7 +139,7 @@ data:
           plural: jobs
           singular: job
         scope: Namespaced
-        version: v1alpha1
+        version: v1
     - apiVersion: apiextensions.k8s.io/v1beta1
       kind: CustomResourceDefinition
       metadata:
@@ -152,7 +152,7 @@ data:
           plural: storageosupgrades
           singular: storageosupgrade
         scope: Namespaced
-        version: v1alpha1
+        version: v1
 
 
   clusterServiceVersions: |-
@@ -165,7 +165,7 @@ data:
         annotations:
           capabilities: Full Lifecycle
           categories: "Storage"
-          alm-examples: '[{"apiVersion":"storageos.com/v1alpha1","kind":"StorageOSCluster","metadata":{"name":"example-storageos","namespace":"default"},"spec":{"secretRefName":"storageos-api","secretRefNamespace":"default"}},{"apiVersion":"storageos.com/v1alpha1","kind":"Job","metadata":{"name":"example-job","namespace":"default"},"spec":{"image":"storageos/cluster-operator:latest","args":["/var/lib/storageos"],"mountPath":"/var/lib","hostPath":"/var/lib","completionWord":"done"}},{"apiVersion":"storageos.com/v1alpha1","kind":"StorageOSUpgrade","metadata":{"name":"example-upgrade","namespace":"default"},"spec":{"newImage":"storageos/node:latest"}}]'
+          alm-examples: '[{"apiVersion":"storageos.com/v1","kind":"StorageOSCluster","metadata":{"name":"example-storageos","namespace":"default"},"spec":{"secretRefName":"storageos-api","secretRefNamespace":"default"}},{"apiVersion":"storageos.com/v1","kind":"Job","metadata":{"name":"example-job","namespace":"default"},"spec":{"image":"storageos/cluster-operator:latest","args":["/var/lib/storageos"],"mountPath":"/var/lib","hostPath":"/var/lib","completionWord":"done"}},{"apiVersion":"storageos.com/v1","kind":"StorageOSUpgrade","metadata":{"name":"example-upgrade","namespace":"default"},"spec":{"newImage":"storageos/node:latest"}}]'
           description: Cloud-native, persistent storage for containers.
           containerImage: storageos/cluster-operator:test
           repository: https://github.com/storageos/cluster-operator
@@ -420,7 +420,7 @@ data:
         customresourcedefinitions:
           owned:
           - name: storageosclusters.storageos.com
-            version: v1alpha1
+            version: v1
             kind: StorageOSCluster
             displayName: StorageOS Cluster
             description: StorageOS Cluster installs StorageOS in the cluster. It contains all the configuration for setting up a StorageOS cluster and also shows the status of the running StorageOS cluster.
@@ -449,12 +449,12 @@ data:
               displayName: Ready
               path: ready
           - name: jobs.storageos.com
-            version: v1alpha1
+            version: v1
             kind: Job
             displayName: StorageOS Job
             description: StorageOS Job creates special pods that run on all the node and perform an administrative task. This could be used for cluster maintenance tasks.
           - name: storageosupgrades.storageos.com
-            version: v1alpha1
+            version: v1
             kind: StorageOSUpgrade
             displayName: StorageOS Upgrade
             description: StorageOS Upgrade automatically upgrades an existing StorageOS cluster as per the upgrade configuration.
@@ -463,7 +463,7 @@ data:
 
     - packageName: storageos
       channels:
-      - name: alpha
+      - name: stable
         currentCSV: storageosoperator.0.0.0
 
 

deploy/storageos-operators.olm.cr.yaml

@@ -1,4 +1,4 @@
-apiVersion: storageos.com/v1alpha1
+apiVersion: storageos.com/v1
 kind: StorageOSCluster
 metadata:
   name: example

deploy/storageos-operators.subscription.yaml

@@ -7,4 +7,4 @@ spec:
   source: storageos-catalog
   sourceNamespace: olm
   name: storageos
-  channel: alpha
+  channel: stable

pkg/apis/addtoscheme_storageos_v1.go

@@ -0,0 +1,10 @@
+package apis
+
+import (
+	storageosv1 "github.com/storageos/cluster-operator/pkg/apis/storageos/v1"
+)
+
+func init() {
+	// Register the types with the Scheme so the components can map objects to GroupVersionKinds and back
+	AddToSchemes = append(AddToSchemes, storageosv1.SchemeBuilder.AddToScheme)
+}

pkg/apis/storageos/v1/doc.go

@@ -0,0 +1,4 @@
+// Package v1 contains API Schema definitions for the cluster v1 API group
+// +k8s:deepcopy-gen=package,register
+// +groupName=storageos.com
+package v1

pkg/apis/storageos/v1alpha1/job_types.go → pkg/apis/storageos/v1/job_types.go

@@ -1,4 +1,4 @@
-package v1alpha1
+package v1
 
 import (
 	corev1 "k8s.io/api/core/v1"

pkg/apis/storageos/v1alpha1/register.go → pkg/apis/storageos/v1/register.go

@@ -1,9 +1,9 @@
 // NOTE: Boilerplate only.  Ignore this file.
 
-// Package v1alpha1 contains API Schema definitions for the cluster v1alpha1 API group
+// Package v1 contains API Schema definitions for the cluster v1 API group
 // +k8s:deepcopy-gen=package,register
 // +groupName=cluster.storageos.com
-package v1alpha1
+package v1
 
 import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -12,7 +12,7 @@ import (
 
 var (
 	// SchemeGroupVersion is group version used to register these objects
-	SchemeGroupVersion = schema.GroupVersion{Group: "storageos.com", Version: "v1alpha1"}
+	SchemeGroupVersion = schema.GroupVersion{Group: "storageos.com", Version: "v1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}

pkg/apis/storageos/v1alpha1/storageoscluster_types.go → pkg/apis/storageos/v1/storageoscluster_types.go

@@ -1,4 +1,4 @@
-package v1alpha1
+package v1
 
 import (
 	"fmt"

pkg/apis/storageos/v1alpha1/storageosupgrade_types.go → pkg/apis/storageos/v1/storageosupgrade_types.go

@@ -1,4 +1,4 @@
-package v1alpha1
+package v1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/controller/job/job_controller.go

@@ -3,13 +3,13 @@ package job
 import (
 	"bytes"
 	"context"
+	"fmt"
 	"io"
 	"log"
 	"strings"
 	"time"
-	"fmt"
 
-	storageosv1alpha1 "github.com/storageos/cluster-operator/pkg/apis/storageos/v1alpha1"
+	storageosv1 "github.com/storageos/cluster-operator/pkg/apis/storageos/v1"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -50,15 +50,15 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
 	}
 
 	// Watch for changes to primary resource Job
-	err = c.Watch(&source.Kind{Type: &storageosv1alpha1.Job{}}, &handler.EnqueueRequestForObject{})
+	err = c.Watch(&source.Kind{Type: &storageosv1.Job{}}, &handler.EnqueueRequestForObject{})
 	if err != nil {
 		return err
 	}
 
 	// Watch for changes to secondary resource DaemonSet and requeue the owner Job
 	err = c.Watch(&source.Kind{Type: &appsv1.DaemonSet{}}, &handler.EnqueueRequestForOwner{
 		IsController: true,
-		OwnerType:    &storageosv1alpha1.Job{},
+		OwnerType:    &storageosv1.Job{},
 	})
 	if err != nil {
 		return err
@@ -93,7 +93,7 @@ func (r *ReconcileJob) Reconcile(request reconcile.Request) (reconcile.Result, e
 	reconcileResult := reconcile.Result{RequeueAfter: reconcilePeriod}
 
 	// Fetch the Job instance
-	instance := &storageosv1alpha1.Job{}
+	instance := &storageosv1.Job{}
 	err := r.client.Get(context.TODO(), request.NamespacedName, instance)
 	if err != nil {
 		if errors.IsNotFound(err) {
@@ -164,7 +164,7 @@ func (r *ReconcileJob) Reconcile(request reconcile.Request) (reconcile.Result, e
 // checkPods checks the logs of all pods with the given label selector for the
 // completionWord and published a "JobCompleted" event when all the pods have
 // completed their task.
-func checkPods(client kubernetes.Interface, cr *storageosv1alpha1.Job, recorder record.EventRecorder) (bool, error) {
+func checkPods(client kubernetes.Interface, cr *storageosv1.Job, recorder record.EventRecorder) (bool, error) {
 	podListOpts := metav1.ListOptions{
 		LabelSelector: cr.Spec.GetLabelSelector(),
 	}
@@ -225,7 +225,7 @@ func getPlainLogs(req *restclient.Request) (string, error) {
 }
 
 // newPodForCR returns a busybox pod with the same name/namespace as the cr
-func newDaemonSetForCR(cr *storageosv1alpha1.Job) (*appsv1.DaemonSet, error) {
+func newDaemonSetForCR(cr *storageosv1.Job) (*appsv1.DaemonSet, error) {
 	defaultLabels := map[string]string{
 		"daemonset": cr.Name + "-daemonset-job",
 		"job":       cr.Name,
@@ -291,7 +291,7 @@ func newDaemonSetForCR(cr *storageosv1alpha1.Job) (*appsv1.DaemonSet, error) {
 	if len(tolerations) > 0 {
 		dset.Spec.Template.Spec.Tolerations = cr.Spec.Tolerations
 	}
-	
+
 	// Add node affinity if defined.
 	if len(cr.Spec.NodeSelectorTerms) > 0 {
 		dset.Spec.Template.Spec.Affinity = &corev1.Affinity{NodeAffinity: &corev1.NodeAffinity{

pkg/controller/storageoscluster/cluster.go

@@ -1,23 +1,23 @@
 package storageoscluster
 
 import (
-	storageosv1alpha1 "github.com/storageos/cluster-operator/pkg/apis/storageos/v1alpha1"
+	storageosv1 "github.com/storageos/cluster-operator/pkg/apis/storageos/v1"
 	"github.com/storageos/cluster-operator/pkg/storageos"
 )
 
 // StorageOSCluster stores the current cluster's information. It binds the
 // cluster and the deployment together, ensuring deployment interacts with the
 // right cluster resource.
 type StorageOSCluster struct {
-	cluster *storageosv1alpha1.StorageOSCluster
+	cluster *storageosv1.StorageOSCluster
 	// deployment implements storageoscluster.Deployment interface. This is
 	// cached for a cluster to avoid recreating it without any change to the
 	// cluster object. Every new cluster will create its unique deployment.
 	deployment Deployment
 }
 
 // NewStorageOSCluster creates a new StorageOSCluster object.
-func NewStorageOSCluster(cluster *storageosv1alpha1.StorageOSCluster) *StorageOSCluster {
+func NewStorageOSCluster(cluster *storageosv1.StorageOSCluster) *StorageOSCluster {
 	return &StorageOSCluster{cluster: cluster}
 }
 
@@ -34,7 +34,7 @@ func (c *StorageOSCluster) SetDeployment(r *ReconcileStorageOSCluster) {
 
 // IsCurrentCluster compares the cluster attributes to check if the given
 // cluster is the same as the current cluster.
-func (c *StorageOSCluster) IsCurrentCluster(cluster *storageosv1alpha1.StorageOSCluster) bool {
+func (c *StorageOSCluster) IsCurrentCluster(cluster *storageosv1.StorageOSCluster) bool {
 	if (c.cluster.GetName() == cluster.GetName()) &&
 		(c.cluster.GetNamespace() == cluster.GetNamespace()) {
 		return true