fix: several issues causing releases to fail (#10)

devops-ia · Oct 30, 2024 · 4cbf6a3 · 4cbf6a3
1 parent fae8373
commit 4cbf6a3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/charts/cruise-control/templates/configmap.yaml b/charts/cruise-control/templates/configmap.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     {{- include "cruise-control.labels" . | nindent 4 }}
 data:
-  cruise-control.properties: |
+  cruisecontrol.properties: |
     {{- range $key, $value := .Values.config }}
       {{- $valueStr := printf "%v" $value }}
       {{- if and (regexMatch "^[0-9]+$" $valueStr) (lt (len $valueStr) 10) }}
@@ -22,7 +22,7 @@ data:
     {{- end }}
         capacity.config.file=config/{{ .Values.capacity.type }}.json
 
-  clusterConfigs.json:
+  clusterConfigs.json: |
     {{- .Values.cluster | toPrettyJson | nindent 4 }}
 
   {{ .Values.capacity.type }}.json: |

diff --git a/charts/cruise-control/templates/deployment.yaml b/charts/cruise-control/templates/deployment.yaml
@@ -64,8 +64,8 @@ spec:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:
             - name: config-volume
-              mountPath: /cruise-control/config/cruise-control.properties
-              subPath: cruise-control.properties
+              mountPath: /cruise-control/config/cruisecontrol.properties
+              subPath: cruisecontrol.properties
             - name: config-volume
               mountPath: /cruise-control/config/{{ .Values.capacity.type }}.json
               subPath: {{ .Values.capacity.type }}.json

diff --git a/charts/cruise-control/values.yaml b/charts/cruise-control/values.yaml
@@ -58,7 +58,7 @@ service:
   # -- NodePort port (only when type is NodePort)
   # nodePort: 32000
   # -- Pod expose port
-  targetPort: 4000
+  targetPort: 9090
 
 # -- Ingress configuration to expose app
 ingress:
@@ -449,20 +449,20 @@ log4j:
   # Loggers
   logger.cruisecontrol.name: com.linkedin.kafka.cruisecontrol
   logger.cruisecontrol.level: info
-  logger.cruisecontrol.appenderRef.kafkaCruiseControlAppender.Ref: kafkaCruiseControlFile
+  logger.cruisecontrol.appenderRef.kafkaCruiseControlAppender.ref: kafkaCruiseControlFile
 
   logger.detector.name: com.linkedin.kafka.cruisecontrol.detector
   logger.detector.level: info
-  logger.detector.appenderRef.kafkaCruiseControlAppender.Ref: kafkaCruiseControlFile
+  logger.detector.appenderRef.kafkaCruiseControlAppender.ref: kafkaCruiseControlFile
 
   logger.operationLogger.name: operationLogger
   logger.operationLogger.level: info
-  logger.operationLogger.appenderRef.operationAppender.Ref: operationFile
+  logger.operationLogger.appenderRef.operationAppender.ref: operationFile
 
   logger.CruiseControlPublicAccessLogger.name: CruiseControlPublicAccessLogger
   logger.CruiseControlPublicAccessLogger.level: info
-  logger.CruiseControlPublicAccessLogger.appenderRef.requestAppender.Ref: requestFile
+  logger.CruiseControlPublicAccessLogger.appenderRef.requestAppender.ref: requestFile
 
   rootLogger.appenderRefs: console, kafkaCruiseControlAppender
-  rootLogger.appenderRef.console.Ref: STDOUT
-  rootLogger.appenderRef.kafkaCruiseControlAppender.Ref: kafkaCruiseControlFile
+  rootLogger.appenderRef.console.ref: STDOUT
+  rootLogger.appenderRef.kafkaCruiseControlAppender.ref: kafkaCruiseControlFile