Skip to content

Commit 0ae0b65

Browse files
authored
Merge branch 'master' into feat/connection-string-secret-annotations
2 parents e87cef8 + 90c5c47 commit 0ae0b65

File tree

67 files changed

+982
-862
lines changed

Some content is hidden

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

67 files changed

+982
-862
lines changed

.evergreen-periodic-builds.yaml

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

106+
#TODO should we still build the community operator?
106107
- name: periodic_build_community_operator
107108
commands:
108109
- func: enable_QEMU
@@ -114,13 +115,13 @@ tasks:
114115
commands:
115116
- func: pipeline
116117
vars:
117-
image_name: mongodb-kubernetes-readinessprobe-daily
118+
image_name: readinessprobe-daily
118119

119120
- name: periodic_build_version_upgrade_post_start_hook
120121
commands:
121122
- func: pipeline
122123
vars:
123-
image_name: mongodb-kubernetes-operator-version-upgrade-post-start-hook-daily
124+
image_name: operator-version-upgrade-post-start-hook-daily
124125

125126
task_groups:
126127
- name: periodic_build_task_group

.evergreen-tasks.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,6 @@ tasks:
199199
- func: "e2e_test"
200200

201201
- name: e2e_olm_operator_upgrade
202-
# TODO: CLOUDP-310820 - After 1.0.0 release we need re-enable this
203-
disable: true
204202
tags: [ "patch-run" ]
205203
commands:
206204
- func: "e2e_test"
@@ -212,8 +210,6 @@ tasks:
212210
- func: "e2e_test"
213211

214212
- name: e2e_olm_operator_upgrade_with_resources
215-
# TODO: CLOUDP-310820 - After 1.0.0 release we need re-enable this
216-
disable: true
217213
tags: [ "patch-run" ]
218214
commands:
219215
- func: "e2e_test"

.githooks/pre-commit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ run_shellcheck() {
163163

164164
start_shellcheck() {
165165
files_1=$(find scripts -type f -name "*.sh")
166-
files_2=$(find scripts/dev/contexts -type f)
166+
files_2=$(find scripts/dev/contexts -type f | grep -v private-context)
167167
files_3=$(find scripts/funcs -type f)
168168
files_4=$(find public/architectures -type f -name "*.sh")
169169
files=$(echo -e "$files_1\n$files_2\n$files_3\n$files_4")

LICENSE-THIRD-PARTY

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ github.com/gogo/protobuf,v1.3.2,https://github.com/gogo/protobuf/blob/v1.3.2/LIC
1919
github.com/golang/groupcache/lru,v0.0.0-20210331224755-41bb18bfe9da,https://github.com/golang/groupcache/blob/41bb18bfe9da/LICENSE,Apache-2.0
2020
github.com/golang/protobuf,v1.5.4,https://github.com/golang/protobuf/blob/v1.5.4/LICENSE,BSD-3-Clause
2121
github.com/google/gnostic-models,v0.6.8,https://github.com/google/gnostic-models/blob/v0.6.8/LICENSE,Apache-2.0
22-
github.com/google/go-cmp/cmp,v0.6.0,https://github.com/google/go-cmp/blob/v0.6.0/LICENSE,BSD-3-Clause
22+
github.com/google/go-cmp/cmp,v0.7.0,https://github.com/google/go-cmp/blob/v0.7.0/LICENSE,BSD-3-Clause
2323
github.com/google/go-querystring/query,v1.1.0,https://github.com/google/go-querystring/blob/v1.1.0/LICENSE,BSD-3-Clause
2424
github.com/google/gofuzz,v1.2.0,https://github.com/google/gofuzz/blob/v1.2.0/LICENSE,Apache-2.0
2525
github.com/google/uuid,v1.6.0,https://github.com/google/uuid/blob/v1.6.0/LICENSE,BSD-3-Clause
@@ -36,18 +36,15 @@ github.com/hashicorp/vault/api,v1.16.0,https://github.com/hashicorp/vault/blob/a
3636
github.com/imdario/mergo,v0.3.15,https://github.com/imdario/mergo/blob/v0.3.15/LICENSE,BSD-3-Clause
3737
github.com/josharian/intern,v1.0.0,https://github.com/josharian/intern/blob/v1.0.0/license.md,MIT
3838
github.com/json-iterator/go,v1.1.12,https://github.com/json-iterator/go/blob/v1.1.12/LICENSE,MIT
39-
github.com/klauspost/compress,v1.17.11,https://github.com/klauspost/compress/blob/v1.17.11/LICENSE,Apache-2.0
40-
github.com/klauspost/compress/internal/snapref,v1.17.11,https://github.com/klauspost/compress/blob/v1.17.11/internal/snapref/LICENSE,BSD-3-Clause
41-
github.com/klauspost/compress/zstd/internal/xxhash,v1.17.11,https://github.com/klauspost/compress/blob/v1.17.11/zstd/internal/xxhash/LICENSE.txt,MIT
4239
github.com/mailru/easyjson,v0.7.7,https://github.com/mailru/easyjson/blob/v0.7.7/LICENSE,MIT
4340
github.com/mitchellh/mapstructure,v1.5.0,https://github.com/mitchellh/mapstructure/blob/v1.5.0/LICENSE,MIT
4441
github.com/modern-go/concurrent,v0.0.0-20180306012644-bacd9c7ef1dd,https://github.com/modern-go/concurrent/blob/bacd9c7ef1dd/LICENSE,Apache-2.0
4542
github.com/modern-go/reflect2,v1.0.2,https://github.com/modern-go/reflect2/blob/v1.0.2/LICENSE,Apache-2.0
4643
github.com/munnerz/goautoneg,v0.0.0-20191010083416-a7dc8b61c822,https://github.com/munnerz/goautoneg/blob/a7dc8b61c822/LICENSE,BSD-3-Clause
4744
github.com/pkg/errors,v0.9.1,https://github.com/pkg/errors/blob/v0.9.1/LICENSE,BSD-2-Clause
4845
github.com/pmezard/go-difflib/difflib,v1.0.0,https://github.com/pmezard/go-difflib/blob/v1.0.0/LICENSE,BSD-3-Clause
49-
github.com/prometheus/client_golang/internal/github.com/golang/gddo/httputil,v1.21.0,https://github.com/prometheus/client_golang/blob/v1.21.0/internal/github.com/golang/gddo/LICENSE,BSD-3-Clause
50-
github.com/prometheus/client_golang/prometheus,v1.21.0,https://github.com/prometheus/client_golang/blob/v1.21.0/LICENSE,Apache-2.0
46+
github.com/prometheus/client_golang/internal/github.com/golang/gddo/httputil,v1.22.0,https://github.com/prometheus/client_golang/blob/v1.22.0/internal/github.com/golang/gddo/LICENSE,BSD-3-Clause
47+
github.com/prometheus/client_golang/prometheus,v1.22.0,https://github.com/prometheus/client_golang/blob/v1.22.0/LICENSE,Apache-2.0
5148
github.com/prometheus/client_model/go,v0.6.1,https://github.com/prometheus/client_model/blob/v0.6.1/LICENSE,Apache-2.0
5249
github.com/prometheus/common,v0.62.0,https://github.com/prometheus/common/blob/v0.62.0/LICENSE,Apache-2.0
5350
github.com/prometheus/procfs,v0.15.1,https://github.com/prometheus/procfs/blob/v0.15.1/LICENSE,Apache-2.0
@@ -63,7 +60,7 @@ github.com/xdg/stringprep,v1.0.3,https://github.com/xdg/stringprep/blob/v1.0.3/L
6360
go.uber.org/multierr,v1.11.0,https://github.com/uber-go/multierr/blob/v1.11.0/LICENSE.txt,MIT
6461
go.uber.org/zap,v1.27.0,https://github.com/uber-go/zap/blob/v1.27.0/LICENSE,MIT
6562
gomodules.xyz/jsonpatch/v2,v2.4.0,https://github.com/gomodules/jsonpatch/blob/v2.4.0/v2/LICENSE,Apache-2.0
66-
google.golang.org/protobuf,v1.36.1,https://github.com/protocolbuffers/protobuf-go/blob/v1.36.1/LICENSE,BSD-3-Clause
63+
google.golang.org/protobuf,v1.36.5,https://github.com/protocolbuffers/protobuf-go/blob/v1.36.5/LICENSE,BSD-3-Clause
6764
gopkg.in/inf.v0,v0.9.1,https://github.com/go-inf/inf/blob/v0.9.1/LICENSE,BSD-3-Clause
6865
gopkg.in/natefinch/lumberjack.v2,v2.2.1,https://github.com/natefinch/lumberjack/blob/v2.2.1/LICENSE,MIT
6966
gopkg.in/yaml.v2,v2.4.0,https://github.com/go-yaml/yaml/blob/v2.4.0/LICENSE,Apache-2.0

PIPELINE.md

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# Pipeline
2+
3+
## Environment Variables (env vars)
4+
5+
This listing contains all environment variables used in `pipeline.py`.
6+
Default evergreen-ci expansions can be looked up [here](https://docs.devprod.prod.corp.mongodb.com/evergreen/Project-Configuration/Project-Configuration-Files#expansions).
7+
8+
| Environment Variable | Usage / Description |
9+
|-------------------------------|------------------------------------------------------------------------------------|
10+
| `otel_trace_id` | OpenTelemetry tracing: trace ID. Default evergreen-ci expansion. |
11+
| `otel_parent_id` | OpenTelemetry tracing: parent span ID. Default evergreen-ci expansion. |
12+
| `otel_collector_endpoint` | OpenTelemetry tracing: collector endpoint. Default evergreen-ci expansion. |
13+
| `distro` | Image type (defaults to `ubi`) |
14+
| `BASE_REPO_URL` | Base repository URL for images |
15+
| `namespace` | Kubernetes namespace (defaults to `default`) |
16+
| `skip_tags` | Tags to skip during build |
17+
| `include_tags` | Tags to include during build |
18+
| `all_agents` | Whether to build all agent images |
19+
| `RUNNING_IN_EVG` | Whether running in Evergreen pipeline |
20+
| `is_patch` | Whether running as a patch build. Default evergreen-ci expansion. |
21+
| `pin_tag_at` | Time to pin image tag (format: `HH:MM`) |
22+
| `created_at` | Build creation time (format: `%y_%m_%d_%H_%M_%S`). Default evergreen-ci expansion. |
23+
| `triggered_by_git_tag` | Git tag that triggered the build. Default evergreen-ci expansion. Default evergreen-ci expansion. |
24+
| `version_id` | Patch ID or version for non-release builds. Default evergreen-ci expansion. |
25+
| `test_suffix` | Suffix for test images |
26+
| `LOG_AUTOMATION_CONFIG_DIFF` | Whether to log automation config diff |
27+
| `PYTHON_VERSION` | Python version for test images |
28+
| `GOLANG_VERSION` | Go version for community images and tests |
29+
| `QUAY_REGISTRY` | Quay registry URL (defaults to `quay.io/mongodb`) |
30+
| `REGISTRY` | ECR registry URL (defaults to `268558157000.dkr.ecr.us-east-1.amazonaws.com/dev`) |
31+
| `om_version` | Ops Manager version for OM image builds |
32+
| `om_download_url` | Download URL for Ops Manager (optional, can be auto-detected) |
33+
34+
## Context Image Build Process
35+
36+
```
37+
┌─────────────────────────────┐
38+
│ Release Pipeline │
39+
└────────────┬────────────────┘
40+
41+
42+
┌─────────────────────────────────┐
43+
│ Build context image │
44+
│ Tag: opsmanager-context:1.33.0 │
45+
└────────────┬────────────────────┘
46+
47+
48+
┌───────────────────────────────┐
49+
│ Daily Build │
50+
│ Base: opsmanager-context │
51+
│ Input tag: 1.33.0 │
52+
└────────────┬──────────────────┘
53+
54+
55+
┌────────────────────────────────────┐
56+
│ Push Two Image Tags │
57+
└────────────┬───────────────┬───────┘
58+
▼ ▼
59+
┌────────────────────────┐ ┌──────────────────────────────┐
60+
│ Rolling Tag (latest) │ │ Immutable Tag (daily stamp) │
61+
│ opsmanager:1.33.0 │ │ opsmanager:1.33.0-2025-01-01 │
62+
└────────────────────────┘ └──────────────────────────────┘
63+
64+
▼ (next day build)
65+
┌────────────────────────┐ ┌──────────────────────────────┐
66+
│ opsmanager:1.33.0 │ │ opsmanager:1.33.0-2025-01-02 │
67+
└────────────────────────┘ └──────────────────────────────┘
68+
↑ now updated to point ↑ new image pushed
69+
to the 2025-01-02 build
70+
```

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[![Documentation](https://img.shields.io/badge/Documentation-MongoDB-green)](https://www.mongodb.com/docs/kubernetes/current/)
2+
![Latest Release](https://img.shields.io/github/v/release/mongodb/mongodb-kubernetes)
23

34
# Mongodb Controllers for Kubernetes (MCK)
45

@@ -52,7 +53,7 @@ As an open-source project, MCK allows for community contributions, helping drive
5253
No impact on current contracts or agreements.
5354

5455
### Migration
55-
Migration from [MongoDB Community Operator](https://github.com/mongodb/mongodb-kubernetes-operator) and [MongoDB Enterprise Kubernetes Operator](https://www.mongodb.com/docs/kubernetes-operator/current/) to MCK is seamless: your MongoDB deployments are not impacted by the upgrade and require no changes. Simply follow the upgrade instructions provided in the MCK documentation. See our [migration guidance](https://dochub.mongodb.org/core/migrate-to-mck).
56+
Migration from [MongoDB Community Operator](https://github.com/mongodb/mongodb-kubernetes-operator) and [MongoDB Enterprise Kubernetes Operator](https://www.mongodb.com/docs/kubernetes-operator/current/) to MCK is seamless: your MongoDB deployments are not impacted by the upgrade and require no changes. Simply follow the upgrade instructions provided in the MCK documentation.
5657
See our detailed migration guides:
5758
- [Migrating from MongoDB Community Operator](docs/migration/community-operator-migration.md)
5859
- [Migrating from MongoDB Enterprise Kubernetes Operator](https://www.mongodb.com/docs/kubernetes/current/tutorial/migrate-to-mck/)

0 commit comments

Comments
 (0)