Update CRD API version to V1alpha6 (#384)

Co-authored-by: Toby Pinfold <[email protected]> Co-authored-by: Aidan Dunlop <[email protected]> Co-authored-by: Ian <[email protected]>
sky-uk · Nov 19, 2024 · a3f73fa · a3f73fa
1 parent 477120a
commit a3f73fa
Show file tree

Hide file tree

Showing 229 changed files with 5,171 additions and 6,484 deletions.
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
@@ -3,6 +3,13 @@
 We use [kubebuilder](https://github.com/kubernetes-sigs/kubebuilder) to scaffold the kubernetes controllers.
 The [Kubebuilder Book](https://book.kubebuilder.io/) is a good introduction to the topic and we recommend reading it before proceeding.
 
+Please install kubebuilder `3.15.1` before upgrading or adding new Custom Resources:
+```
+asdf plugin-add kubebuilder https://github.com/virtualstaticvoid/asdf-kubebuilder.git
+asdf install kubebuilder 3.15.1
+```
+Note that we currently need to use kubebuilder version 3 or below, as [work is required to support later versions](https://github.com/sky-uk/kfp-operator/issues/381).
+
 ## Set up the development environment
 
 Install Go by following the instructions on the [website](https://golang.org/doc/install).

diff --git a/apis/common_types.go b/apis/common_types.go
@@ -26,9 +26,3 @@ func (nv NamedValue) GetKey() string {
 func (nv NamedValue) GetValue() string {
 	return nv.Value
 }
-
-var ResourceAnnotations = struct {
-	Provider string
-}{
-	Provider: Group + "/provider",
-}
diff --git a/apis/config/v1alpha2/kfp_controller_config_types.go b/apis/config/v1alpha2/kfp_controller_config_types.go
diff --git a/apis/config/v1alpha2/zz_generated.deepcopy.go b/apis/config/v1alpha2/zz_generated.deepcopy.go
diff --git a/apis/config/v1alpha3/groupversion_info.go b/apis/config/v1alpha3/groupversion_info.go
diff --git a/apis/config/v1alpha3/kfp_controller_config_types.go b/apis/config/v1alpha3/kfp_controller_config_types.go
diff --git a/apis/config/v1alpha3/zz_generated.deepcopy.go b/apis/config/v1alpha3/zz_generated.deepcopy.go
diff --git a/apis/config/v1alpha4/groupversion_info.go b/apis/config/v1alpha4/groupversion_info.go
diff --git a/apis/config/v1alpha4/kfp_controller_config_types.go b/apis/config/v1alpha4/kfp_controller_config_types.go
diff --git a/apis/config/v1alpha5/kfp_controller_config_types.go b/apis/config/v1alpha5/kfp_controller_config_types.go
@@ -2,6 +2,7 @@ package v1alpha5
 
 import (
 	"fmt"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	cfg "sigs.k8s.io/controller-runtime/pkg/config/v1alpha1"
 )
@@ -31,19 +32,16 @@ type ServiceConfiguration struct {
 	Endpoints []Endpoint `json:"endpoints,omitempty"`
 }
 
-//+kubebuilder:object:root=true
-//+kubebuilder:subresource:status
-//+kubebuilder:storageversion
-
+// +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
 type KfpControllerConfig struct {
 	metav1.TypeMeta                        `json:",inline"`
 	metav1.ObjectMeta                      `json:"metadata,omitempty"`
 	Spec                                   KfpControllerConfigSpec `json:"spec,omitempty"`
 	cfg.ControllerManagerConfigurationSpec `json:"controller,omitempty"`
 }
 
-//+kubebuilder:object:root=true
-
+// +kubebuilder:object:root=true
 func init() {
 	SchemeBuilder.Register(&KfpControllerConfig{})
 }
diff --git a/apis/config/v1alpha2/groupversion_info.go → apis/config/v1alpha6/groupversion_info.go b/apis/config/v1alpha2/groupversion_info.go → apis/config/v1alpha6/groupversion_info.go
@@ -1,7 +1,7 @@
 // Package v2 contains API Schema definitions for the config v2 API group
 // +kubebuilder:object:generate=true
 // +groupName=config.kubeflow.org
-package v1alpha2
+package v1alpha6
 
 import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -10,7 +10,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "config.kubeflow.org", Version: "v1alpha2"}
+	GroupVersion = schema.GroupVersion{Group: "config.kubeflow.org", Version: "v1alpha6"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}