Remove GitHub-type projects from v1alpha2 spec

Signed-off-by: Angel Misevski <[email protected]>

Author: amisevsk

pkg/apis/workspaces/v1alpha1/conversion_test.go

@@ -148,25 +148,21 @@ var parentCommandFuzzFunc = func(command *Command, c fuzz.Continue) {
 var parentProjectFuzzFunc = func(project *Project, c fuzz.Continue) {
 	// Custom projects are not supported in v1alpha2 parent
 	project.Name = c.RandString()
-	switch c.Intn(3) {
+	switch c.Intn(2) {
 	case 0:
 		c.Fuzz(&project.Git)
 	case 1:
-		c.Fuzz(&project.Github)
-	case 2:
 		c.Fuzz(&project.Zip)
 	}
 }
 
 var projectFuzzFunc = func(project *Project, c fuzz.Continue) {
-	switch c.Intn(4) {
+	switch c.Intn(3) {
 	case 0:
 		c.Fuzz(&project.Git)
 	case 1:
-		c.Fuzz(&project.Github)
-	case 2:
 		c.Fuzz(&project.Zip)
-	case 3:
+	case 2:
 		c.Fuzz(&project.Custom)
 	}
 }

pkg/apis/workspaces/v1alpha1/projects_conversion.go

@@ -19,8 +19,6 @@ func convertProjectTo_v1alpha2(src *Project, dest *v1alpha2.Project) error {
 	switch {
 	case src.Git != nil:
 		sparseCheckoutDir = src.Git.SparseCheckoutDir
-	case src.Github != nil:
-		sparseCheckoutDir = src.Github.SparseCheckoutDir
 	case src.Zip != nil:
 		sparseCheckoutDir = src.Zip.SparseCheckoutDir
 	}
@@ -49,8 +47,6 @@ func convertProjectFrom_v1alpha2(src *v1alpha2.Project, dest *Project) error {
 		switch {
 		case src.Git != nil:
 			dest.Git.SparseCheckoutDir = sparseCheckoutDir
-		case src.Github != nil:
-			dest.Github.SparseCheckoutDir = sparseCheckoutDir
 		case src.Zip != nil:
 			dest.Zip.SparseCheckoutDir = sparseCheckoutDir
 		}
@@ -74,8 +70,6 @@ func convertStarterProjectTo_v1alpha2(src *StarterProject, dest *v1alpha2.Starte
 	switch {
 	case src.Git != nil:
 		dest.SubDir = src.Git.SparseCheckoutDir
-	case src.Github != nil:
-		dest.SubDir = src.Github.SparseCheckoutDir
 	case src.Zip != nil:
 		dest.SubDir = src.Zip.SparseCheckoutDir
 	}
@@ -97,8 +91,6 @@ func convertStarterProjectFrom_v1alpha2(src *v1alpha2.StarterProject, dest *Star
 		switch {
 		case src.Git != nil:
 			dest.Git.SparseCheckoutDir = src.SubDir
-		case src.Github != nil:
-			dest.Github.SparseCheckoutDir = src.SubDir
 		case src.Zip != nil:
 			dest.Zip.SparseCheckoutDir = src.SubDir
 		}

pkg/apis/workspaces/v1alpha2/projects.go

@@ -51,12 +51,11 @@ type StarterProject struct {
 // Only one of the following project sources may be specified.
 // If none of the following policies is specified, the default one
 // is AllowConcurrent.
-// +kubebuilder:validation:Enum=Git;Github;Zip;Custom
+// +kubebuilder:validation:Enum=Git;Zip;Custom
 type ProjectSourceType string
 
 const (
 	GitProjectSourceType    ProjectSourceType = "Git"
-	GitHubProjectSourceType ProjectSourceType = "Github"
 	ZipProjectSourceType    ProjectSourceType = "Zip"
 	CustomProjectSourceType ProjectSourceType = "Custom"
 )
@@ -73,10 +72,6 @@ type ProjectSource struct {
 	// +optional
 	Git *GitProjectSource `json:"git,omitempty"`
 
-	// Project's GitHub source. Deprecated, use `Git` instead
-	// +optional
-	Github *GithubProjectSource `json:"github,omitempty"`
-
 	// Project's Zip source
 	// +optional
 	Zip *ZipProjectSource `json:"zip,omitempty"`
@@ -129,7 +124,3 @@ type CheckoutFrom struct {
 type GitProjectSource struct {
 	GitLikeProjectSource `json:",inline"`
 }
-
-type GithubProjectSource struct {
-	GitLikeProjectSource `json:",inline"`
-}