Make newman kubed again

.github/workflows/build-newman.yaml

@@ -13,6 +13,7 @@ on:
   pull_request:
     paths:
       - 'docker/**'
+      - 'helm/**'
   # push:
   #   branches:
   #     - master
@@ -43,8 +44,8 @@ jobs:
         run: |
           # Get the latest tag from ECR (or set to default if no tags)
           LATEST_TAG=$(aws ecr describe-images --repository-name $ECR_REPOSITORY \
-          --query 'sort_by(imageDetails, &imagePushedAt)[-1].imageTags[0]' \
-          --output text 2>/dev/null | awk '{print ($0 == "None" || $0 == "" ? "0.1.8" : $0)}')
+                      --query 'sort_by(imageDetails, &imagePushedAt)[-1].imageTags[0]' \
+                      --output text 2>/dev/null | awk '{print ($0 == "None" || $0 == "" ? "0.1.8" : $0)}')
 
           # Increment the patch version by 1
           IFS='.' read -r -a TAG_PARTS <<< "$LATEST_TAG"
@@ -55,21 +56,21 @@ jobs:
           echo "image_tag=$NEW_TAG" >> $GITHUB_ENV
 
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+      # - name: Set up Docker Buildx
+      #   uses: docker/setup-buildx-action@v3
 
-      - name: Build, tag, and push image to Amazon ECR
-        id: build-image
-        uses: docker/build-push-action@v6
-        timeout-minutes: 15
-        with:
-          platforms: |
-            linux/amd64
-          context: './docker'
-          file: './docker/Dockerfile.k8s'
-          push: true
-          tags: |
-            ${{ steps.login-ecr.outputs.registry }}/${{ env.ECR_REPOSITORY }}:${{ env.image_tag }}
+      # - name: Build, tag, and push image to Amazon ECR
+      #   id: build-image
+      #   uses: docker/build-push-action@v6
+      #   timeout-minutes: 15
+      #   with:
+      #     platforms: |
+      #       linux/amd64
+      #     context: './docker'
+      #     file: './docker/Dockerfile.k8s'
+      #     push: true
+      #     tags: |
+      #       ${{ steps.login-ecr.outputs.registry }}/${{ env.ECR_REPOSITORY }}:${{ env.image_tag }}
 
       # an event for calling a listening workflow
       # - name: Update helm chart
@@ -78,3 +79,25 @@ jobs:
       #     event-type: helm-chart-update
       #     client-payload: '{"application-image-tag": "${{ env.image_tag }}"}'
 
+  check-updated-charts:
+    runs-on: ubuntu-22.04
+    outputs:
+      chart-list: ${{ steps.get-changed-files.outputs.chart-list }}
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+      - name: get list of changed files
+        id: changed-files
+        uses: tj-actions/changed-files@v45
+        with:
+          since_last_remote_commit: true
+      - name: Get of changed helm charts changed files
+        id: get-changed-files
+        run: |
+          set -xe
+          for CHART in ${{ steps.changed-files.outputs.all_changed_files }}; do
+            [[ $(echo ${CHART} | grep 'helm/.*/') ]] && echo ${CHART} | awk -F / '{print $2}' >> changed_charts.txt
+          done
+          cat changed_charts.txt | uniq | jq --raw-input --slurp --compact-output 'split("\n") | map(select(length > 0))' > result.txt
+          cat result.txt
+          echo "chart-list=$(cat result.txt)" >> $GITHUB_OUTPUT

.gitignore

@@ -129,6 +129,9 @@ crashlytics-build.properties
 *.war
 *.ear
 
+# MongoDB data
+docker/data/*
+
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
@@ -268,4 +271,10 @@ tests-logs/
 logs
 elm-stuff
 *.keystore
-Main.js
+Main.js
+
+# Ignore helm charts
+*/*.tgz
+
+# Ignore passhprases
+*/ecrpass.*

docker/Dockerfile

@@ -8,10 +8,10 @@ ARG gid=1001
 RUN apt-get update -y
 RUN apt-get install coreutils wget -y
 
-ENV MAVEN_VERSION 3.6.3
-ENV MAVEN_FILE apache-maven-${MAVEN_VERSION}-bin.tar.gz
-ENV NODE_VERSION 22.11.0
-ENV NODE_FILE node-v${NODE_VERSION}-linux-x64.tar.gz
+ENV MAVEN_VERSION=3.6.3
+ENV MAVEN_FILE=apache-maven-${MAVEN_VERSION}-bin.tar.gz
+ENV NODE_VERSION=22.11.0
+ENV NODE_FILE=node-v${NODE_VERSION}-linux-x64.tar.gz
 
 # Jenkins is run with user `newman`, uid = 1000
 # If you bind mount a volume from the host or a data container,
@@ -21,7 +21,7 @@ RUN groupadd -g ${gid} ${group} \
 
 # Install Java.
 RUN apt-get install openjdk-8-jdk -y
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/
+ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/
 
 # Install Maven
 RUN wget --no-verbose -O /tmp/${MAVEN_FILE} \
@@ -31,7 +31,6 @@ RUN wget --no-verbose -O /tmp/${MAVEN_FILE} \
 RUN echo "9792c717f5845d952907d5144b8253c3  /tmp/${MAVEN_FILE}" | \
     md5sum -c
 
-
 # install in /opt/maven
 RUN mkdir -p /opt/maven
 
@@ -65,4 +64,13 @@ ENV PATH=$JAVA_HOME/bin:$PATH
 USER root
 RUN apt-get install sudo curl -y netbase
 
+RUN mkdir /.m2
+COPY . newman
+WORKDIR /newman
+RUN ls -lah
+RUN mvn clean install -DskipTests -Dmaven.repo.local=~/.m2/repository
+RUN mkdir -p /newman-server/bin \
+    && cp /newman/newman-server/target/newman-server-1.0.jar /newman-server/bin/newman-server.jar
+RUN chown -R ${user}:${group} /newman-server
+RUN rm -rf /newman
 USER ${user}

docker/Dockerfile.k8s

@@ -0,0 +1,78 @@
+FROM ubuntu:24.04
+
+ARG user=newman
+ARG group=newman
+ARG uid=1001
+ARG gid=1001
+
+RUN apt-get update -y
+RUN apt-get install coreutils wget -y
+
+ENV MAVEN_VERSION=3.6.3
+ENV MAVEN_FILE=apache-maven-${MAVEN_VERSION}-bin.tar.gz
+ENV NODE_VERSION=22.11.0
+ENV NODE_FILE=node-v${NODE_VERSION}-linux-x64.tar.gz
+
+# Jenkins is run with user `newman`, uid = 1000
+# If you bind mount a volume from the host or a data container,
+# ensure you use the same uid
+RUN groupadd -g ${gid} ${group} \
+    && useradd -d "/home/${user}" -u ${uid} -g ${gid} -m -s /bin/bash ${user}
+
+# Install Java.
+RUN apt-get update && apt-get install -y openjdk-8-jdk-headless unzip
+ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/
+
+# Install Maven
+RUN wget --no-verbose -O /tmp/${MAVEN_FILE} \
+    http://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/${MAVEN_FILE}
+
+# stop building if md5sum does not match
+RUN echo "9792c717f5845d952907d5144b8253c3  /tmp/${MAVEN_FILE}" | \
+    md5sum -c
+
+# install in /opt/maven
+RUN mkdir -p /opt/maven
+
+RUN tar xzf /tmp/${MAVEN_FILE} --strip-components=1 \
+    -C /opt/maven
+
+RUN ln -s /opt/maven/bin/mvn /usr/local/bin
+RUN rm -f /tmp/${MAVEN_FILE}
+
+# get node
+RUN echo 'get node tar.gz'
+RUN wget --no-verbose -O /tmp/${NODE_FILE} \
+    https://nodejs.org/dist/v${NODE_VERSION}/${NODE_FILE}
+
+RUN mkdir /opt/node
+
+# unpack node tar.gz
+RUN echo 'unpacking node tar.gz' && \
+    tar zxvf /tmp/${NODE_FILE} --strip-components=1 \
+    -C /opt/node && \
+    rm -f /tmp/${NODE_FILE}
+
+RUN ln -s /opt/node/bin/node /usr/local/bin && ln -s /opt/node/bin/npm /usr/local/bin
+
+RUN node --version && \
+     npm --version
+
+VOLUME /data/
+ENV PATH=$JAVA_HOME/bin:$PATH
+
+USER root
+RUN apt-get install sudo curl -y netbase
+
+RUN mkdir /.m2 && chown ${user}:${group} /.m2
+#COPY --chown=${user}:${group} --from=newman . /newman
+RUN wget https://github.com/giga-dev/newman/archive/refs/heads/master.zip -O /tmp/master.zip \
+    && unzip /tmp/master.zip -d /tmp \
+    && mv /tmp/newman-master /newman \
+    && rm /tmp/master.zip
+RUN chown -R ${user}:${group} /newman 
+USER ${user}
+WORKDIR /newman
+RUN mvn clean install
+WORKDIR /
+# ENTRYPOINT [ "sh", "-c", "/newman", "/newman/newman-server/bin/newman-server.sh"]

docker/docker-build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 DIRNAME=`cd $(dirname ${BASH_SOURCE[0]}) && pwd`
 
-docker build --build-arg user=$USER --build-arg uid=$(id -u) --build-arg gid=$(id -g) -t newman ${DIRNAME}
+docker build --build-arg user=$USER --build-arg uid=$(id -u) --build-arg gid=$(id -g) -t newman/newman-server:latest ${DIRNAME}
 
-docker pull mongo
+#docker pull mongo:4.0.27

docker/server-run.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 DIRNAME=`cd $(dirname ${BASH_SOURCE[0]}) && pwd`
-
+echo $DIRNAME
 MODE="-d"
 if [[ -n "$1" ]]; then
         if [[ "$1" == "-iii" ]]; then
@@ -10,7 +10,6 @@ if [[ -n "$1" ]]; then
         fi
 fi
 
-
 docker stop newman-server
 docker rm newman-server
 
@@ -21,4 +20,4 @@ while [[ -z "$(${cmd})" ]]; do
     sleep 5s
 done
 
-docker run ${MODE} --link mongo-server --rm -v "${DIRNAME}/..":"/newman" --name newman-server --user $(id -u) -p 8443:8443 newman "/newman/newman-server/bin/newman-server.sh"
+docker run ${MODE} --link mongo-server --rm -v "${DIRNAME}/..":"/newman" --name newman-server --user $(id -u) -p 8443:8443 newman "/newman/newman-server/bin/newman-server.sh"

helm/mongo-server/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

helm/mongo-server/Chart.yaml

@@ -0,0 +1,6 @@
+apiVersion: v2
+name: mongo-server
+description: A Helm chart for deploying MongoDB
+type: application
+version: 0.1.10
+appVersion: "4.0.27"

helm/mongo-server/templates/configmap.yaml

@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "{{ .Release.Name }}-config"
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: mongo-server
+data:
+  mongodb.conf: |
+    storage:
+      dbPath: /data/db
+    net:
+      bindIp: 0.0.0.0
+      port: 27017
+    security:
+      authorization: enabled

helm/mongo-server/templates/pvc.yaml

@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: "{{ .Release.Name }}-pvc"
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: mongo-server
+spec:
+  accessModes: {{ .Values.persistence.accessModes | toJson }}
+  resources:
+    requests:
+      storage: {{ .Values.persistence.size }}
+  storageClassName: {{ .Values.persistence.storageClass | quote }}

helm/mongo-server/templates/service.yaml

@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Release.Name }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: mongo-server
+spec:
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: {{ .Values.service.port }}
+  selector:
+    app: mongo-server