Skip to content

Review and Clean-Up Release Parameters in kind codebasebranch #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SergK merged 1 commit into from
Aug 29, 2024
Merged

Review and Clean-Up Release Parameters in kind codebasebranch #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions api/v1/codebasebranch_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions api/v1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions config/crd/bases/v2.edp.epam.com_codebasebranches.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 0 additions & 14 deletions controllers/codebasebranch/service/mock_codebasebranch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
1 change: 0 additions & 1 deletion deploy-templates/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions deploy-templates/_crd_examples/codebase_branch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,3 @@ spec:
codebaseName: bar-70
fromCommit: ''
release: false
releaseJobParams:
codebaseName: RELEASE_NAME
fromCommit: COMMIT_ID
gitServer: GIT_SERVER
5 changes: 0 additions & 5 deletions deploy-templates/crds/v2.edp.epam.com_codebasebranches.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions docs/api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,13 +341,6 @@ CodebaseBranchSpec defines the desired state of CodebaseBranch.
Pipelines is a map of pipelines related to the branch.<br/>
</td>
<td>false</td>
</tr><tr>
<td><b>releaseJobParams</b></td>
<td>map[string]string</td>
<td>
<br/>
</td>
<td>false</td>
</tr><tr>
<td><b>version</b></td>
<td>string</td>
Expand Down