Merge remote-tracking branch 'origin/master' into search/public-preview

Author: lsierant

.dockerignore

@@ -54,7 +54,6 @@ tools.go
 deploy/
 config/manifests/
 public/
-!/public/tools/multicluster/go.mod
 
 # Documentation files
 docs/

.evergreen-functions.yml

@@ -664,7 +664,7 @@ functions:
           make test-race
     - command: gotest.parse_files
       params:
-        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" ]
+        files: [ "src/github.com/mongodb/mongodb-kubernetes/*.suite", "src/github.com/mongodb/mongodb-kubernetes/docker/mongodb-kubernetes-init-ops-manager/mmsconfiguration/*.suite" ]
 
   test_python_unit:
     - command: shell.exec

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

@@ -45,7 +45,7 @@ functions:
     - command: shell.exec
       type: setup
       params:
-        working_dir: src/github.com/mongodb/mongodb-kubernetes/public/tools/multicluster
+        working_dir: src/github.com/mongodb/mongodb-kubernetes
         include_expansions_in_env:
           - GRS_USERNAME
           - GRS_PASSWORD

.evergreen.yml

@@ -11,7 +11,7 @@ variables:
 
   - &ops_manager_70_latest 7.0.15 # The order/index is important, since these are anchors. Please do not change
 
-  - &ops_manager_80_latest 8.0.7 # The order/index is important, since these are anchors. Please do not change
+  - &ops_manager_80_latest 8.0.11 # The order/index is important, since these are anchors. Please do not change
 
   # The dependency unification between static and non-static is intentional here.
   # Even though some images are exclusive, in EVG they all are built once and in parallel.

.github/pull_request_template.md

@@ -10,14 +10,3 @@
 - [ ] 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?
-
-## Reminder (Please remove this when merging)
-- Please try to Approve or Reject Changes the PR, keep PRs in review as short as possible
-- Our Short Guide for PRs: [Link](https://docs.google.com/document/d/1T93KUtdvONq43vfTfUt8l92uo4e4SEEvFbIEKOxGr44/edit?tab=t.0)
-- Remember the following Communication Standards - use comment prefixes for clarity:
-  * **blocking**: Must be addressed before approval.
-  * **follow-up**: Can be addressed in a later PR or ticket.
-  * **q**: Clarifying question.
-  * **nit**: Non-blocking suggestions.
-  * **note**: Side-note, non-actionable. Example: Praise 
-  * --> no prefix is considered a question

.gitignore

@@ -3,7 +3,6 @@
 
 /pkg/client
 /vendor/
-public/tools/multicluster/vendor
 docker/mongodb-kubernetes-operator/content/mongodb-kubernetes-operator
 docker/mongodb-kubernetes-database/content/mongodb-mms-automation-agent-version.properties
 docker/mongodb-kubernetes-database/content/readinessprobe
@@ -94,3 +93,6 @@ logs-debug/
 
 docs/**/log/*
 docs/**/test.sh.run.log
+
+# goreleaser generated files
+dist

public/tools/multicluster/.goreleaser.yaml renamed to .goreleaser.yaml

@@ -7,6 +7,7 @@ before:
 builds:
   - env:
       - CGO_ENABLED=0
+    main: ./cmd/kubectl-mongodb
     goos:
       - linux
       - darwin
@@ -16,9 +17,9 @@ builds:
     hooks:
       # This will notarize Apple binaries and replace goreleaser bins with the notarized ones
       post:
-        - cmd: ./kubectl_mac_notarize.sh
+        - cmd: ./scripts/release/kubectl-mongodb/kubectl_mac_notarize.sh
           output: true
-        - cmd: ./sign.sh {{ .Path }}
+        - cmd: ./scripts/release/kubectl-mongodb/sign.sh {{ .Path }}
           env:
             - GRS_USERNAME={{ .Env.GRS_USERNAME }}
             - GRS_PASSWORD={{ .Env.GRS_PASSWORD }}
@@ -27,7 +28,7 @@ builds:
             - SIGNING_IMAGE_URI={{ .Env.SIGNING_IMAGE_URI }}
             - ARTIFACTORY_USERNAME=mongodb-enterprise-kubernetes-operator
             - ARTIFACTORY_PASSWORD={{ .Env.ARTIFACTORY_PASSWORD }}
-        - cmd: ./verify.sh {{ .Path }} && echo "VERIFIED OK"
+        - cmd: ./scripts/release/kubectl-mongodb/verify.sh {{ .Path }} && echo "VERIFIED OK"
 
 archives:
   - format: tar.gz

LICENSE-THIRD-PARTY

@@ -10,7 +10,8 @@ github.com/fsnotify/fsnotify,v1.7.0,https://github.com/fsnotify/fsnotify/blob/v1
 github.com/ghodss/yaml,v1.0.0,https://github.com/ghodss/yaml/blob/v1.0.0/LICENSE,MIT
 github.com/go-jose/go-jose/v4,v4.0.5,https://github.com/go-jose/go-jose/blob/v4.0.5/LICENSE,Apache-2.0
 github.com/go-jose/go-jose/v4/json,v4.0.5,https://github.com/go-jose/go-jose/blob/v4.0.5/json/LICENSE,BSD-3-Clause
-github.com/go-logr/logr,v1.4.2,https://github.com/go-logr/logr/blob/v1.4.2/LICENSE,Apache-2.0
+github.com/go-logr/logr,v1.4.3,https://github.com/go-logr/logr/blob/v1.4.3/LICENSE,Apache-2.0
+github.com/go-logr/stdr,v1.2.2,https://github.com/go-logr/stdr/blob/v1.2.2/LICENSE,Apache-2.0
 github.com/go-logr/zapr,v1.3.0,https://github.com/go-logr/zapr/blob/v1.3.0/LICENSE,Apache-2.0
 github.com/go-openapi/jsonpointer,v0.19.6,https://github.com/go-openapi/jsonpointer/blob/v0.19.6/LICENSE,Apache-2.0
 github.com/go-openapi/jsonreference,v0.20.2,https://github.com/go-openapi/jsonreference/blob/v0.20.2/LICENSE,Apache-2.0
@@ -23,16 +24,17 @@ github.com/google/go-cmp/cmp,v0.7.0,https://github.com/google/go-cmp/blob/v0.7.0
 github.com/google/go-querystring/query,v1.1.0,https://github.com/google/go-querystring/blob/v1.1.0/LICENSE,BSD-3-Clause
 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/grpc-ecosystem/grpc-gateway/v2,v2.16.0,https://github.com/grpc-ecosystem/grpc-gateway/blob/v2.16.0/LICENSE.txt,BSD-3-Clause
 github.com/hashicorp/errwrap,v1.1.0,https://github.com/hashicorp/errwrap/blob/v1.1.0/LICENSE,MPL-2.0
 github.com/hashicorp/go-cleanhttp,v0.5.2,https://github.com/hashicorp/go-cleanhttp/blob/v0.5.2/LICENSE,MPL-2.0
 github.com/hashicorp/go-multierror,v1.1.1,https://github.com/hashicorp/go-multierror/blob/v1.1.1/LICENSE,MPL-2.0
-github.com/hashicorp/go-retryablehttp,v0.7.7,https://github.com/hashicorp/go-retryablehttp/blob/v0.7.7/LICENSE,MPL-2.0
+github.com/hashicorp/go-retryablehttp,v0.7.8,https://github.com/hashicorp/go-retryablehttp/blob/v0.7.8/LICENSE,MPL-2.0
 github.com/hashicorp/go-rootcerts,v1.0.2,https://github.com/hashicorp/go-rootcerts/blob/v1.0.2/LICENSE,MPL-2.0
 github.com/hashicorp/go-secure-stdlib/parseutil,v0.1.6,https://github.com/hashicorp/go-secure-stdlib/blob/parseutil/v0.1.6/parseutil/LICENSE,MPL-2.0
 github.com/hashicorp/go-secure-stdlib/strutil,v0.1.2,https://github.com/hashicorp/go-secure-stdlib/blob/strutil/v0.1.2/strutil/LICENSE,MPL-2.0
 github.com/hashicorp/go-sockaddr,v1.0.2,https://github.com/hashicorp/go-sockaddr/blob/v1.0.2/LICENSE,MPL-2.0
-github.com/hashicorp/hcl,v1.0.0,https://github.com/hashicorp/hcl/blob/v1.0.0/LICENSE,MPL-2.0
-github.com/hashicorp/vault/api,v1.16.0,https://github.com/hashicorp/vault/blob/api/v1.16.0/api/LICENSE,MPL-2.0
+github.com/hashicorp/hcl,v1.0.1-vault-7,https://github.com/hashicorp/hcl/blob/v1.0.1-vault-7/LICENSE,MPL-2.0
+github.com/hashicorp/vault/api,v1.20.0,https://github.com/hashicorp/vault/blob/api/v1.20.0/api/LICENSE,MPL-2.0
 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
@@ -50,16 +52,28 @@ github.com/prometheus/common,v0.62.0,https://github.com/prometheus/common/blob/v
 github.com/prometheus/procfs,v0.15.1,https://github.com/prometheus/procfs/blob/v0.15.1/LICENSE,Apache-2.0
 github.com/r3labs/diff/v3,v3.0.1,https://github.com/r3labs/diff/blob/v3.0.1/LICENSE,MPL-2.0
 github.com/ryanuber/go-glob,v1.0.0,https://github.com/ryanuber/go-glob/blob/v1.0.0/LICENSE,MIT
-github.com/spf13/cast,v1.8.0,https://github.com/spf13/cast/blob/v1.8.0/LICENSE,MIT
+github.com/spf13/cast,v1.9.2,https://github.com/spf13/cast/blob/v1.9.2/LICENSE,MIT
 github.com/spf13/pflag,v1.0.5,https://github.com/spf13/pflag/blob/v1.0.5/LICENSE,BSD-3-Clause
 github.com/stretchr/objx,v0.5.2,https://github.com/stretchr/objx/blob/v0.5.2/LICENSE,MIT
 github.com/stretchr/testify/assert,v1.10.0,https://github.com/stretchr/testify/blob/v1.10.0/LICENSE,MIT
 github.com/vmihailenco/msgpack/v5,v5.3.5,https://github.com/vmihailenco/msgpack/blob/v5.3.5/LICENSE,BSD-2-Clause
 github.com/vmihailenco/tagparser/v2,v2.0.0,https://github.com/vmihailenco/tagparser/blob/v2.0.0/LICENSE,BSD-2-Clause
 github.com/xdg/stringprep,v1.0.3,https://github.com/xdg/stringprep/blob/v1.0.3/LICENSE,Apache-2.0
+go.opentelemetry.io/auto/sdk,v1.1.0,https://github.com/open-telemetry/opentelemetry-go-instrumentation/blob/sdk/v1.1.0/sdk/LICENSE,Apache-2.0
+go.opentelemetry.io/otel,v1.35.0,https://github.com/open-telemetry/opentelemetry-go/blob/v1.35.0/LICENSE,Apache-2.0
+go.opentelemetry.io/otel/exporters/otlp/otlptrace,v1.19.0,https://github.com/open-telemetry/opentelemetry-go/blob/exporters/otlp/otlptrace/v1.19.0/exporters/otlp/otlptrace/LICENSE,Apache-2.0
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc,v1.19.0,https://github.com/open-telemetry/opentelemetry-go/blob/exporters/otlp/otlptrace/otlptracegrpc/v1.19.0/exporters/otlp/otlptrace/otlptracegrpc/LICENSE,Apache-2.0
+go.opentelemetry.io/otel/metric,v1.35.0,https://github.com/open-telemetry/opentelemetry-go/blob/metric/v1.35.0/metric/LICENSE,Apache-2.0
+go.opentelemetry.io/otel/sdk,v1.35.0,https://github.com/open-telemetry/opentelemetry-go/blob/sdk/v1.35.0/sdk/LICENSE,Apache-2.0
+go.opentelemetry.io/otel/trace,v1.35.0,https://github.com/open-telemetry/opentelemetry-go/blob/trace/v1.35.0/trace/LICENSE,Apache-2.0
+go.opentelemetry.io/proto/otlp,v1.0.0,https://github.com/open-telemetry/opentelemetry-proto-go/blob/otlp/v1.0.0/otlp/LICENSE,Apache-2.0
 go.uber.org/multierr,v1.11.0,https://github.com/uber-go/multierr/blob/v1.11.0/LICENSE.txt,MIT
 go.uber.org/zap,v1.27.0,https://github.com/uber-go/zap/blob/v1.27.0/LICENSE,MIT
+go.yaml.in/yaml/v2,v2.4.2,https://github.com/yaml/go-yaml/blob/v2.4.2/LICENSE,Apache-2.0
 gomodules.xyz/jsonpatch/v2,v2.4.0,https://github.com/gomodules/jsonpatch/blob/v2.4.0/v2/LICENSE,Apache-2.0
+google.golang.org/genproto/googleapis/api/httpbody,v0.0.0-20230726155614-23370e0ffb3e,https://github.com/googleapis/go-genproto/blob/23370e0ffb3e/googleapis/api/LICENSE,Apache-2.0
+google.golang.org/genproto/googleapis/rpc,v0.0.0-20230822172742-b8732ec3820d,https://github.com/googleapis/go-genproto/blob/b8732ec3820d/googleapis/rpc/LICENSE,Apache-2.0
+google.golang.org/grpc,v1.58.3,https://github.com/grpc/grpc-go/blob/v1.58.3/LICENSE,Apache-2.0
 google.golang.org/protobuf,v1.36.5,https://github.com/protocolbuffers/protobuf-go/blob/v1.36.5/LICENSE,BSD-3-Clause
 gopkg.in/inf.v0,v0.9.1,https://github.com/go-inf/inf/blob/v0.9.1/LICENSE,BSD-3-Clause
 gopkg.in/natefinch/lumberjack.v2,v2.2.1,https://github.com/natefinch/lumberjack/blob/v2.2.1/LICENSE,MIT
@@ -79,5 +93,4 @@ k8s.io/utils/internal/third_party/forked/golang/net,v0.0.0-20240502163921-fe8a2d
 sigs.k8s.io/controller-runtime,v0.18.7,https://github.com/kubernetes-sigs/controller-runtime/blob/v0.18.7/LICENSE,Apache-2.0
 sigs.k8s.io/json,v0.0.0-20221116044647-bc3834ca7abd,https://github.com/kubernetes-sigs/json/blob/bc3834ca7abd/LICENSE,Apache-2.0
 sigs.k8s.io/structured-merge-diff/v4,v4.4.1,https://github.com/kubernetes-sigs/structured-merge-diff/blob/v4.4.1/LICENSE,Apache-2.0
-sigs.k8s.io/yaml,v1.4.0,https://github.com/kubernetes-sigs/yaml/blob/v1.4.0/LICENSE,Apache-2.0
-sigs.k8s.io/yaml/goyaml.v2,v1.4.0,https://github.com/kubernetes-sigs/yaml/blob/v1.4.0/goyaml.v2/LICENSE,Apache-2.0
+sigs.k8s.io/yaml,v1.5.0,https://github.com/kubernetes-sigs/yaml/blob/v1.5.0/LICENSE,Apache-2.0

public/tools/multicluster/Dockerfile renamed to cmd/kubectl-mongodb/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.24 as builder
+FROM golang:1.24 AS builder
 WORKDIR /go/src
 ADD . .