Merge branch 'master' into search/public-preview

Author: fealebenpae

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

@@ -0,0 +1,19 @@
+name: 'Setup Ubuntu Runner Host'
+inputs:
+  python-version:
+    description: 'Python version to use'
+    required: true
+runs:
+  using: "composite"
+  steps:
+    - name: setup python
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{inputs.python-version}}
+        cache: 'pip' # caching pip dependencies
+    - name: Install dependencies
+      shell: bash
+      run: |
+        sudo apt-get install libldap2-dev libsasl2-dev # Required for python-ldap
+        pip install --upgrade pip
+        pip install -r requirements.txt

.github/pull_request_template.md

@@ -7,6 +7,9 @@
 <!-- Enter your proof that it works here.-->
 
 ## Checklist
+
 - [ ] Have you linked a jira ticket and/or is the ticket in the title?
 - [ ] Have you checked whether your jira ticket required DOCSP changes?
-- [ ] Have you checked for release_note changes?
+- [ ] Have you added changelog file?
+    - use `skip-changelog` label if not needed
+    - 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

@@ -0,0 +1,46 @@
+name: Preview Release Notes
+on:
+  push:
+    branches:
+      - master
+      - release-*
+  pull_request:
+    branches:
+      - master
+      - release-*
+
+jobs:
+  preview_release_notes:
+    name: Preview Release Notes
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: '0'
+      - name: Setup host
+        uses: ./.github/actions/setup-ubuntu-host
+        with:
+          python-version: '${{ vars.PYTHON_VERSION }}'
+      - name: Generate Release Notes
+        id: generate_release_notes
+        run: python -m scripts.release.release_notes -s $INITIAL_COMMIT_SHA -v $INITIAL_VERSION -o release_notes_tmp.md
+        env:
+          INITIAL_COMMIT_SHA: ${{ vars.RELEASE_INITIAL_COMMIT_SHA }}
+          INITIAL_VERSION: ${{ vars.RELEASE_INITIAL_VERSION }}
+      - name: Add disclaimer to release notes preview
+        run: |
+          echo -e "_:warning: (this preview might not be accurate if the PR is not rebased on current master branch)_\n" > release_notes_preview.md
+          cat release_notes_tmp.md >> release_notes_preview.md
+      - name: Summarize results
+        run: cat release_notes_preview.md >> $GITHUB_STEP_SUMMARY
+      - name: Update PR comment
+        # If the PR is from a fork, we cannot update the comment using read only permissions
+        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository
+        run: gh issue comment $ISSUE --edit-last --create-if-none --body-file release_notes_preview.md
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ISSUE: ${{ github.event.pull_request.html_url }}

.github/workflows/require_changelog.yml

@@ -0,0 +1,35 @@
+name: Validate Changelog Requirement
+on:
+  pull_request:
+    branches:
+      - master
+      - release-*
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - labeled
+      - unlabeled
+
+jobs:
+  validate-changelog:
+    name: Check for valid changelog entry
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: '0'
+      - name: Setup host
+        uses: ./.github/actions/setup-ubuntu-host
+        with:
+          python-version: '${{ vars.PYTHON_VERSION }}'
+      - name: Check if changelog entry file was added in this PR
+        run: |
+          set -o pipefail
+          python -m scripts.release.check_changelog -b $BASE_SHA -f $FAIL_ON_NO_CHANGES | tee >> $GITHUB_STEP_SUMMARY
+        env:
+          BASE_SHA: ${{ github.event.pull_request.base.sha }}
+          FAIL_ON_NO_CHANGES: ${{ !contains(github.event.pull_request.labels.*.name, 'skip-changelog') }}

.gitignore

@@ -43,11 +43,6 @@ public/architectures/**/secrets/*
 
 docker/mongodb-kubernetes-appdb/content/readinessprobe
 mongodb-kubernetes
-docker/mongodb-kubernetes-operator/Dockerfile
-docker/mongodb-kubernetes-database/Dockerfile
-docker/mongodb-enterprise-ops-manager/Dockerfile
-docker/mongodb-kubernetes-init-database/Dockerfile
-docker/mongodb-kubernetes-init-ops-manager/Dockerfile
 docker/mongodb-kubernetes-operator/content/mongodb-kubernetes-operator.tar
 docker/mongodb-kubernetes-tests/helm_chart/
 docker/mongodb-kubernetes-tests/public/

CONTRIBUTING.md

@@ -1,7 +1,51 @@
 # Summary
+
 Contributing to the Mongodb Controllers for Kubernetes (MCK) project
-Pull requests are always welcome, and the MCK dev team appreciates any help the community can give to help make MongoDB better.
+Pull requests are always welcome, and the MCK dev team appreciates any help the community can give to help make MongoDB
+better.
+
+## PR Prerequisites
 
-# PR Prerequisites
-* Please ensure you have signed our Contributor Agreement. You can find it [here](https://www.mongodb.com/legal/contributor-agreement).
+* Please ensure you have signed our Contributor Agreement. You can find
+  it [here](https://www.mongodb.com/legal/contributor-agreement).
 * Please ensure that all commits are signed.
+* Create a changelog file that will describe the changes you made. Use the `skip-changelog` label if your changes do not
+  require a changelog entry.
+
+## Changelog files and Release Notes
+
+Each Pull Request usually has a changelog file that describes the changes made in the PR using Markdown syntax.
+Changelog files are placed in the `changelog/` directory and used to generate the Release Notes for the
+upcoming release. Preview of the Release Notes is automatically added as comment to each Pull Request.
+The changelog file needs to follow the naming convention
+`YYYYMMDD-<change_kind>-<short-description>.md`. To create changelog file please use the
+`scripts/release/create_changelog.py` script. Example usage:
+
+```console
+python3 -m scripts.release.create_changelog --kind fix "Fix that I want to describe in the changelog"
+```
+
+For more options, run the script with `--help`:
+
+```console
+python3 -m scripts.release.create_changelog --help
+usage: create_changelog.py [-h] [-c ] [-d ] [-e] -k  title
+
+Utility to easily create a new changelog entry file.
+
+positional arguments:
+  title                 Title for the changelog entry
+
+options:
+  -h, --help            show this help message and exit
+  -c, --changelog-path
+                        Path to the changelog directory relative to a current working directory. Default is 'changelog/'
+  -d, --date            Date in 'YYYY-MM-DD' format to use for the changelog entry. Default is today's date
+  -e, --editor          Open the created changelog entry in the default editor (if set, otherwise uses 'vi'). Default is True
+  -k, --kind            Kind of the changelog entry:
+                          - 'prelude' for prelude entries
+                          - 'breaking' for breaking change entries
+                          - 'feature' for feature entries
+                          - 'fix' for bugfix entries
+                          - 'other' for other entries
+```

cmd/kubectl-mongodb/LICENSE-THIRD-PARTY

@@ -11,16 +11,13 @@ github.com/golang/protobuf,v1.5.4,https://github.com/golang/protobuf/blob/v1.5.4
 github.com/google/gnostic-models,v0.6.8,https://github.com/google/gnostic-models/blob/v0.6.8/LICENSE,Apache-2.0
 github.com/google/gofuzz,v1.2.0,https://github.com/google/gofuzz/blob/v1.2.0/LICENSE,Apache-2.0
 github.com/google/uuid,v1.6.0,https://github.com/google/uuid/blob/v1.6.0/LICENSE,BSD-3-Clause
-github.com/gorilla/websocket,v1.5.0,https://github.com/gorilla/websocket/blob/v1.5.0/LICENSE,BSD-2-Clause
 github.com/imdario/mergo,v0.3.15,https://github.com/imdario/mergo/blob/v0.3.15/LICENSE,BSD-3-Clause
 github.com/josharian/intern,v1.0.0,https://github.com/josharian/intern/blob/v1.0.0/license.md,MIT
 github.com/json-iterator/go,v1.1.12,https://github.com/json-iterator/go/blob/v1.1.12/LICENSE,MIT
 github.com/mailru/easyjson,v0.7.7,https://github.com/mailru/easyjson/blob/v0.7.7/LICENSE,MIT
-github.com/moby/spdystream,v0.2.0,https://github.com/moby/spdystream/blob/v0.2.0/LICENSE,Apache-2.0
 github.com/modern-go/concurrent,v0.0.0-20180306012644-bacd9c7ef1dd,https://github.com/modern-go/concurrent/blob/bacd9c7ef1dd/LICENSE,Apache-2.0
 github.com/modern-go/reflect2,v1.0.2,https://github.com/modern-go/reflect2/blob/v1.0.2/LICENSE,Apache-2.0
 github.com/munnerz/goautoneg,v0.0.0-20191010083416-a7dc8b61c822,https://github.com/munnerz/goautoneg/blob/a7dc8b61c822/LICENSE,BSD-3-Clause
-github.com/mxk/go-flowrate/flowrate,v0.0.0-20140419014527-cca7078d478f,https://github.com/mxk/go-flowrate/blob/cca7078d478f/LICENSE,BSD-3-Clause
 github.com/spf13/cobra,v1.7.0,https://github.com/spf13/cobra/blob/v1.7.0/LICENSE.txt,Apache-2.0
 github.com/spf13/pflag,v1.0.5,https://github.com/spf13/pflag/blob/v1.0.5/LICENSE,BSD-3-Clause
 go.yaml.in/yaml/v2,v2.4.2,https://github.com/yaml/go-yaml/blob/v2.4.2/LICENSE,Apache-2.0
@@ -30,7 +27,7 @@ gopkg.in/yaml.v2,v2.4.0,https://github.com/go-yaml/yaml/blob/v2.4.0/LICENSE,Apac
 gopkg.in/yaml.v3,v3.0.1,https://github.com/go-yaml/yaml/blob/v3.0.1/LICENSE,MIT
 k8s.io/api,v0.30.10,https://github.com/kubernetes/api/blob/v0.30.10/LICENSE,Apache-2.0
 k8s.io/apimachinery/pkg,v0.30.10,https://github.com/kubernetes/apimachinery/blob/v0.30.10/LICENSE,Apache-2.0
-k8s.io/apimachinery/third_party/forked/golang,v0.30.10,https://github.com/kubernetes/apimachinery/blob/v0.30.10/third_party/forked/golang/LICENSE,BSD-3-Clause
+k8s.io/apimachinery/third_party/forked/golang/reflect,v0.30.10,https://github.com/kubernetes/apimachinery/blob/v0.30.10/third_party/forked/golang/LICENSE,BSD-3-Clause
 k8s.io/client-go,v0.30.10,https://github.com/kubernetes/client-go/blob/v0.30.10/LICENSE,Apache-2.0
 k8s.io/klog/v2,v2.130.1,https://github.com/kubernetes/klog/blob/v2.130.1/LICENSE,Apache-2.0
 k8s.io/kube-openapi/pkg,v0.0.0-20240228011516-70dd3763d340,https://github.com/kubernetes/kube-openapi/blob/70dd3763d340/LICENSE,Apache-2.0

cmd/kubectl-mongodb/debug/debug.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/spf13/cobra"
 
-	cmddebug "github.com/mongodb/mongodb-kubernetes/cmd/kubectl-mongodb/debug"
 	"github.com/mongodb/mongodb-kubernetes/cmd/kubectl-mongodb/multicluster"
 	"github.com/mongodb/mongodb-kubernetes/cmd/kubectl-mongodb/utils"
 )
@@ -25,7 +24,6 @@ of MongoDB resources in your kubernetes cluster.
 
 func init() {
 	rootCmd.AddCommand(multicluster.MulticlusterCmd)
-	rootCmd.AddCommand(cmddebug.DebugCmd)
 }
 
 // Execute adds all child commands to the root command and sets flags appropriately.

cmd/kubectl-mongodb/root/root.go

@@ -1,5 +1,14 @@
-ARG imagebase
-FROM ${imagebase} as base
+FROM scratch AS base
+
+ARG agent_version
+ARG agent_distro
+ARG tools_version
+ARG tools_distro
+
+ADD https://mciuploads.s3.amazonaws.com/mms-automation/mongodb-mms-build-agent/builds/automation-agent/prod/mongodb-mms-automation-agent-${agent_version}.${agent_distro}.tar.gz /data/mongodb-agent.tar.gz
+ADD https://downloads.mongodb.org/tools/db/mongodb-database-tools-${tools_distro}-${tools_version}.tgz /data/mongodb-tools.tgz
+
+COPY ./docker/mongodb-kubernetes-init-database/content/LICENSE /data/LICENSE
 
 FROM registry.access.redhat.com/ubi9/ubi-minimal
 
@@ -46,6 +55,12 @@ COPY --from=base /data/mongodb-agent.tar.gz /agent
 COPY --from=base /data/mongodb-tools.tgz /agent
 COPY --from=base /data/LICENSE /licenses/LICENSE
 
+# Copy scripts to a safe location that won't be overwritten by volume mount
+COPY --from=base /opt/scripts/agent-launcher-shim.sh /usr/local/bin/agent-launcher-shim.sh
+COPY --from=base /opt/scripts/setup-agent-files.sh /usr/local/bin/setup-agent-files.sh
+COPY --from=base /opt/scripts/dummy-probe.sh /usr/local/bin/dummy-probe.sh
+COPY --from=base /opt/scripts/dummy-readinessprobe.sh /usr/local/bin/dummy-readinessprobe
+
 RUN tar xfz /agent/mongodb-agent.tar.gz \
     && mv mongodb-mms-automation-agent-*/mongodb-mms-automation-agent /agent/mongodb-agent \
     && chmod +x /agent/mongodb-agent \