fixup post reviews

Author: benzekrimaha

.github/workflows/end2end.yaml

@@ -165,12 +165,12 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: remove existing tar file
-        run: make remove-tar
-        working-directory: ./solution-base/mongodb
       - name: fetch mongo charts
         run: make fetch-mongodb-sharded
         working-directory: ./solution-base/mongodb
+      - name: remove configsrv file
+        run: rm -vf charts/mongodb-sharded/templates/config-server/config-server-service.yaml || echo "Failed to remove"
+        working-directory: ./solution-base/mongodb
       - name: apply patches to charts
         run: make patch
         working-directory: ./solution-base/mongodb

solution-base/mongodb/Makefile

@@ -5,34 +5,21 @@ CHART_REPO:="https://charts.bitnami.com/bitnami"
 CHART_MONGO_SHARDED_VERSION:="7.9.1"
 
 PATCH_DIR:="${ROOT_DIR}/patches"
-PATCH_FILES:=$(shell ls ${PATCH_DIR}/* | grep -v mongodb-sharded-add-configsvr-service-file.patch)
+PATCH_FILES:=$(shell ls -d ${PATCH_DIR}/*)
 HELM=helm
 
-.PHONY: fetch patch remove-tar
+.PHONY: fetch patch
 
 fetch-mongodb-sharded:
+	@rm -rf ${CHART_DIR}
 	@${HELM} fetch mongodb-sharded \
 		--repo ${CHART_REPO} \
 		--version ${CHART_MONGO_SHARDED_VERSION} \
 		--untar \
 		--untardir ${CHART_DIR}
 
 patch:
-	@if [ -z "${PATCH_FILES}" ]; then \
-		echo "No patch files found in ${PATCH_DIR}"; \
-		exit 1; \
-	fi
-	@echo "Checking patches..."
-	@for patch in ${PATCH_FILES}; do \
-		echo "Checking $$patch"; \
-		git apply --check "$$patch" || { echo "Patch check failed for $$patch"; exit 1; }; \
-	done
-	@echo "Applying patches..."
 	@for patch in ${PATCH_FILES}; do \
 		echo "Applying $$patch"; \
-		git apply "$$patch" || { echo "Patch apply failed for $$patch"; exit 1; }; \
+		git apply "$$patch"; \
 	done
-	@echo "Patches applied successfully"
-
-remove-tar:
-	@rm -rf ${CHART_DIR}/mongodb-sharded-${CHART_MONGO_SHARDED_VERSION}.tgz

solution-base/mongodb/charts/mongodb-sharded/templates/config-server/config-server-service.yaml

@@ -43,5 +43,5 @@ spec:
       {{- include "common.tplvalues.render" (dict "value" .Values.service.extraPorts "context" $) | nindent 4 }}
     {{- end }}
   selector: {{ include "common.labels.matchLabels" . | nindent 4 }}
-    app.kubernetes.io/component: configsvr 
+    app.kubernetes.io/component: configsvr
   sessionAffinity: {{ default "None" .Values.service.sessionAffinity }}

solution-base/mongodb/patches/mongodb-sharded-add-configsvr-service-file.patch

@@ -1,9 +1,9 @@
 diff --git a/solution-base/mongodb/charts/mongodb-sharded/templates/config-server/config-server-service.yaml b/solution-base/mongodb/charts/mongodb-sharded/templates/config-server/config-server-service.yaml
 new file mode 100644
-index fad94092..825b0161 100644
+index 00000000..fad94092
 --- /dev/null
 +++ b/solution-base/mongodb/charts/mongodb-sharded/templates/config-server/config-server-service.yaml
-@@ -0,0 +1,41 @@
+@@ -0,0 +1,47 @@
 +apiVersion: v1
 +kind: Service
 +metadata:
@@ -40,7 +40,6 @@ index fad94092..825b0161 100644
 +      {{- else if eq .Values.service.type "ClusterIP" }}
 +      nodePort: null
 +      {{- end }}
-+      {{- end }}
 +    {{- if .Values.metrics.enabled }}
 +    - name: metrics
 +      port: 9216
@@ -51,4 +50,4 @@ index fad94092..825b0161 100644
 +    {{- end }}
 +  selector: {{ include "common.labels.matchLabels" . | nindent 4 }}
 +    app.kubernetes.io/component: configsvr
-+  sessionAffinity: {{ default "None" .Values.service.sessionAffinity }}
++  sessionAffinity: {{ default "None" .Values.service.sessionAffinity }}

solution-base/mongodb/patches/mongodb-sharded-add-create-app-user-sharded.patch

@@ -0,0 +1,8 @@
+diff --git a/solution-base/mongodb/charts/mongodb-sharded/files/docker-entrypoint-initdb.d/create-app-user-sharded.sh b/solution-base/mongodb/charts/mongodb-sharded/files/docker-entrypoint-initdb.d/create-app-user-sharded.sh
+new file mode 120000
+index 00000000..61f367cb
+--- /dev/null
++++ b/solution-base/mongodb/charts/mongodb-sharded/files/docker-entrypoint-initdb.d/create-app-user-sharded.sh
+@@ -0,0 +1 @@
++../../../../scripts/create-app-user.sh
+\ No newline at end of file

solution-base/mongodb/patches/mongodb-sharded-set-default-write-concern-majority-sharded.patch

@@ -0,0 +1,8 @@
+diff --git a/solution-base/mongodb/charts/mongodb-sharded/files/docker-entrypoint-initdb.d/set-default-write-concern-majority-sharded.sh b/solution-base/mongodb/charts/mongodb-sharded/files/docker-entrypoint-initdb.d/set-default-write-concern-majority-sharded.sh
+new file mode 120000
+index 00000000..9d7ca4a1
+--- /dev/null
++++ b/solution-base/mongodb/charts/mongodb-sharded/files/docker-entrypoint-initdb.d/set-default-write-concern-majority-sharded.sh
+@@ -0,0 +1 @@
++../../../../scripts/set-default-write-concern-majority.sh
+\ No newline at end of file