Merge pull request #82 from rawlingsj/master

refactor: remove velero, make storage extensible, change TLS and Ingress for Environments optional. Remove more old v2 flags too
jenkins-x · Nov 26, 2020 · 948f1a2 · 948f1a2
2 parents 083e403 + 0e7a9e8
commit 948f1a2
Show file tree

Hide file tree

Showing 105 changed files with 666 additions and 7,317 deletions.
diff --git a/hack/linter.sh b/hack/linter.sh
@@ -20,4 +20,4 @@ golangci-lint run \
   --verbose \
   --build-tags build \
   --skip-dirs pkg/client \
-  --skip-files pkg/apis/jenkins.io/v4beta1/zz_generated.deepcopy.go
+  --skip-files pkg/apis/core/v4beta1/zz_generated.deepcopy.go
diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh
@@ -36,11 +36,11 @@ rm -rf "${SCRIPT_ROOT}"/pkg/client
 #                  instead of the $GOPATH directly. For normal projects this can be dropped.
 bash hack/generate-groups.sh all \
   github.com/jenkins-x/jx-api/v4/pkg/client github.com/jenkins-x/jx-api/v4/pkg/apis \
-  jenkins.io:v4beta1 \
+  core:v4beta1 \
   --output-base "$(dirname "${BASH_SOURCE[0]}")/../../../.." \
   --go-header-file "${SCRIPT_ROOT}"/hack/custom-boilerplate.go.txt
 
 cp -R "${SCRIPT_ROOT}"/v4/pkg/client/ "${SCRIPT_ROOT}"/pkg/client
-cp -R "${SCRIPT_ROOT}"/v4/pkg/apis/jenkins.io/v4beta1/zz_generated.deepcopy.go "${SCRIPT_ROOT}"/pkg/apis/jenkins.io/v4beta1/zz_generated.deepcopy.go
+cp -R "${SCRIPT_ROOT}"/v4/pkg/apis/core/v4beta1/zz_generated.deepcopy.go "${SCRIPT_ROOT}"/pkg/apis/core/v4beta1/zz_generated.deepcopy.go
 
 rm -rf "${SCRIPT_ROOT}"/v4
diff --git a/pkg/apis/jenkins.io/register.go → pkg/apis/core/register.go b/pkg/apis/jenkins.io/register.go → pkg/apis/core/register.go
@@ -1,14 +1,14 @@
-package jenkinsio
+package core
 
 const (
 	// GroupName is the Jenkins API group name
-	GroupName = "jenkins.io"
+	GroupName = "core.jenkins-x.io"
 	// Version is the Jenkins API group version
-	Version = "v1"
+	Version = "v4"
 
 	// GroupAndVersion is the Jenkins API Group and version
 	GroupAndVersion = GroupName + "/" + Version
 
 	// Package is the Go package in which the apis live
-	Package = "github.com/jenkins-x/jx-api/v3/pkg/apis"
+	Package = "github.com/jenkins-x/jx-api/v4/pkg/apis"
 )
diff --git a/pkg/apis/core/v4beta1/doc.go b/pkg/apis/core/v4beta1/doc.go
@@ -0,0 +1,5 @@
+// +k8s:deepcopy-gen=package
+// +k8s:openapi-gen=true
+// Package v4 is the v4 version of the API.
+// +groupName=core.jenkins-x.io
+package v4beta1
diff --git a/pkg/apis/jenkins.io/v4beta1/register.go → pkg/apis/core/v4beta1/register.go b/pkg/apis/jenkins.io/v4beta1/register.go → pkg/apis/core/v4beta1/register.go
@@ -39,20 +39,8 @@ func init() {
 // Adds the list of known types to Scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
-		&BuildPack{},
-		&BuildPackList{},
-		&App{},
-		&AppList{},
-		&CommitStatus{},
-		&CommitStatusList{},
 		&Environment{},
 		&EnvironmentList{},
-		&EnvironmentRoleBinding{},
-		&EnvironmentRoleBindingList{},
-		&Extension{},
-		&ExtensionList{},
-		&GitService{},
-		&GitServiceList{},
 		&PluginList{},
 		&Plugin{},
 		&PipelineActivity{},
@@ -61,13 +49,8 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&ReleaseList{},
 		&SourceRepository{},
 		&SourceRepositoryList{},
-		&SourceRepositoryGroup{},
-		&SourceRepositoryGroupList{},
-		&Team{},
-		&TeamList{},
-		&User{},
-		&UserList{},
 	)
+
 	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
 	return nil
 }