Fix #84: remove GitConfig from API spec (#141)

* Fix #84: enum validation on gitConfigSpec.type * Formatting * Remove GitConfig from spec and build Signed-off-by: Toby Hodges <[email protected]>
cnoe-io · Feb 9, 2024 · bf9be66 · bf9be66
1 parent bc35d46
commit bf9be66
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 35 deletions.
diff --git a/api/v1alpha1/localbuild_types.go b/api/v1alpha1/localbuild_types.go
@@ -28,14 +28,7 @@ type EmbeddedArgoApplicationsPackageConfigSpec struct {
 	Enabled bool `json:"enabled,omitempty"`
 }
 
-// GitConfigSpec controls what git server to use for the idpbuilder
-// It can take on the values of either gitea or gitserver
-type GitConfigSpec struct {
-	Type string `json:"type,omitempty"`
-}
-
 type PackageConfigsSpec struct {
-	GitConfig                GitConfigSpec                             `json:"gitConfig,omitempty"`
 	Argo                     ArgoPackageConfigSpec                     `json:"argoPackageConfigs,omitempty"`
 	EmbeddedArgoApplications EmbeddedArgoApplicationsPackageConfigSpec `json:"embeddedArgoApplicationsPackageConfigs,omitempty"`
 	CustomPackageDirs        []string                                  `json:"customPackageDirs,omitempty"`

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/build/build.go b/pkg/build/build.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"github.com/cnoe-io/idpbuilder/api/v1alpha1"
-	"github.com/cnoe-io/idpbuilder/globals"
 	"github.com/cnoe-io/idpbuilder/pkg/controllers"
 	"github.com/cnoe-io/idpbuilder/pkg/kind"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -164,9 +163,6 @@ func (b *Build) Run(ctx context.Context, recreateCluster bool) error {
 				EmbeddedArgoApplications: v1alpha1.EmbeddedArgoApplicationsPackageConfigSpec{
 					Enabled: true,
 				},
-				GitConfig: v1alpha1.GitConfigSpec{
-					Type: globals.GiteaResourceName(),
-				},
 				CustomPackageDirs: b.customPackageDirs,
 			},
 		}

diff --git a/pkg/controllers/resources/idpbuilder.cnoe.io_localbuilds.yaml b/pkg/controllers/resources/idpbuilder.cnoe.io_localbuilds.yaml
@@ -56,14 +56,6 @@ spec:
                           argo applications and the associated GitServer
                         type: boolean
                     type: object
-                  gitConfig:
-                    description: GitConfigSpec controls what git server to use for
-                      the idpbuilder It can take on the values of either gitea or
-                      gitserver
-                    properties:
-                      type:
-                        type: string
-                    type: object
                 type: object
             type: object
           status: