chore: Enable the ablity to toggle search feature in Dockerfile and Kubernetes deployment templates

Author: tsviz

Dockerfile

@@ -5,8 +5,9 @@ ENV USER_NAME=postgres
 ENV PASSWORD=password
 ENV CHANGELOG_VERSION=master.xml
 ENV SPRING_JPA_PROPERTIES_HIBERNATE_DEFAULT_SCHEMA=public
+ENV SEARCH_FEATURE_FLAG=false
 RUN mkdir workspace
 WORKDIR /workspace/
 COPY target/salesmanager-*-SNAPSHOT.jar .
 EXPOSE 8086
-CMD ["/bin/sh", "-c", "java -jar salesmanager-*-SNAPSHOT.jar --spring.datasource.url=${DB_URL} --spring.datasource.username=${USER_NAME} --spring.datasource.password=${PASSWORD} --spring.redis.port=6379 --spring.redis.host=${REDIS_HOST} --spring.liquibase.change-log=classpath:db/changelog/${CHANGELOG_VERSION}"]
+CMD ["/bin/sh", "-c", "java -DenableSearchFeature=${SEARCH_FEATURE_FLAG} -jar salesmanager-*-SNAPSHOT.jar --spring.datasource.url=${DB_URL} --spring.datasource.username=${USER_NAME} --spring.datasource.password=${PASSWORD} --spring.redis.port=6379 --spring.redis.host=${REDIS_HOST} --spring.liquibase.change-log=classpath:db/changelog/${CHANGELOG_VERSION}"]

build_and_run_app_in_container.sh

@@ -25,7 +25,8 @@ trap cleanup EXIT
 
 set -e # Exit immediately if a command exits with a non-zero status.
 # Getting local ip address from ifconfig 
-LOCAL_IP=$(ifconfig | grep 'inet ' | grep -Fv 127.0.0.1 | awk '{print $2}')
+# LOCAL_IP=$(ifconfig | grep 'inet ' | grep -Fv 127.0.0.1 | awk '{print $2}')
+LOCAL_IP=192.168.64.1
 # Run a postgresql container with a volume to persist data
 docker run -d -p 5432:5432 --name postgres_container -e POSTGRES_PASSWORD=Password123 -v postgresql-data:/var/lib/postgresql/data postgres
 # [Optional] Run any previous migrations and tag the latest version with Liquibase

my-chart/templates/spring-app-deployment-v1.yaml

@@ -31,6 +31,8 @@ spec:
           value: {{ .Values.v1.springAppContainer.env.redisHost }}
         - name: KUBERNETES_CLUSTER_DOMAIN
           value: {{ .Values.kubernetesClusterDomain }}
+        - name: SEARCH_FEATURE_FLAG
+          value: {{ .Values.v1.springAppContainer.env.searchFeatureEnabled | quote }}
         image: {{ .Values.v1.springAppContainer.image.repository }}:{{ .Values.v1.springAppContainer.image.tag }}
         imagePullPolicy: Always
         name: spring-app-container

my-chart/templates/spring-app-deployment-v2.yaml

@@ -29,6 +29,8 @@ spec:
           value: {{ .Values.v2.springAppContainer.env.changelogVersion }}
         - name: REDIS_HOST
           value: {{ .Values.v2.springAppContainer.env.redisHost }}
+        - name: SEARCH_FEATURE_FLAG
+          value: {{ .Values.v2.springAppContainer.env.searchFeatureFlag | quote }}
         image: {{ .Values.v2.springAppContainer.image.repository }}:{{ .Values.v2.springAppContainer.image.tag }}
         imagePullPolicy: Always
         name: spring-app-container

my-chart/values.yaml

@@ -1,15 +1,16 @@
 v1:
-  replicas: 1
+  replicas: 4
   springAppContainer:
     env:
       changelogVersion: changelog_version-3.3.xml
       dbUrl: jdbc:postgresql://postgres-database-service:5432/postgres
       password: admin123
       redisHost: redis-database-service
       userName: postgresadmin
+      searchFeatureEnabled: "false"
     image:
       repository: ghcr.io/octodemo/java-springboot-demo
-      tag: "199"
+      tag: "9999"
     resources:
       limits:
         cpu: "1"
@@ -18,17 +19,18 @@ v1:
         cpu: 125m
         memory: 128Mi
 v2:
-  replicas: 3
+  replicas: 0
   springAppContainer:
     env:
       changelogVersion: changelog_version-3.3.xml
       dbUrl: jdbc:postgresql://postgres-database-service:5432/postgres
       password: admin123
       redisHost: redis-database-service
       userName: postgresadmin
+      searchFeatureFlag: "true"
     image:
       repository: ghcr.io/octodemo/java-springboot-demo
-      tag: "198"
+      tag: "9999"
     resources:
       limits:
         cpu: "1"

src/main/resources/static/js/styles.js

@@ -44,7 +44,6 @@ if (window.enableSearchFeature) {
         '--th-bg-color': '#2196F3',
         '--a-color': '#2196F3',
         '--tr-bg-color': '#c2e0fb',
-        '--a-color': '#2196F3',
     };
 } else {
     themeColors = {
@@ -54,7 +53,6 @@ if (window.enableSearchFeature) {
         '--tr-bg-color': '#fbfde3',
         '--button-color': '#4CAF50',
         '--button-hover-color': '#388E3C',
-        '--a-color': '#4CAF50',
     };
 }