Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 5 additions & 4 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@
040-control-plane-manager/ @sprait
040-control-plane-manager/images/kubernetes-api-proxy/** @090809
040-node-manager/ @name212 @090809
040-node-manager/templates/fencing-agent/** @yalosev
040-node-manager/images/fencing-agent/** @yalosev
040-node-manager/templates/cluster-autoscaler/** @yalosev
040-node-manager/images/cluster-autoscaler/** @yalosev
/modules/040-node-manager/templates/fencing-agent/ @yalosev
/modules/040-node-manager/images/fencing-agent/ @yalosev
/modules/040-node-manager/templates/cluster-autoscaler/ @yalosev
/modules/040-node-manager/images/cluster-autoscaler/ @yalosev
/modules/040-node-manager/hooks/fencing** @yalosev
040-terraform-manager/ @name212 @090809 @aleksey-su
042-kube-dns/ @AndreyPavlovFlant @apolovov
050-network-policy-engine/ @AndreyPavlovFlant @apolovov
Expand Down
43 changes: 2 additions & 41 deletions .github/ci_templates/helper_jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,8 @@ pull_request_info:
security_rootless_scan: ${{ steps.pr_props.outputs.security_rootless_scan }}
changes_docs: ${{ steps.changes.outputs.docs }}
changes_not_markdown: ${{ steps.changes.outputs.not_markdown }}
build_ce: ${{ steps.pr_props.outputs.build_ce }}
build_be: ${{ steps.pr_props.outputs.build_be }}
build_se: ${{ steps.pr_props.outputs.build_se }}
build_se-plus: ${{ steps.pr_props.outputs.build_se-plus }}
build_ee: ${{ steps.pr_props.outputs.build_ee }}
{!{ range $werfEnv := slice "CE" "EE" "BE" "SE" "SE-plus" "CSE" }!}
build_{!{$werfEnv}!}: ${{ steps.pr_props.outputs.build_{!{$werfEnv}!} }}{!{ end }!}

# Skip pull_request and pull_request_target triggers for PRs authored by deckhouse-BOaTswain, e.g. changelog PRs, don't skip if Pull Request title contains "[run ci]".
if: ${{ ! (startsWith(github.event_name, 'pull_request') && github.event.pull_request.user.login == 'deckhouse-BOaTswain' && !contains(github.event.pull_request.title, '[run ci]')) }}
Expand Down Expand Up @@ -366,42 +363,6 @@ pull_request_info:
with:
ref: ${{ steps.pr_props.outputs.ref }}

# Get info about other changes.
- name: Get info about PR changes
uses: {!{ index (ds "actions") "dorny/paths-filter" }!}
id: changes
with:
token: ${{ secrets.BOATSWAIN_GITHUB_TOKEN }}
# dangerous - detect if changes not allowed to test for external PRs
# docs - detect changes in files that belong to the documentation scope
# not_markdown - detect changes not in markdown files
filters: |
dangerous:
- './.github/**'
- './tools/**'
- './testing/**'
- './docs/**/js/**'
- './docs/**/css/**'
- './docs/**/images/**'
- './docs/**/assets/**'
docs:
- './**/*.md'
- './docs/**'
- './**/crds/*'
- './**/openapi/*config-values.yaml'
- './candi/**/openapi/*'
- './ee/candi/**/openapi/*'
not_markdown:
- '!./**/*.md'

# Stop workflow if external PR contains dangerous changes.
- name: Fail workflow on dangerous changes
if: ${{ steps.pr_props.outputs.should_check == 'true' && steps.changes.outputs.dangerous == 'true' }}
uses: {!{ index (ds "actions") "actions/github-script" }!}
with:
script: |
core.setFailed('External PR contains dangerous changes.')

# </template: pull_request_info>
{!{- end -}!}

Expand Down
4 changes: 3 additions & 1 deletion .github/scripts/js/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ const labels = {
'e2e/use/edition/se': { type: 'e2e-use', edition: 'SE' },
'e2e/use/edition/se+': { type: 'e2e-use', edition: 'SE-plus' },
'e2e/use/edition/fe': { type: 'e2e-use', edition: 'FE' },
'e2e/use/edition/cse': { type: 'e2e-use', edition: 'CSE' },

// E2E: autoscaler
'e2e/use/autoscaler': { type: 'e2e-use', autoscaler: true },
Expand Down Expand Up @@ -85,6 +86,7 @@ const labels = {
'edition/be': { type: 'edition', edition: 'BE' },
'edition/se': { type: 'edition', edition: 'SE' },
'edition/se+': { type: 'edition', edition: 'SE-plus' },
'edition/cse': { type: 'edition', edition: 'CSE' },

// Enable operator-trivy to get CIS benchmark report
'e2e/use/cis': { type: 'e2e-use', cis: true },
Expand Down Expand Up @@ -170,5 +172,5 @@ module.exports.e2eDefaults = {
cis: false
};

const editions = ['CE', 'EE', 'FE', 'BE', 'SE', 'SE-plus'];
const editions = ['CE', 'EE', 'FE', 'BE', 'SE', 'SE-plus', 'CSE'];
module.exports.knownEditions = editions;
2 changes: 1 addition & 1 deletion .github/scripts/python/post-deploy-preparation.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def collect_released_versions():

github = GhApi(owner='deckhouse', repo='deckhouse', token=GITHUB_TOKEN)

editions_reference = [ 'BE', 'CE', 'EE', 'FE', 'SE', 'SE-plus' ]
editions_reference = [ 'BE', 'CE', 'EE', 'FE', 'SE', 'SE-plus', 'CSE' ]
channels = {
'alpha': None,
'beta': None,
Expand Down
6 changes: 3 additions & 3 deletions .github/workflow_templates/antivirus-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
}
END { print "v" $1 "." prev_minor "." max_patch }' | tail -3)
TAGS=""
for edition in fe ee se se-plus be ce
for edition in fe ee se se-plus be ce cse
do
for tag in $TAGS_TO_SCAN
do
Expand All @@ -91,7 +91,7 @@ jobs:
ref=${{ github.event.inputs.branch }}
TAGS=""
if [[ "${ref}" =~ {!{ tmpl.Exec "semver_regexp" . }!} ]]; then
for edition in fe ee se se-plus be ce
for edition in fe ee se se-plus be ce cse
do
TAGS+=$'\n'"$edition:$ref"
done
Expand Down Expand Up @@ -257,4 +257,4 @@ jobs:

curl -f -L -X POST "${{ steps.secrets.outputs.N8N_LOOP_NOTIFIER_URL }}" \
-H "Content-Type: application/json" \
--data "{\"type\": \"ci_fail\",\"message\":\"$MESSAGE\"}"
--data "{\"type\": \"ci_fail\",\"message\":\"$MESSAGE\"}"
63 changes: 9 additions & 54 deletions .github/workflow_templates/build-and-test_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,60 +52,18 @@ jobs:
SVACE_ENABLED: ${{ contains(github.event.pull_request.labels.*.name, 'analyze/svace') && true || false }}
{!{ tmpl.Exec "build_template" (slice $ctx "dev") | strings.Indent 4 }!}

build_ee:
name: Build EE
if: ${{ needs.pull_request_info.outputs.build_ee == 'true' }}
{!{ range $werfEnv := slice "CE" "EE" "BE" "SE" "SE-plus" "CSE" }!}
build_{!{$werfEnv}!}:
name: Build {!{$werfEnv}!}
if: ${{ needs.pull_request_info.outputs.build_{!{$werfEnv}!} == 'true' }}
needs:
- git_info
- pull_request_info
- build_fe
env:
WERF_ENV: "EE"
{!{ tmpl.Exec "build_template" (slice $ctx "dev") | strings.Indent 4 }!}

build_se:
name: Build SE
if: ${{ needs.pull_request_info.outputs.build_se == 'true' }}
needs:
- git_info
- pull_request_info
- build_fe
env:
WERF_ENV: "SE"
{!{ tmpl.Exec "build_template" (slice $ctx "dev") | strings.Indent 4 }!}

build_se_plus:
name: Build SE-plus
if: ${{ needs.pull_request_info.outputs.build_se-plus == 'true' }}
needs:
- git_info
- pull_request_info
- build_fe
env:
WERF_ENV: "SE-plus"
{!{ tmpl.Exec "build_template" (slice $ctx "dev") | strings.Indent 4 }!}

build_be:
name: Build BE
if: ${{ needs.pull_request_info.outputs.build_be == 'true' }}
needs:
- git_info
- pull_request_info
- build_fe
env:
WERF_ENV: "BE"
{!{ tmpl.Exec "build_template" (slice $ctx "dev") | strings.Indent 4 }!}

build_ce:
name: Build CE
if: ${{ needs.pull_request_info.outputs.build_ce == 'true' }}
needs:
- git_info
- pull_request_info
- build_fe
env:
WERF_ENV: "CE"
{!{ tmpl.Exec "build_template" (slice $ctx "dev") | strings.Indent 4 }!}
WERF_ENV: "{!{$werfEnv}!}"
{!{ tmpl.Exec "build_template" (slice $ctx "dev") | strings.Indent 4 }!}
{!{ end }!}

analyze_deckhouse:
if: ${{ contains(github.event.pull_request.labels.*.name, 'analyze/svace') }}
Expand Down Expand Up @@ -239,11 +197,8 @@ jobs:
- git_info
- pull_request_info
- build_fe
- build_ee
- build_se
- build_se_plus
- build_be
- build_ce
{!{ range $werfEnv := slice "CE" "EE" "BE" "SE" "SE-plus" "CSE" }!}
- build_{!{$werfEnv}!}{!{ end }!}
- validators
- openapi_test_cases
- golangci_lint
Expand Down
61 changes: 8 additions & 53 deletions .github/workflow_templates/build-and-test_pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,60 +49,18 @@ jobs:
{!{ tmpl.Exec "build_template" (slice $ctx "pre-release") | strings.Indent 4 }!}
{!{ tmpl.Exec "send_fail_report" . | strings.Indent 6 }!}

build_ee:
name: Build EE
{!{ range $werfEnv := slice "CE" "EE" "BE" "SE" "SE-plus" "CSE" }!}
build_{!{$werfEnv}!}:
name: Build {!{$werfEnv}!}
if: ${{ startsWith(github.ref, 'refs/heads/release') }}
needs:
- git_info
- build_fe
env:
WERF_ENV: "EE"
WERF_ENV: "{!{$werfEnv}!}"
{!{ tmpl.Exec "build_template" (slice $ctx "pre-release") | strings.Indent 4 }!}
{!{ tmpl.Exec "send_fail_report" . | strings.Indent 6 }!}

build_se:
name: Build SE
if: ${{ startsWith(github.ref, 'refs/heads/release') }}
needs:
- git_info
- build_fe
env:
WERF_ENV: "SE"
{!{ tmpl.Exec "build_template" (slice $ctx "pre-release") | strings.Indent 4 }!}
{!{ tmpl.Exec "send_fail_report" . | strings.Indent 6 }!}

build_se_plus:
name: Build SE-plus
if: ${{ startsWith(github.ref, 'refs/heads/release') }}
needs:
- git_info
- build_fe
env:
WERF_ENV: "SE-plus"
{!{ tmpl.Exec "build_template" (slice $ctx "pre-release") | strings.Indent 4 }!}
{!{ tmpl.Exec "send_fail_report" . | strings.Indent 6 }!}

build_be:
name: Build BE
if: ${{ startsWith(github.ref, 'refs/heads/release') }}
needs:
- git_info
- build_fe
env:
WERF_ENV: "BE"
{!{ tmpl.Exec "build_template" (slice $ctx "pre-release") | strings.Indent 4 }!}
{!{ tmpl.Exec "send_fail_report" . | strings.Indent 6 }!}

build_ce:
name: Build CE
if: ${{ startsWith(github.ref, 'refs/heads/release') }}
needs:
- git_info
- build_fe
env:
WERF_ENV: "CE"
{!{ tmpl.Exec "build_template" (slice $ctx "pre-release") | strings.Indent 4 }!}
{!{ tmpl.Exec "send_fail_report" . | strings.Indent 6 }!}
{!{ tmpl.Exec "send_fail_report" . | strings.Indent 6 }!}
{!{ end }!}

doc_web_build:
name: Doc web build
Expand Down Expand Up @@ -287,11 +245,8 @@ jobs:
name: Compare internal modules
needs:
- build_fe
- build_ee
- build_ce
- build_be
- build_se
- build_se_plus
{!{ range $werfEnv := slice "CE" "EE" "BE" "SE" "SE-plus" "CSE" }!}
- build_{!{$werfEnv}!}{!{ end }!}
if: ${{ always() && needs.build_fe.result == 'success' }}
runs-on: regular
steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/antivirus-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
}
END { print "v" $1 "." prev_minor "." max_patch }' | tail -3)
TAGS=""
for edition in fe ee se se-plus be ce
for edition in fe ee se se-plus be ce cse
do
for tag in $TAGS_TO_SCAN
do
Expand All @@ -95,7 +95,7 @@ jobs:
ref=${{ github.event.inputs.branch }}
TAGS=""
if [[ "${ref}" =~ ^v?[0-9]+.[0-9]+.[0-9]+$ ]]; then
for edition in fe ee se se-plus be ce
for edition in fe ee se se-plus be ce cse
do
TAGS+=$'\n'"$edition:$ref"
done
Expand Down Expand Up @@ -366,4 +366,4 @@ jobs:

curl -f -L -X POST "${{ steps.secrets.outputs.N8N_LOOP_NOTIFIER_URL }}" \
-H "Content-Type: application/json" \
--data "{\"type\": \"ci_fail\",\"message\":\"$MESSAGE\"}"
--data "{\"type\": \"ci_fail\",\"message\":\"$MESSAGE\"}"
Loading
Loading