Skip to content

Commit 6ab8ad7

Browse files
nammnnammn
committed
Merge branch 'master' of github.com:mongodb/mongodb-kubernetes into remove-agent-matrix
2 parents 58a5ba7 + 79543a3 commit 6ab8ad7

File tree

177 files changed

+4312
-3760
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

177 files changed

+4312
-3760
lines changed

‎.dockerignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ tools.go
5454
deploy/
5555
config/manifests/
5656
public/
57-
!/public/tools/multicluster/go.mod
5857

5958
# Documentation files
6059
docs/

‎.evergreen-functions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@ functions:
664664
make test-race
665665
- command: gotest.parse_files
666666
params:
667-
files: [ "src/github.com/mongodb/mongodb-kubernetes/*.suite", "src/github.com/mongodb/mongodb-kubernetes/public/tools/multicluster/*.suite", "src/github.com/mongodb/mongodb-kubernetes/docker/mongodb-kubernetes-init-ops-manager/mmsconfiguration/*.suite" ]
667+
files: [ "src/github.com/mongodb/mongodb-kubernetes/*.suite", "src/github.com/mongodb/mongodb-kubernetes/docker/mongodb-kubernetes-init-ops-manager/mmsconfiguration/*.suite" ]
668668

669669
test_python_unit:
670670
- command: shell.exec

‎public/.evergreen.yml renamed to ‎.evergreen-kubectlplugin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ functions:
4545
- command: shell.exec
4646
type: setup
4747
params:
48-
working_dir: src/github.com/mongodb/mongodb-kubernetes/public/tools/multicluster
48+
working_dir: src/github.com/mongodb/mongodb-kubernetes
4949
include_expansions_in_env:
5050
- GRS_USERNAME
5151
- GRS_PASSWORD

‎.evergreen-periodic-builds.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,22 @@ tasks:
103103
vars:
104104
image_name: mongodb-agent-1-daily
105105

106+
- name: periodic_build_agent_2
107+
exec_timeout_secs: 43200
108+
commands:
109+
- func: enable_QEMU
110+
- func: pipeline
111+
vars:
112+
image_name: mongodb-agent-2-daily
113+
114+
- name: periodic_build_agent_3
115+
exec_timeout_secs: 43200
116+
commands:
117+
- func: enable_QEMU
118+
- func: pipeline
119+
vars:
120+
image_name: mongodb-agent-3-daily
121+
106122
#TODO should we still build the community operator?
107123
- name: periodic_build_community_operator
108124
commands:
@@ -142,6 +158,8 @@ task_groups:
142158
- periodic_build_sbom_cli
143159
- periodic_build_agent
144160
- periodic_build_agent_1
161+
- periodic_build_agent_2
162+
- periodic_build_agent_3
145163

146164
- name: periodic_teardown_task_group
147165
<<: *setup_group

‎.evergreen.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ variables:
1111

1212
- &ops_manager_70_latest 7.0.15 # The order/index is important, since these are anchors. Please do not change
1313

14-
- &ops_manager_80_latest 8.0.7 # The order/index is important, since these are anchors. Please do not change
14+
- &ops_manager_80_latest 8.0.11 # The order/index is important, since these are anchors. Please do not change
1515

1616
# The dependency unification between static and non-static is intentional here.
1717
# Even though some images are exclusive, in EVG they all are built once and in parallel.

‎.githooks/pre-commit

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ function generate_standalone_yaml() {
3333
mkdir -p "${charttmpdir}"
3434

3535
FILES=(
36-
"${charttmpdir}/mongodb-kubernetes/templates/operator-roles.yaml"
36+
"${charttmpdir}/mongodb-kubernetes/templates/operator-roles-base.yaml"
37+
"${charttmpdir}/mongodb-kubernetes/templates/operator-roles-clustermongodbroles.yaml"
38+
"${charttmpdir}/mongodb-kubernetes/templates/operator-roles-pvc-resize.yaml"
39+
"${charttmpdir}/mongodb-kubernetes/templates/operator-roles-telemetry.yaml"
40+
"${charttmpdir}/mongodb-kubernetes/templates/operator-roles-webhook.yaml"
3741
"${charttmpdir}/mongodb-kubernetes/templates/database-roles.yaml"
3842
"${charttmpdir}/mongodb-kubernetes/templates/operator-sa.yaml"
3943
"${charttmpdir}/mongodb-kubernetes/templates/operator.yaml"
@@ -45,22 +49,25 @@ function generate_standalone_yaml() {
4549
cat "helm_chart/crds/"* >public/crds.yaml
4650

4751
# generate openshift public example
48-
rm -rf "${charttmpdir:?}/*"
52+
rm -rf "${charttmpdir:?}"/*
4953
helm template --namespace mongodb -f helm_chart/values.yaml helm_chart --output-dir "${charttmpdir}" --values helm_chart/values-openshift.yaml ${HELM_OPTS[@]}
5054
cat "${FILES[@]}" >public/mongodb-kubernetes-openshift.yaml
5155

5256
# generate openshift files for kustomize used for generating OLM bundle
53-
rm -rf "${charttmpdir:?}/*"
57+
rm -rf "${charttmpdir:?}"/*
5458
helm template --namespace mongodb -f helm_chart/values.yaml helm_chart --output-dir "${charttmpdir}" --values helm_chart/values-openshift.yaml \
5559
--set operator.webhook.registerConfiguration=false --set operator.webhook.installClusterRole=false ${HELM_OPTS[@]}
5660

5761
# update kustomize files for OLM bundle with files generated for openshift
5862
cp "${charttmpdir}/mongodb-kubernetes/templates/operator.yaml" config/manager/manager.yaml
5963
cp "${charttmpdir}/mongodb-kubernetes/templates/database-roles.yaml" config/rbac/database-roles.yaml
60-
cp "${charttmpdir}/mongodb-kubernetes/templates/operator-roles.yaml" config/rbac/operator-roles.yaml
64+
cp "${charttmpdir}/mongodb-kubernetes/templates/operator-roles-base.yaml" config/rbac/operator-roles-base.yaml
65+
cp "${charttmpdir}/mongodb-kubernetes/templates/operator-roles-clustermongodbroles.yaml" config/rbac/operator-roles-clustermongodbroles.yaml
66+
cp "${charttmpdir}/mongodb-kubernetes/templates/operator-roles-pvc-resize.yaml" config/rbac/operator-roles-pvc-resize.yaml
67+
cp "${charttmpdir}/mongodb-kubernetes/templates/operator-roles-telemetry.yaml" config/rbac/operator-roles-telemetry.yaml
6168

6269
# generate multi-cluster public example
63-
rm -rf "${charttmpdir:?}/*"
70+
rm -rf "${charttmpdir:?}"/*
6471
helm template --namespace mongodb -f helm_chart/values.yaml helm_chart --output-dir "${charttmpdir}" --values helm_chart/values-multi-cluster.yaml ${HELM_OPTS[@]}
6572
cat "${FILES[@]}" >public/mongodb-kubernetes-multi-cluster.yaml
6673

‎.github/actions/setup-ubuntu-host/action.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: 'Setup Ubuntu Runner Host'
2+
inputs:
3+
python-version:
4+
description: 'Python version to use'
5+
required: true
6+
runs:
7+
using: "composite"
8+
steps:
9+
- name: setup python
10+
uses: actions/setup-python@v5
11+
with:
12+
python-version: ${{inputs.python-version}}
13+
cache: 'pip' # caching pip dependencies
14+
- name: Install dependencies
15+
shell: bash
16+
run: |
17+
sudo apt-get install libldap2-dev libsasl2-dev # Required for python-ldap
18+
pip install --upgrade pip
19+
pip install -r requirements.txt

‎.github/pull_request_template.md

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,9 @@
77
<!-- Enter your proof that it works here.-->
88

99
## Checklist
10+
1011
- [ ] Have you linked a jira ticket and/or is the ticket in the title?
1112
- [ ] Have you checked whether your jira ticket required DOCSP changes?
12-
- [ ] Have you checked for release_note changes?
13-
14-
## Reminder (Please remove this when merging)
15-
- Please try to Approve or Reject Changes the PR, keep PRs in review as short as possible
16-
- Our Short Guide for PRs: [Link](https://docs.google.com/document/d/1T93KUtdvONq43vfTfUt8l92uo4e4SEEvFbIEKOxGr44/edit?tab=t.0)
17-
- Remember the following Communication Standards - use comment prefixes for clarity:
18-
* **blocking**: Must be addressed before approval.
19-
* **follow-up**: Can be addressed in a later PR or ticket.
20-
* **q**: Clarifying question.
21-
* **nit**: Non-blocking suggestions.
22-
* **note**: Side-note, non-actionable. Example: Praise
23-
* --> no prefix is considered a question
13+
- [ ] Have you added changelog file?
14+
- use `skip-changelog` label if not needed
15+
- refer to [Changelog files and Release Notes](https://github.com/mongodb/mongodb-kubernetes/blob/master/CONTRIBUTING.md#changelog-files-and-release-notes) section in CONTRIBUTING.md for more details

‎.github/workflows/preview_release_notes.yml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: Preview Release Notes
2+
on:
3+
push:
4+
branches:
5+
- master
6+
- release-*
7+
pull_request:
8+
branches:
9+
- master
10+
- release-*
11+
12+
jobs:
13+
preview_release_notes:
14+
name: Preview Release Notes
15+
runs-on: ubuntu-latest
16+
permissions:
17+
contents: read
18+
pull-requests: write
19+
steps:
20+
- name: Check out repository
21+
uses: actions/checkout@v4
22+
with:
23+
fetch-depth: '0'
24+
- name: Setup host
25+
uses: ./.github/actions/setup-ubuntu-host
26+
with:
27+
python-version: '${{ vars.PYTHON_VERSION }}'
28+
- name: Generate Release Notes
29+
id: generate_release_notes
30+
run: python -m scripts.release.release_notes -s $INITIAL_COMMIT_SHA -v $INITIAL_VERSION -o release_notes_tmp.md
31+
env:
32+
INITIAL_COMMIT_SHA: ${{ vars.RELEASE_INITIAL_COMMIT_SHA }}
33+
INITIAL_VERSION: ${{ vars.RELEASE_INITIAL_VERSION }}
34+
- name: Add disclaimer to release notes preview
35+
run: |
36+
echo -e "_:warning: (this preview might not be accurate if the PR is not rebased on current master branch)_\n" > release_notes_preview.md
37+
cat release_notes_tmp.md >> release_notes_preview.md
38+
- name: Summarize results
39+
run: cat release_notes_preview.md >> $GITHUB_STEP_SUMMARY
40+
- name: Update PR comment
41+
# If the PR is from a fork, we cannot update the comment using read only permissions
42+
if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository
43+
run: gh issue comment $ISSUE --edit-last --create-if-none --body-file release_notes_preview.md
44+
env:
45+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
46+
ISSUE: ${{ github.event.pull_request.html_url }}

‎.github/workflows/require_changelog.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Validate Changelog Requirement
2+
on:
3+
pull_request:
4+
branches:
5+
- master
6+
- release-*
7+
types:
8+
- opened
9+
- synchronize
10+
- reopened
11+
- labeled
12+
- unlabeled
13+
14+
jobs:
15+
validate-changelog:
16+
name: Check for valid changelog entry
17+
runs-on: ubuntu-latest
18+
permissions:
19+
contents: read
20+
steps:
21+
- name: Check out repository
22+
uses: actions/checkout@v4
23+
with:
24+
fetch-depth: '0'
25+
- name: Setup host
26+
uses: ./.github/actions/setup-ubuntu-host
27+
with:
28+
python-version: '${{ vars.PYTHON_VERSION }}'
29+
- name: Check if changelog entry file was added in this PR
30+
run: |
31+
set -o pipefail
32+
python -m scripts.release.check_changelog -b $BASE_SHA -f $FAIL_ON_NO_CHANGES | tee >> $GITHUB_STEP_SUMMARY
33+
env:
34+
BASE_SHA: ${{ github.event.pull_request.base.sha }}
35+
FAIL_ON_NO_CHANGES: ${{ !contains(github.event.pull_request.labels.*.name, 'skip-changelog') }}

0 commit comments

Comments
 (0)