diff --git a/api/v1/codebasebranch_types.go b/api/v1/codebasebranch_types.go index 4ff40170..068fb38d 100644 --- a/api/v1/codebasebranch_types.go +++ b/api/v1/codebasebranch_types.go @@ -26,10 +26,6 @@ type CodebaseBranchSpec struct { // Flag if branch is used as "release" branch. Release bool `json:"release"` - // +nullable - // +optional - ReleaseJobParams map[string]string `json:"releaseJobParams,omitempty"` - // Pipelines is a map of pipelines related to the branch. // +nullable // +optional diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go index 81f05d28..64177428 100644 --- a/api/v1/zz_generated.deepcopy.go +++ b/api/v1/zz_generated.deepcopy.go @@ -197,13 +197,6 @@ func (in *CodebaseBranchSpec) DeepCopyInto(out *CodebaseBranchSpec) { *out = new(string) **out = **in } - if in.ReleaseJobParams != nil { - in, out := &in.ReleaseJobParams, &out.ReleaseJobParams - *out = make(map[string]string, len(*in)) - for key, val := range *in { - (*out)[key] = val - } - } if in.Pipelines != nil { in, out := &in.Pipelines, &out.Pipelines *out = make(map[string]string, len(*in)) diff --git a/config/crd/bases/v2.edp.epam.com_codebasebranches.yaml b/config/crd/bases/v2.edp.epam.com_codebasebranches.yaml index 416116bf..408921f3 100644 --- a/config/crd/bases/v2.edp.epam.com_codebasebranches.yaml +++ b/config/crd/bases/v2.edp.epam.com_codebasebranches.yaml @@ -80,11 +80,6 @@ spec: release: description: Flag if branch is used as "release" branch. type: boolean - releaseJobParams: - additionalProperties: - type: string - nullable: true - type: object version: nullable: true type: string diff --git a/controllers/codebasebranch/service/mock_codebasebranch.go b/controllers/codebasebranch/service/mock_codebasebranch.go index aa8fb292..13874ed5 100644 --- a/controllers/codebasebranch/service/mock_codebasebranch.go +++ b/controllers/codebasebranch/service/mock_codebasebranch.go @@ -12,20 +12,6 @@ type MockCodebasebranch struct { mock.Mock } -func (m *MockCodebasebranch) TriggerDeletionJob(cb *codebaseApi.CodebaseBranch) error { - return m.Called(cb).Error(0) -} - -func (m *MockCodebasebranch) TriggerReleaseJob(cb *codebaseApi.CodebaseBranch) error { - return m.Called(cb).Error(0) -} - -func (m *MockCodebasebranch) convertCodebaseBranchSpecToParams(cb *codebaseApi.CodebaseBranch) (map[string]string, error) { - var a map[string]string - - return a, m.Called(cb).Error(0) -} - func (m *MockCodebasebranch) AppendVersionToTheHistorySlice(cb *codebaseApi.CodebaseBranch) error { return m.Called(cb).Error(0) } diff --git a/deploy-templates/Chart.yaml b/deploy-templates/Chart.yaml index af1b07a8..a015b1eb 100644 --- a/deploy-templates/Chart.yaml +++ b/deploy-templates/Chart.yaml @@ -109,7 +109,6 @@ annotations: codebaseName: javascript-deploy-edp fromCommit: 'latest' release: false - releaseJobParams: null version: 1.2.3-SNAPSHOT - apiVersion: v2.edp.epam.com/v1 kind: CodebaseImageStream diff --git a/deploy-templates/_crd_examples/codebase_branch.yaml b/deploy-templates/_crd_examples/codebase_branch.yaml index ef157b1c..9f6da556 100644 --- a/deploy-templates/_crd_examples/codebase_branch.yaml +++ b/deploy-templates/_crd_examples/codebase_branch.yaml @@ -8,7 +8,3 @@ spec: codebaseName: bar-70 fromCommit: '' release: false - releaseJobParams: - codebaseName: RELEASE_NAME - fromCommit: COMMIT_ID - gitServer: GIT_SERVER diff --git a/deploy-templates/crds/v2.edp.epam.com_codebasebranches.yaml b/deploy-templates/crds/v2.edp.epam.com_codebasebranches.yaml index 416116bf..408921f3 100644 --- a/deploy-templates/crds/v2.edp.epam.com_codebasebranches.yaml +++ b/deploy-templates/crds/v2.edp.epam.com_codebasebranches.yaml @@ -80,11 +80,6 @@ spec: release: description: Flag if branch is used as "release" branch. type: boolean - releaseJobParams: - additionalProperties: - type: string - nullable: true - type: object version: nullable: true type: string diff --git a/docs/api.md b/docs/api.md index 1716a3ab..1f34d687 100644 --- a/docs/api.md +++ b/docs/api.md @@ -341,13 +341,6 @@ CodebaseBranchSpec defines the desired state of CodebaseBranch. Pipelines is a map of pipelines related to the branch.
false - - releaseJobParams - map[string]string - -
- - false version string