port related minor refactors

flipkart-incubator · Oct 12, 2024 · 508336d · 508336d
1 parent 4fc3c8a
commit 508336d
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 36 deletions.
diff --git a/.run/varadhi local [run].run.xml b/.run/varadhi local [run].run.xml
@@ -14,12 +14,12 @@
  <option value="--args=&quot;src/main/resources/configuration.yml&quot;" />
  </list>
  </option>
- <option name="vmOptions" value="-Dcom.sun.management.jmxremote.rmi.port=19991 -Dcom.sun.management.jmxremote.port=19990 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dvertx.disableDnsResolver=true -Dlog4j2.configurationFile=src/main/resources/log4j2.xml" />
+ <option name="vmOptions" value="-Dvertx.disableDnsResolver=true -Dlog4j2.configurationFile=src/main/resources/log4j2.xml" />
  </ExternalSystemSettings>
  <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
  <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
  <DebugAllEnabled>false</DebugAllEnabled>
  <RunAsTest>false</RunAsTest>
  <method v="2" />
  </configuration>
-</component>
+</component>
diff --git a/README.md b/README.md
@@ -64,7 +64,7 @@ Start [varadhi local \[run\]](.run%2Fvaradhi%20local%20%5Brun%5D.run.xml) Intell
 
 ## k8s Deployment
 
-```helm install varadhi setup/helm/varadhi -f setup/helm/varadhi/fcp.values.yaml```
+```helm install varadhi-server setup/helm/varadhi -f setup/helm/varadhi/values/server_values.yaml```
 ```helm install varadhi-controller setup/helm/varadhi -f setup/helm/varadhi/values/controller_values.yaml```
 
 ## Modules

diff --git a/setup/helm/test/service-server.yaml b/setup/helm/test/service-server.yaml
diff --git a/setup/helm/varadhi/templates/_server.tpl → setup/helm/varadhi/templates/_app.tpl b/setup/helm/varadhi/templates/_server.tpl → setup/helm/varadhi/templates/_app.tpl
@@ -1,7 +1,7 @@
 {{/*
 Varadhi Server configuration.
 */}}
-{{- define "configMap.varadhi.server" -}}
+{{- define "configMap.varadhi.app" -}}
 
 {{ with .Values.varadhi.app.member }}
 member:

diff --git a/setup/helm/varadhi/templates/app-configmap.yaml b/setup/helm/varadhi/templates/app-configmap.yaml
@@ -12,6 +12,4 @@ metadata:
  component: {{ .Values.deployment.name }}
 data:
  configuration.yml: |
- {{- if or (eq .Values.deployment.name "server") (eq .Values.deployment.name "controller") (eq .Values.deployment.name "consumer") }}
- {{ include "configMap.varadhi.server" . | nindent 4 }}
- {{- end }}
+ {{ include "configMap.varadhi.app" . | nindent 4 }}
diff --git a/setup/helm/varadhi/templates/deployment.yaml b/setup/helm/varadhi/templates/deployment.yaml
@@ -67,10 +67,10 @@ spec:
  fieldRef:
  fieldPath: metadata.name
  ports:
- - containerPort: 9990 # jmx remote port
+ - containerPort: {{ .Values.varadhi.app.ports.jmx }} # jmx remote port
  name: jmx
  {{- if .Values.varadhi.app.debug }}
- - containerPort: 5005 # jvm remote Debug port
+ - containerPort: {{ .Values.varadhi.app.ports.jvmDebug }} # jvm remote Debug port
  name: jvm-debug
  {{- end }}
  volumeMounts:

diff --git a/setup/helm/varadhi/templates/server-service.yaml b/setup/helm/varadhi/templates/server-service.yaml
@@ -23,8 +23,8 @@ spec:
  protocol: TCP
  name: server-http
  {{- if .Values.varadhi.app.debug }}
- - port: 5005
- targetPort: 5005
+ - port: {{ .Values.varadhi.app.ports.jvmDebug }}
+ targetPort: {{ .Values.varadhi.app.ports.jvmDebug }}
  protocol: TCP
  name: jvm-debug
  {{- end }}

diff --git a/setup/helm/varadhi/values.yaml b/setup/helm/varadhi/values.yaml
@@ -195,6 +195,9 @@ varadhi:
  roles: [ "Server", "Controller" ]
  cpuCount: 1
  nicMBps: 100
+ ports:
+ jmx: 9990
+ jvmDebug: 5005
 
 #############################################
 # Varadhi Server logging config