CLOUDP-226357 - fix logRotate & add local dev imp & update examples (#1480)

Author: nammn

Makefile

@@ -14,6 +14,7 @@ AGENT_IMAGE_NAME := $(shell jq -r .agent_image_ubi < $(MONGODB_COMMUNITY_CONFIG)
 HELM_CHART ?= ./helm-charts/charts/community-operator
 
 STRING_SET_VALUES := --set namespace=$(NAMESPACE),versionUpgradeHook.name=$(UPGRADE_HOOK_IMG),readinessProbe.name=$(READINESS_PROBE_IMG),registry.operator=$(REPO_URL),operator.operatorImageName=$(OPERATOR_IMAGE),operator.version=latest,registry.agent=$(REGISTRY),registry.versionUpgradeHook=$(REGISTRY),registry.readinessProbe=$(REGISTRY),registry.operator=$(REGISTRY),versionUpgradeHook.version=latest,readinessProbe.version=latest,agent.version=latest,agent.name=$(AGENT_IMAGE_NAME)
+STRING_SET_VALUES_LOCAL := $(STRING_SET_VALUES) --set operator.replicas=0
 
 DOCKERFILE ?= operator
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
@@ -101,11 +102,21 @@ install: manifests helm install-crd ## Install CRDs into a cluster
 install-crd:
 	kubectl apply -f config/crd/bases/mongodbcommunity.mongodb.com_mongodbcommunity.yaml
 
-install-chart:
+install-chart: uninstall-crd
 	$(HELM) upgrade --install $(STRING_SET_VALUES) $(RELEASE_NAME_HELM) $(HELM_CHART) --namespace $(NAMESPACE) --create-namespace
 
+install-chart-local-operator: uninstall-crd
+	$(HELM) upgrade --install $(STRING_SET_VALUES_LOCAL) $(RELEASE_NAME_HELM) $(HELM_CHART) --namespace $(NAMESPACE) --create-namespace
+
+prepare-local-dev: generate-env-file install-chart-local-operator install-rbac setup-sas
+
+# patches all sas to use the local-image-registry
+setup-sas:
+	scripts/dev/setup_sa.sh
+
 install-chart-with-tls-enabled:
 	$(HELM) upgrade --install --set createResource=true $(STRING_SET_VALUES) $(RELEASE_NAME_HELM) $(HELM_CHART) --namespace $(NAMESPACE) --create-namespace
+
 install-rbac:
 	$(HELM) template $(STRING_SET_VALUES) -s templates/database_roles.yaml $(HELM_CHART) | kubectl apply -f -
 	$(HELM) template $(STRING_SET_VALUES) -s templates/operator_roles.yaml $(HELM_CHART) | kubectl apply -f -
@@ -165,6 +176,7 @@ cleanup-e2e: ## Cleans up e2e test env
 generate-env-file: ## generates a local-test.env for local testing
 	mkdir -p .community-operator-dev
 	{ python scripts/dev/get_e2e_env_vars.py | tee >(cut -d' ' -f2 > .community-operator-dev/local-test.env) ;} > .community-operator-dev/local-test.export.env
+	. .community-operator-dev/local-test.export.env
 
 ##@ Image
 

README.md

@@ -42,9 +42,6 @@ See the [documentation](docs) to learn how to:
 
 The MongoDB Community Kubernetes Operator supports the following features:
 
-> Warning: Currently the operator doesn't support Replicaset deployment with server version >= 7.0. We are working on adding the support for it.
-
-
 - Create [replica sets](https://www.mongodb.com/docs/manual/replication/)
 - Upgrade and downgrade MongoDB server version
 - Scale replica sets up and down
@@ -57,9 +54,6 @@ The MongoDB Community Kubernetes Operator supports the following features:
 - Create custom roles
 - Enable a [metrics target that can be used with Prometheus](docs/prometheus/README.md)
 
-### Planned Features
-- Server internal authentication via keyfile
-
 ## Contribute
 
 Before you contribute to the MongoDB Community Kubernetes Operator, please read:

config/samples/mongodb.com_v1_mongodbcommunity_cr_podantiaffinity.yaml

@@ -22,16 +22,18 @@ spec:
           db: admin
       scramCredentialsSecretName: my-scram
   statefulSet:
+# NOTE: Overwriting the "app" labelSelectors via the sts wrapper is not supported since this labelselector is not
+# getting propagated to the service. You can add others like defined below
     spec:
       selector:
         matchLabels:
-          app: mongodb
+          app.kubernetes.io/name: mongodb
       template:
         metadata:
           # label the pod which is used by the "labelSelector" in podAntiAffinty
           # you can label it witch some other labels as well -- make sure it change the podAntiAffinity labelselector accordingly
           labels:
-            app: mongodb
+           app.kubernetes.io/name: mongodb
         spec:
           affinity:
             podAntiAffinity:
@@ -40,7 +42,7 @@ spec:
                   podAffinityTerm:
                     labelSelector:
                       matchExpressions:
-                        - key: app
+                        - key: app.kubernetes.io/name
                           operator: In
                           values:
                             - mongodb

pkg/automationconfig/automation_config.go

@@ -127,15 +127,15 @@ type LogRotate struct {
 }
 
 type Process struct {
-	Name                        string      `json:"name"`
-	Disabled                    bool        `json:"disabled"`
-	HostName                    string      `json:"hostname"`
-	Args26                      objx.Map    `json:"args2_6"`
-	FeatureCompatibilityVersion string      `json:"featureCompatibilityVersion"`
-	ProcessType                 ProcessType `json:"processType"`
-	Version                     string      `json:"version"`
-	AuthSchemaVersion           int         `json:"authSchemaVersion"`
-	LogRotate                   AcLogRotate `json:"LogRotate,omitempty"`
+	Name                        string       `json:"name"`
+	Disabled                    bool         `json:"disabled"`
+	HostName                    string       `json:"hostname"`
+	Args26                      objx.Map     `json:"args2_6"`
+	FeatureCompatibilityVersion string       `json:"featureCompatibilityVersion"`
+	ProcessType                 ProcessType  `json:"processType"`
+	Version                     string       `json:"version"`
+	AuthSchemaVersion           int          `json:"authSchemaVersion"`
+	LogRotate                   *AcLogRotate `json:"LogRotate,omitempty"`
 }
 
 func (p *Process) SetPort(port int) *Process {
@@ -181,12 +181,12 @@ func (p *Process) SetLogRotate(lr *CrdLogRotate) *Process {
 }
 
 // ConvertCrdLogRotateToAC converts a CrdLogRotate to an AcLogRotate representation.
-func ConvertCrdLogRotateToAC(lr *CrdLogRotate) AcLogRotate {
+func ConvertCrdLogRotateToAC(lr *CrdLogRotate) *AcLogRotate {
 	if lr == nil {
-		return AcLogRotate{}
+		return &AcLogRotate{}
 	}
 
-	return AcLogRotate{
+	return &AcLogRotate{
 		LogRotate: LogRotate{
 			TimeThresholdHrs:                lr.TimeThresholdHrs,
 			NumUncompressed:                 lr.NumUncompressed,

pkg/automationconfig/automation_config_secret_test.go

@@ -72,6 +72,29 @@ func TestEnsureSecret(t *testing.T) {
 		assert.Equal(t, float64(1), acFromBytes.Processes[0].LogRotate.PercentOfDiskspace)
 	})
 
+	t.Run("test LogRotate marshal and unmarshal if not set", func(t *testing.T) {
+
+		desiredAutomationConfig, err = NewBuilder().SetMembers(3).AddProcessModification(func(i_ int, p *Process) {}).Build()
+		assert.NoError(t, err)
+
+		s := secret.Builder().
+			SetName(secretNsName.Name).
+			SetNamespace(secretNsName.Namespace).
+			Build()
+
+		secretGetUpdateCreator := &mockSecretGetUpdateCreator{secret: &s}
+
+		ac, err := EnsureSecret(secretGetUpdateCreator, secretNsName, []metav1.OwnerReference{}, desiredAutomationConfig)
+		assert.NoError(t, err)
+		assert.Equal(t, desiredAutomationConfig, ac, "The config should be returned if there is not one currently.")
+
+		bytes := s.Data[ConfigKey]
+		acFromBytes, err := FromBytes(bytes)
+		assert.NoError(t, err)
+		assert.NotEqual(t, &AcLogRotate{}, acFromBytes.Processes[0].LogRotate)
+		assert.Nil(t, acFromBytes.Processes[0].LogRotate)
+	})
+
 	t.Run("When the existing Automation Config is different the Automation Config Changes", func(t *testing.T) {
 
 		oldAc, err := newAutomationConfig()

scripts/dev/dev_config.py

@@ -120,6 +120,14 @@ def mongodb_image_repo_url(self) -> str:
     def agent_image(self) -> str:
         return self._config["agent_image"]
 
+    @property
+    def local_operator(self) -> str:
+        return self._config["mdb_local_operator"]
+
+    @property
+    def kube_config(self) -> str:
+        return self._config["kubeconfig"]
+
     @property
     def agent_image_dev(self) -> str:
         return self._get_dev_image("agent_image_dev", "agent_image")

scripts/dev/get_e2e_env_vars.py

@@ -33,6 +33,8 @@ def _get_e2e_test_envs(dev_config: DevConfig) -> Dict[str, str]:
         "MONGODB_REPO_URL": dev_config.mongodb_image_repo_url,
         "HELM_CHART_PATH": os.path.abspath("./helm-charts/charts/community-operator"),
         "MDB_IMAGE_TYPE": dev_config.image_type,
+        "MDB_LOCAL_OPERATOR": dev_config.local_operator,
+        "KUBECONFIG": dev_config.kube_config,
     }
 
 

scripts/dev/setup_sa.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+service_accounts=$(kubectl get serviceaccounts -n "${NAMESPACE}" -o jsonpath='{.items[*].metadata.name}')
+
+for service_account in $service_accounts; do
+  kubectl patch serviceaccount "$service_account" -n "${NAMESPACE}" -p "{\"imagePullSecrets\": [{\"name\": \"image-registries-secret\"}]}"
+done