feat: move from apiVersion v1alpha1 to v1beta1

Author: kyleschlosser

Makefile

@@ -52,7 +52,7 @@ generate-code:
 	$(info Compiling deepcopy-gen...)
 	go build -o ${BIN_DIR}/deepcopy-gen ./cmd/deepcopy-gen/
 	$(info Generating deepcopy...)
-	${BIN_DIR}/deepcopy-gen -i ./pkg/apis/controller/v1alpha1/ -O zz_generated.deepcopy 
+	${BIN_DIR}/deepcopy-gen -i ./pkg/apis/controller/v1beta1/ -O zz_generated.deepcopy 
 
 images: verify-tag-name
 	$(info List executable directory)

config/crd/bases/mcad.ibm.com_appwrappers.yaml

@@ -16,7 +16,7 @@ spec:
     singular: appwrapper
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - name: v1beta1
     schema:
       openAPIV3Schema:
         description: Definition of AppWrapper class

config/crd/bases/mcad.ibm.com_queuejobs.yaml

@@ -16,7 +16,7 @@ spec:
     singular: queuejob
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - name: v1beta1
     schema:
       openAPIV3Schema:
         properties:

config/crd/bases/mcad.ibm.com_schedulingspecs.yaml

@@ -16,7 +16,7 @@ spec:
     singular: schedulingspec
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - name: v1beta1
     schema:
       openAPIV3Schema:
         properties:

deployment/mcad-controller/templates/deployment.yaml

@@ -116,7 +116,7 @@ spec:
     singular: schedulingspec
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - name: v1beta1
     schema:
       openAPIV3Schema:
         properties:
@@ -163,7 +163,7 @@ spec:
     singular: queuejob
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - name: v1beta1
     schema:
       openAPIV3Schema:
         properties:
@@ -6983,7 +6983,7 @@ spec:
     singular: appwrapper
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - name: v1beta1
     schema:
       openAPIV3Schema:
         description: Definition of AppWrapper class

deployment/mcad-operator/helm-charts/mcad-controller/templates/deployment.yaml

@@ -98,7 +98,7 @@ spec:
     singular: schedulingspec
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - name: v1beta1
     schema:
       openAPIV3Schema:
         properties:
@@ -145,7 +145,7 @@ spec:
     singular: queuejob
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - name: v1beta1
     schema:
       openAPIV3Schema:
         properties:
@@ -6965,7 +6965,7 @@ spec:
     singular: appwrapper
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - name: v1beta1
     schema:
       openAPIV3Schema:
         description: Definition of AppWrapper class

doc/build/build.md

@@ -45,7 +45,7 @@ $ ./build.sh
 Compiling deepcopy-gen
 Generating deepcopy
 go build -o _output/bin/deepcopy-gen ./cmd/deepcopy-gen/
-_output/bin/deepcopy-gen -i ./pkg/apis/controller/v1alpha1/ -O zz_generated.deepcopy
+_output/bin/deepcopy-gen -i ./pkg/apis/controller/v1beta1/ -O zz_generated.deepcopy
 + make kar-controller
 mkdir -p _output/bin
 CGO_ENABLED=0 GOARCH=amd64 go build -o _output/bin/kar-controllers ./cmd/kar-controllers/

doc/usage/examples/aw-1-k8s-job1.yaml

@@ -1,4 +1,4 @@
-apiVersion: mcad.ibm.com/v1alpha1
+apiVersion: mcad.ibm.com/v1beta1
 kind: AppWrapper
 metadata:
   name: aw-generic-statefulset-2

doc/usage/examples/aw-1-k8s-job2.yaml

@@ -1,4 +1,4 @@
-apiVersion: mcad.ibm.com/v1alpha1
+apiVersion: mcad.ibm.com/v1beta1
 kind: AppWrapper
 metadata:
   name: aw-generic-statefulset-2

doc/usage/examples/aw-1-k8s-job3.yaml

@@ -1,4 +1,4 @@
-apiVersion: mcad.ibm.com/v1alpha1
+apiVersion: mcad.ibm.com/v1beta1
 kind: AppWrapper
 metadata:
   name: aw-generic-statefulset-2

doc/usage/tutorial.md

@@ -18,7 +18,7 @@ Refer to [deployment instructions](../deploy/deployment.md) on how to deploy the
 After successfully deploying the __Multi-Cluster Application Dispatcher__ Controller, create an AppWrapper custom resource in a file named `aw-01.yaml` with the following content:
 
 ```
-apiVersion: mcad.ibm.com/v1alpha1
+apiVersion: mcad.ibm.com/v1beta1
 kind: AppWrapper
 metadata:
   name: stateful-set-2-replicas
@@ -81,7 +81,7 @@ Name:         stateful-set-2-replicas
 Namespace:    default
 Labels:       <none>
 Annotations:  <none>
-API Version:  mcad.ibm.com/v1alpha1
+API Version:  mcad.ibm.com/v1beta1
 Kind:         AppWrapper
 . . .
 Status:
@@ -188,7 +188,7 @@ The next step is to create a second `AppWrapper` job that has resource demands t
 Create an `AppWrapper` job in a file named `aw-02.yaml` with the following content:
 
 ```
-apiVersion: mcad.ibm.com/v1alpha1
+apiVersion: mcad.ibm.com/v1beta1
 kind: AppWrapper
 metadata:
   name: deployment-2-replicas
@@ -250,7 +250,7 @@ Name:         deployment-2-replicas
 Namespace:    default
 Labels:       <none>
 Annotations:  <none>
-API Version:  mcad.ibm.com/v1alpha1
+API Version:  mcad.ibm.com/v1beta1
 Kind:         AppWrapper
 . . .
 Status:

hack/run-e2e-kind.sh

@@ -133,7 +133,7 @@ debug_function() {
   kubectl create namespace test
 
 cat <<EOF > aw-ss.0.yaml
-apiVersion: mcad.ibm.com/v1alpha1
+apiVersion: mcad.ibm.com/v1beta1
 kind: AppWrapper
 metadata:
   name: hellodiana-2-test-0

pkg/apis/controller/v1alpha1/appwrapper.go renamed to pkg/apis/controller/v1beta1/appwrapper.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1beta1
 
 import (
 	"k8s.io/api/core/v1"
@@ -57,12 +57,13 @@ type AppWrapperSpec struct {
 	// SchedSpec specifies the parameters for scheduling.
 	SchedSpec SchedulingSpecTemplate `json:"schedulingSpec,omitempty" protobuf:"bytes,2,opt,name=schedulingSpec"`
 }
+
 // a collection of AppWrapperResource
 type AppWrapperResourceList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata"`
 	Items           []AppWrapperResource
-	GenericItems	[]AppWrapperGenericResource
+	GenericItems    []AppWrapperGenericResource
 }
 
 // AppWrapperService is App Wrapper service definition
@@ -96,7 +97,6 @@ type AppWrapperResource struct {
 	//The template for the resource; it is now a raw text because we don't know for what resource
 	//it should be instantiated
 	Template runtime.RawExtension `json:"template"`
-
 }
 
 // AppWrapperResource is App Wrapper aggregation resource
@@ -128,7 +128,7 @@ type AppWrapperGenericResource struct {
 }
 
 type CustomPodResourceTemplate struct {
-	Replicas int             `json:"replicas"`
+	Replicas int `json:"replicas"`
 	//todo: replace with
 	//Containers []Container Contain v1.ResourceRequirements
 	Requests v1.ResourceList `json:"requests"`
@@ -139,17 +139,17 @@ type CustomPodResourceTemplate struct {
 type ResourceType string
 
 const (
-	ResourceTypePod         			ResourceType = "Pod"
-	ResourceTypeService     			ResourceType = "Service"
-	ResourceTypeSecret      			ResourceType = "Secret"
-	ResourceTypeStatefulSet 			ResourceType = "StatefulSet"
-	ResourceTypeDeployment  			ResourceType = "Deployment"
-	ResourceTypeReplicaSet  			ResourceType = "ReplicaSet"
-	ResourceTypePersistentVolume			ResourceType = "PersistentVolume"
-	ResourceTypePersistentVolumeClaim		ResourceType = "PersistentVolumeClaim"
-	ResourceTypeNamespace				ResourceType = "Namespace"
-	ResourceTypeConfigMap				ResourceType = "ConfigMap"
-	ResourceTypeNetworkPolicy			ResourceType = "NetworkPolicy"
+	ResourceTypePod                   ResourceType = "Pod"
+	ResourceTypeService               ResourceType = "Service"
+	ResourceTypeSecret                ResourceType = "Secret"
+	ResourceTypeStatefulSet           ResourceType = "StatefulSet"
+	ResourceTypeDeployment            ResourceType = "Deployment"
+	ResourceTypeReplicaSet            ResourceType = "ReplicaSet"
+	ResourceTypePersistentVolume      ResourceType = "PersistentVolume"
+	ResourceTypePersistentVolumeClaim ResourceType = "PersistentVolumeClaim"
+	ResourceTypeNamespace             ResourceType = "Namespace"
+	ResourceTypeConfigMap             ResourceType = "ConfigMap"
+	ResourceTypeNetworkPolicy         ResourceType = "NetworkPolicy"
 )
 
 // AppWrapperStatus represents the current state of a AppWrapper
@@ -172,7 +172,7 @@ type AppWrapperStatus struct {
 	// The minimal available resources to run for this AppWrapper (is this different from the MinAvailable from JobStatus)
 	// +optional
 	MinAvailable int32 `json:"template,omitempty" protobuf:"bytes,4,opt,name=template"`
-	
+
 	//Can run?
 	CanRun bool `json:"canrun,omitempty" protobuf:"bytes,1,opt,name=canrun"`
 
@@ -204,7 +204,6 @@ type AppWrapperStatus struct {
 
 	// Represents the latest available observations of a appwrapper's current condition.
 	Conditions []AppWrapperCondition `json:"conditions,omitempty"`
-
 }
 
 type AppWrapperState string
@@ -220,16 +219,16 @@ const (
 type AppWrapperConditionType string
 
 const (
-	AppWrapperCondInit              AppWrapperConditionType = "Init"
-	AppWrapperCondQueueing          AppWrapperConditionType = "Queueing"
-	AppWrapperCondHeadOfLine        AppWrapperConditionType = "HeadOfLine"
-	AppWrapperCondBackoff           AppWrapperConditionType = "Backoff"
-	AppWrapperCondDispatched        AppWrapperConditionType = "Dispatched"
-	AppWrapperCondRunning           AppWrapperConditionType = "Running"
-	AppWrapperCondPreemptCandidate  AppWrapperConditionType = "PreemptCandidate"
-	AppWrapperCondPreempted         AppWrapperConditionType = "Preempted"
-	AppWrapperCondDeleted           AppWrapperConditionType = "Deleted"
-	AppWrapperCondFailed            AppWrapperConditionType = "Failed"
+	AppWrapperCondInit             AppWrapperConditionType = "Init"
+	AppWrapperCondQueueing         AppWrapperConditionType = "Queueing"
+	AppWrapperCondHeadOfLine       AppWrapperConditionType = "HeadOfLine"
+	AppWrapperCondBackoff          AppWrapperConditionType = "Backoff"
+	AppWrapperCondDispatched       AppWrapperConditionType = "Dispatched"
+	AppWrapperCondRunning          AppWrapperConditionType = "Running"
+	AppWrapperCondPreemptCandidate AppWrapperConditionType = "PreemptCandidate"
+	AppWrapperCondPreempted        AppWrapperConditionType = "Preempted"
+	AppWrapperCondDeleted          AppWrapperConditionType = "Deleted"
+	AppWrapperCondFailed           AppWrapperConditionType = "Failed"
 )
 
 // DeploymentCondition describes the state of a deployment at a certain point.

pkg/apis/controller/v1alpha1/doc.go renamed to pkg/apis/controller/v1beta1/doc.go

@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package
-package v1alpha1
+package v1beta1

pkg/apis/controller/v1alpha1/queuejob.go renamed to pkg/apis/controller/v1beta1/queuejob.go

@@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
-
+package v1beta1
 
 import (
 	"k8s.io/api/core/v1"

pkg/apis/controller/v1alpha1/register.go renamed to pkg/apis/controller/v1beta1/register.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1beta1
 
 import (
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
@@ -32,15 +32,16 @@ var (
 const GroupName = "mcad.ibm.com"
 
 // SchemeGroupVersion is the group version used to register these objects.
-var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"}
+var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1beta1"}
 
-var Versions = []apiextensionsv1.CustomResourceDefinitionVersion {
+var Versions = []apiextensionsv1.CustomResourceDefinitionVersion{
 	{
-		Name: SchemeGroupVersion.Version,
-		Served: true,
+		Name:    SchemeGroupVersion.Version,
+		Served:  true,
 		Storage: true,
 	},
 }
+
 // Resource takes an unqualified resource and returns a Group-qualified GroupResource.
 func Resource(resource string) schema.GroupResource {
 	return SchemeGroupVersion.WithResource(resource).GroupResource()

pkg/apis/controller/v1alpha1/schedulingspec.go renamed to pkg/apis/controller/v1beta1/schedulingspec.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1beta1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/apis/controller/v1alpha1/zz_generated.deepcopy.go renamed to pkg/apis/controller/v1beta1/zz_generated.deepcopy.go

@@ -22,7 +22,7 @@ import (
 	"os"
 	"time"
 
-	arbv1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1alpha1"
+	arbv1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1"
 
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"

pkg/client/clientset/controller-versioned/clients/appwrapper.go

@@ -21,7 +21,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/client-go/rest"
 
-	arbv1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1alpha1"
+	arbv1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1"
 )
 
 func NewClient(cfg *rest.Config) (*rest.RESTClient, *runtime.Scheme, error) {

pkg/client/clientset/controller-versioned/clients/factory.go

@@ -22,7 +22,7 @@ import (
 	"os"
 	"time"
 
-	arbv1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1alpha1"
+	arbv1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1"
 
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"

pkg/client/clientset/controller-versioned/clients/queuejob.go

@@ -22,7 +22,7 @@ import (
 	"os"
 	"time"
 
-	arbv1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1alpha1"
+	arbv1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1"
 
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"

pkg/client/clientset/controller-versioned/clients/schedulingspec.go

@@ -17,7 +17,7 @@ limitations under the License.
 package scheme
 
 import (
-	arbv1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1alpha1"
+	arbv1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1"
 
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"

pkg/client/clientset/controller-versioned/scheme/register.go

@@ -19,7 +19,7 @@ package v1
 import (
 	"context"
 
-	v1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1alpha1"
+	v1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1"
 	"github.com/IBM/multi-cluster-app-dispatcher/pkg/client/clientset/controller-versioned/scheme"
 
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"