Merge pull request #3658 from grafana/nm/cloudcost-exporter-update-port-name

[cloudcost-exporter] Fix portName

Author: nikimanoledaki

charts/cloudcost-exporter/Chart.yaml

@@ -5,7 +5,7 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 1.0.1
+version: 1.0.2
 
 # This is the version of cloudcost-exporter to be deployed, which should be incremented
 # with each release.

charts/cloudcost-exporter/README.md

@@ -2,7 +2,7 @@
 
 Cloud Cost Exporter exports cloud provider agnostic cost metrics to Prometheus.
 
-![Version: 1.0.1](https://img.shields.io/badge/Version-1.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.7.13](https://img.shields.io/badge/AppVersion-0.7.13-informational?style=flat-square)
+![Version: 1.0.2](https://img.shields.io/badge/Version-1.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.7.13](https://img.shields.io/badge/AppVersion-0.7.13-informational?style=flat-square)
 
 ## Installing the Chart
 
@@ -38,6 +38,7 @@ Documentation per CSP will vary (especially when it comes to authentication). Be
 | nameOverride | string | `""` | Override the name of the release |
 | nodeSelector | object | `{}` | Node selector |
 | podAnnotations | object | `{}` | Annotations to add to the pod |
+| portName | string | `"http"` | Container port name |
 | replicaCount | int | `1` | Number of replicas |
 | resources.limits.cpu | string | `"2"` | CPU limit |
 | resources.limits.memory | string | `"2Gi"` | Memory limit |
@@ -46,7 +47,6 @@ Documentation per CSP will vary (especially when it comes to authentication). Be
 | revisionHistoryLimit | int | `10` | Number of old versions to retain to allow rollback |
 | securityContext.fsGroup | int | `10001` | Filesystem group to associate for each pod |
 | service.port | int | `8080` | Service port |
-| service.portName | string | `"http"` | Service port name |
 | service.protocol | string | `"TCP"` | Service protocol |
 | service.type | string | `"ClusterIP"` | Service type |
 | serviceAccount.annotations | object | `{}` | Annotations to add to the service account |

charts/cloudcost-exporter/templates/deployment.yaml

@@ -34,17 +34,17 @@ spec:
             - {{ . }}
           {{- end }}
           ports:
-            - name: {{ .Values.service.portName }}
+            - name: {{ .Values.portName }}
               containerPort: {{ .Values.service.port }}
               protocol: TCP
           livenessProbe:
             httpGet:
               path: /
-              port: {{ .Values.service.portName }}
+              port: {{ .Values.portName }}
           readinessProbe:
             httpGet:
               path: /
-              port: {{ .Values.service.portName }}
+              port: {{ .Values.portName }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:

charts/cloudcost-exporter/templates/service.yaml

@@ -8,7 +8,7 @@ spec:
   type: {{ .Values.service.type }}
   ports:
     - port: {{ .Values.service.port }}
-      targetPort: http
+      targetPort: {{ .Values.portName }}
       protocol: {{ .Values.service.protocol }}
       name: http
   selector:

charts/cloudcost-exporter/values.yaml

@@ -19,6 +19,9 @@ imagePullSecrets: []
 # -- Override the name of the release
 nameOverride: ""
 
+# -- Container port name
+portName: http
+
 # -- Override the full name of the chart and release
 fullnameOverride: ""
 
@@ -46,8 +49,6 @@ service:
   type: ClusterIP
   # -- Service port
   port: 8080
-  # -- Service port name
-  portName: http
   # -- Service protocol
   protocol: TCP