Skip to content

Commit c3113c3

Browse files
committed
Apply pre-commit formatting fixes
Auto-generated changes from running pre-commit hooks: - Fix trailing whitespace - Fix end-of-file newlines - Regenerate manifests and release files - Update licenses
1 parent 6e6fe4a commit c3113c3

File tree

253 files changed

+855
-2024
lines changed

Some content is hidden

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

253 files changed

+855
-2024
lines changed

.evergreen-functions.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,6 @@ functions:
496496
IMAGE_NAME: ${image_name}
497497
BUILD_SCENARIO_OVERRIDE: ${build_scenario}
498498
FLAGS: ${flags}
499-
AGENT_VERSION_OVERRIDE: ${agent_version}
500499

501500
teardown_cloud_qa_all:
502501
- command: shell.exec
@@ -779,20 +778,6 @@ functions:
779778
GH_TOKEN: ${GH_TOKEN}
780779
binary: scripts/dev/run_python.sh scripts/release/create_chart_release_pr.py --chart_version ${OPERATOR_VERSION|*triggered_by_git_tag}
781780

782-
add_releaseinfo_to_github_assets:
783-
- command: github.generate_token
784-
params:
785-
expansion_name: GH_TOKEN
786-
- command: subprocess.exec
787-
type: setup
788-
params:
789-
working_dir: src/github.com/mongodb/mongodb-kubernetes
790-
include_expansions_in_env:
791-
- OPERATOR_VERSION
792-
env:
793-
GH_TOKEN: ${GH_TOKEN}
794-
binary: scripts/dev/run_python.sh scripts/release/release_info.py --version ${OPERATOR_VERSION|*triggered_by_git_tag}
795-
796781
release_kubectl_mongodb_plugin:
797782
- command: github.generate_token
798783
params:

.evergreen-mco.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,4 +144,3 @@ tasks:
144144
- commands:
145145
- func: e2e_test
146146
name: statefulset_arbitrary_config_update
147-

.evergreen-release.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,6 @@ tasks:
115115
- func: install_macos_notarization_service
116116
- func: release_kubectl_mongodb_plugin
117117

118-
- name: add_releaseinfo_to_github_assets
119-
commands:
120-
- func: clone
121-
- func: python_venv
122-
- func: add_releaseinfo_to_github_assets
123-
124118
- name: create_chart_release_pr
125119
tags: [ "helm_chart_release_pr" ]
126120
commands:
@@ -157,18 +151,6 @@ buildvariants:
157151
- name: release_readiness_probe
158152
- name: release_version_upgrade_hook
159153

160-
- name: add_releaseinfo_to_github_assets
161-
display_name: add_releaseinfo_to_github_assets
162-
tags: ["release"]
163-
run_on:
164-
- ubuntu2404-small
165-
allowed_requesters: ["patch", "github_tag"]
166-
depends_on:
167-
- name: "*"
168-
variant: release_images
169-
tasks:
170-
- name: add_releaseinfo_to_github_assets
171-
172154
- name: preflight_release_images
173155
display_name: preflight_release_images
174156
tags: [ "release" ]

.evergreen-tasks.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1271,8 +1271,7 @@ tasks:
12711271
commands:
12721272
- func: e2e_test
12731273

1274-
1275-
- name : e2e_multi_cluster_sharded_snippets
1274+
- name: e2e_multi_cluster_sharded_snippets
12761275
tags: [ "patch-run" ]
12771276
commands:
12781277
- func: e2e_test

.evergreen.yml

Lines changed: 77 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ include:
1313
variables:
1414
- &ops_manager_60_latest 6.0.27 # The order/index is important, since these are anchors. Please do not change
1515

16-
- &ops_manager_70_latest 7.0.20 # The order/index is important, since these are anchors. Please do not change
16+
- &ops_manager_70_latest 7.0.19 # The order/index is important, since these are anchors. Please do not change
1717

1818
- &ops_manager_80_latest 8.0.17 # The order/index is important, since these are anchors. Please do not change
1919

@@ -287,21 +287,19 @@ tasks:
287287
commands:
288288
- func: lint_repo
289289

290-
# Runs on every merge - detects release.json changes and releases appropriate images
291-
- name: release_om_and_agents
292-
allowed_requesters: [ "patch" , "commit"]
290+
# pct only triggers this variant once a new agent image is out
291+
- name: release_agent
292+
# this enables us to run this variant either manually (patch) which pct does or during an OM bump (github_pr)
293+
allowed_requesters: [ "patch", "github_pr" ]
293294
commands:
294295
- func: clone
295-
- func: python_venv
296296
- func: setup_building_host
297297
- func: quay_login
298298
- func: setup_docker_sbom
299-
- command: subprocess.exec
300-
params:
301-
working_dir: src/github.com/mongodb/mongodb-kubernetes
302-
binary: scripts/dev/run_python.sh
303-
args:
304-
- scripts/release/release_om_and_agents.py
299+
- func: pipeline
300+
vars:
301+
image_name: agent
302+
build_scenario: release
305303

306304
- name: migrate_all_agents
307305
# this enables us to run this variant manually to build all the agents for the new agent registry
@@ -345,9 +343,8 @@ tasks:
345343
- func: quay_login
346344
- func: pipeline
347345
vars:
348-
agent_version: all
349346
image_name: agent
350-
flags: "--parallel --skip-if-exists=false"
347+
flags: "--parallel --all-agents --skip-if-exists=false"
351348

352349
- name: rebuild_currently_used_agents
353350
# this enables us to run this manually (patch) and rebuild current agent versions to verify
@@ -359,9 +356,8 @@ tasks:
359356
- func: quay_login
360357
- func: pipeline
361358
vars:
362-
agent_version: current
363359
image_name: agent
364-
flags: "--parallel --skip-if-exists=false"
360+
flags: "--parallel --current-agents --skip-if-exists=false"
365361

366362
- name: build_kubectl_mongodb_plugin
367363
commands:
@@ -467,8 +463,7 @@ tasks:
467463
- func: pipeline
468464
vars:
469465
image_name: agent
470-
agent_version: all
471-
flags: "--parallel"
466+
flags: "--parallel --all-agents"
472467

473468
- name: build_init_database_image_ubi
474469
commands:
@@ -1898,6 +1893,26 @@ buildvariants:
18981893
tasks:
18991894
- name: build_om_images
19001895

1896+
# It will be called by pct while bumping the agent cloud manager image
1897+
- name: release_agent
1898+
display_name: release_agent
1899+
tags: [ "manual_patch", "release_agent" ]
1900+
run_on:
1901+
- release-ubuntu2404-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
1902+
depends_on:
1903+
- variant: init_test_run
1904+
name: build_agent_images_ubi # this ensures the agent gets released to ECR as well
1905+
- variant: e2e_multi_cluster_kind
1906+
name: '*'
1907+
- variant: e2e_static_multi_cluster_2_clusters
1908+
name: '*'
1909+
- variant: e2e_mdb_kind_ubi_cloudqa
1910+
name: '*'
1911+
- variant: e2e_static_mdb_kind_ubi_cloudqa
1912+
name: '*'
1913+
tasks:
1914+
- name: release_agent
1915+
19011916
# Only called manually, It's used for testing the task release_agents in case the release.json
19021917
# has not changed, and you still want to push the images to registry.
19031918
- name: manual_release_all_agents
@@ -1931,6 +1946,51 @@ buildvariants:
19311946
- name: backup_csv_images_limit_3
19321947
- name: backup_csv_images_all
19331948

1949+
- name: publish_om60_images
1950+
display_name: publish_om60_images
1951+
tags: [ "manual_patch" ]
1952+
allowed_requesters: [ "patch", "github_pr" ]
1953+
run_on:
1954+
- release-ubuntu2404-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
1955+
depends_on:
1956+
- variant: e2e_om60_kind_ubi
1957+
name: '*'
1958+
- variant: e2e_static_om60_kind_ubi
1959+
name: '*'
1960+
tasks:
1961+
- name: publish_ops_manager
1962+
- name: release_agent
1963+
1964+
- name: publish_om70_images
1965+
display_name: publish_om70_images
1966+
tags: [ "manual_patch" ]
1967+
allowed_requesters: [ "patch", "github_pr" ]
1968+
run_on:
1969+
- release-ubuntu2404-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
1970+
depends_on:
1971+
- variant: e2e_om70_kind_ubi
1972+
name: '*'
1973+
- variant: e2e_static_om70_kind_ubi
1974+
name: '*'
1975+
tasks:
1976+
- name: publish_ops_manager
1977+
- name: release_agent
1978+
1979+
- name: publish_om80_images
1980+
display_name: publish_om80_images
1981+
tags: [ "manual_patch" ]
1982+
allowed_requesters: [ "patch", "github_pr" ]
1983+
run_on:
1984+
- release-ubuntu2404-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
1985+
depends_on:
1986+
- variant: e2e_om80_kind_ubi
1987+
name: '*'
1988+
- variant: e2e_static_om80_kind_ubi
1989+
name: '*'
1990+
tasks:
1991+
- name: publish_ops_manager
1992+
- name: release_agent
1993+
19341994
- name: migrate_all_agents
19351995
display_name: migrate_all_agents
19361996
tags: [ "manual_patch" ]
@@ -1939,13 +1999,3 @@ buildvariants:
19391999
- ubuntu2404-large
19402000
tasks:
19412001
- name: migrate_all_agents
1942-
1943-
# Runs on every merge to master and releases images auxiliary to the operator release like OM and the Agent
1944-
- name: release_om_and_agents
1945-
display_name: release_om_and_agents
1946-
allowed_requesters: [ "patch" , "commit"]
1947-
run_on:
1948-
- release-ubuntu2404-small
1949-
patchable: false # Only run on commit builds
1950-
tasks:
1951-
- name: release_om_and_agents

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ Add any other context about the problem here.
3636

3737
If possible, please include:
3838
- The operator logs
39-
- Below we assume that your replicaset database pods are named `mongo-<>`. For instance:
40-
```
39+
- Below we assume that your replicaset database pods are named `mongo-<>`. For instance:
40+
```
4141
❯ k get pods
4242
NAME READY STATUS RESTARTS AGE
4343
mongo-0 2/2 Running 0 19h
4444
mongo-1 2/2 Running 0 19h
45-
45+
4646
❯ k get mdbc
4747
NAME PHASE VERSION
4848
mongo Running 4.4.0

LICENSE-MCK

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,3 @@ For more details or to acquire a commercial license, visit https://www.mongodb.c
2626
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
2727
See the License for the specific language governing permissions and
2828
limitations under the License.
29-

api/v1/mdb/mongodb_types.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1201,20 +1201,6 @@ func (m *MongoDB) GetLastSpec() (*MongoDbSpec, error) {
12011201
return &lastSpec, nil
12021202
}
12031203

1204-
func (m *MongoDB) GetLastConfiguredRoles() ([]string, error) {
1205-
lastRolesStr := annotations.GetAnnotation(m, util.LastConfiguredRoles)
1206-
if lastRolesStr == "" {
1207-
return nil, nil
1208-
}
1209-
1210-
lastRoles := []string{}
1211-
if err := json.Unmarshal([]byte(lastRolesStr), &lastRoles); err != nil {
1212-
return nil, err
1213-
}
1214-
1215-
return lastRoles, nil
1216-
}
1217-
12181204
func (m *MongoDB) ServiceName() string {
12191205
if m.Spec.StatefulSetConfiguration != nil {
12201206
svc := m.Spec.StatefulSetConfiguration.SpecWrapper.Spec.ServiceName

api/v1/mdbmulti/mongodbmultibuilder.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,6 @@ func (m *MultiReplicaSetBuilder) SetSecurity(s *mdbv1.Security) *MultiReplicaSet
7373
return m
7474
}
7575

76-
func (m *MultiReplicaSetBuilder) SetRoles(roles []mdbv1.MongoDBRole) *MultiReplicaSetBuilder {
77-
if m.Spec.Security == nil {
78-
m.Spec.Security = &mdbv1.Security{}
79-
}
80-
m.Spec.Security.Roles = roles
81-
return m
82-
}
83-
8476
func (m *MultiReplicaSetBuilder) SetRoleRefs(roleRefs []mdbv1.MongoDBRoleRef) *MultiReplicaSetBuilder {
8577
if m.Spec.Security == nil {
8678
m.Spec.Security = &mdbv1.Security{}

changelog/20251007_feature_reintroduce_securitycontext_operator_setting_in.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ kind: feature
33
date: 2025-10-07
44
---
55

6-
* **Helm Chart**: Introduced two new helm fields `operator.podSecurityContext` and `operator.securityContext` that can be used to configure `securityContext` for Operator deployment through Helm Chart.
6+
* **Helm Chart**: Introduced two new helm fields `operator.podSecurityContext` and `operator.securityContext` that can be used to configure `securityContext` for Operator deployment through Helm Chart.

0 commit comments

Comments
 (0)