[release-3.4] re-use the code-repos in step-template (#961)

* add column for kubectl get gitcoderepo * update step-template git-clone and checkout --------- Co-authored-by: jackyu <[email protected]>
kubesphere · Jun 10, 2023 · 6983b14 · 6983b14
1 parent 0d6e69b
commit 6983b14
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 0 deletions.
diff --git a/config/crd/bases/devops.kubesphere.io_clustersteptemplates.yaml b/config/crd/bases/devops.kubesphere.io_clustersteptemplates.yaml
@@ -56,6 +56,9 @@ spec:
                       type: string
                     options:
                       type: string
+                    reactions:
+                      description: represents that the relationship of parameters
+                      type: string
                     required:
                       type: boolean
                     type:

diff --git a/config/crd/bases/devops.kubesphere.io_gitrepositories.yaml b/config/crd/bases/devops.kubesphere.io_gitrepositories.yaml
@@ -23,6 +23,9 @@ spec:
     - jsonPath: .spec.server
       name: Server
       type: string
+    - jsonPath: .spec.url
+      name: URL
+      type: string
     name: v1alpha3
     schema:
       openAPIV3Schema:

diff --git a/pkg/api/devops/v1alpha3/gitrepository.go b/pkg/api/devops/v1alpha3/gitrepository.go
@@ -34,6 +34,7 @@ const GitRepoFinalizerName = "finalizer.gitrepository.devops.kubesphere.io"
 // +k8s:openapi-gen=true
 // +kubebuilder:printcolumn:name="Provider",type="string",JSONPath=".spec.provider"
 // +kubebuilder:printcolumn:name="Server",type="string",JSONPath=".spec.server"
+// +kubebuilder:printcolumn:name="URL",type="string",JSONPath=".spec.url"
 type GitRepository struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

diff --git a/pkg/api/devops/v1alpha3/steptemplate_types.go b/pkg/api/devops/v1alpha3/steptemplate_types.go
@@ -47,6 +47,8 @@ type ParameterInStep struct {
 	Options      string        `json:"options,omitempty"`
 	// Condition is an expression about if this variable is necessary for users
 	Condition string `json:"condition,omitempty"`
+	// represents that the relationship of parameters
+	Reactions string `json:"reactions,omitempty"`
 }
 
 // ParameterType represents the type of parameter
@@ -69,6 +71,8 @@ const (
 	ParameterTypeSecret ParameterType = "secret"
 	// ParameterTypeHidden represents a parameter that is hidden
 	ParameterTypeHidden ParameterType = "hidden"
+	// ParameterTypeImportCodeRepo represents a parameter that is import values to other parameters from code repositories
+	ParameterTypeImportCodeRepo ParameterType = "importCodeRepo"
 )
 
 // StepTemplateStatus defines the observed state of ClusterStepTemplate