Merge branch 'master' into master

deliveryhero · Aug 10, 2023 · b5c47b7 · b5c47b7
2 parents 8f0184e + 6ac447a
commit b5c47b7
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 15 deletions.
diff --git a/stable/gripmock/Chart.yaml b/stable/gripmock/Chart.yaml
@@ -9,7 +9,7 @@ description: |
   >
   > Version v1.11.1-beta release is available by overriding the `image.tag` in your `values.yaml` file. This version supports **NO** declaration of `go_package`.
 type: application
-version: 1.0.0
+version: 1.1.1
 appVersion: "1.10.1"
 maintainers:
   - name: MarceloAplanalp

diff --git a/stable/gripmock/README.md b/stable/gripmock/README.md
@@ -1,6 +1,6 @@
 # gripmock
 
-![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.10.1](https://img.shields.io/badge/AppVersion-1.10.1-informational?style=flat-square)
+![Version: 1.1.1](https://img.shields.io/badge/Version-1.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.10.1](https://img.shields.io/badge/AppVersion-1.10.1-informational?style=flat-square)
 
 A chart to install [gripmock](https://github.com/tokopedia/gripmock). A mock server for GRPC services. It uses `.proto` file(s) to generate the implementation of gRPC service(s) for you.
 
@@ -65,6 +65,10 @@ helm install my-release deliveryhero/gripmock -f values.yaml
 | ingress.hosts[0].host | string | `"chart-example.local"` |  |
 | ingress.hosts[0].paths[0].path | string | `"/"` |  |
 | ingress.hosts[0].paths[0].pathType | string | `"ImplementationSpecific"` |  |
+| ingress.hosts[0].paths[0].port | int | `4770` |  |
+| ingress.hosts[0].paths[1].path | string | `"/"` |  |
+| ingress.hosts[0].paths[1].pathType | string | `"ImplementationSpecific"` |  |
+| ingress.hosts[0].paths[1].port | int | `4471` |  |
 | ingress.tls | list | `[]` |  |
 | labels | object | `{}` | Any extra label to apply to all resources |
 | nameOverride | string | `""` |  |

diff --git a/stable/gripmock/templates/ingress.yaml b/stable/gripmock/templates/ingress.yaml
@@ -1,6 +1,5 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "gripmock.fullname" . -}}
-{{- $svcPort := 4770 -}}
 {{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
   {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
   {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
@@ -51,10 +50,10 @@ spec:
               service:
                 name: {{ $fullName }}
                 port:
-                  number: {{ $svcPort }}
+                  number: {{ .port | default 4770 }}
               {{- else }}
               serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
+              servicePort: {{ .port | default 4770 }}
               {{- end }}
           {{- end }}
     {{- end }}

diff --git a/stable/gripmock/templates/service.yaml b/stable/gripmock/templates/service.yaml
@@ -11,5 +11,9 @@ spec:
       targetPort: 4770
       protocol: TCP
       name: grpc
+    - port: 4771
+      targetPort: 4771
+      protocol: TCP
+      name: stubs
   selector:
     {{- include "gripmock.selectorLabels" . | nindent 4 }}
diff --git a/stable/gripmock/values.yaml b/stable/gripmock/values.yaml
@@ -45,6 +45,10 @@ ingress:
       paths:
         - path: /
           pathType: ImplementationSpecific
+          port: 4770
+        - path: /
+          pathType: ImplementationSpecific
+          port: 4471
   tls: []
   #  - secretName: chart-example-tls
   #    hosts:

diff --git a/stable/kube-bench/Chart.yaml b/stable/kube-bench/Chart.yaml
@@ -1,9 +1,9 @@
 ---
 apiVersion: v2
-appVersion: 0.6.16
+appVersion: 0.6.17
 description: "Helm chart to deploy run kube-bench as a cronjob on aks, gke or eks."
 name: kube-bench
-version: 0.1.12
+version: 0.1.13
 home: https://github.com/aquasecurity/kube-bench
 icon: https://raw.githubusercontent.com/aquasecurity/kube-bench/0d1bd2bbd95608957be024c12d03a0510325e5e2/docs/images/kube-bench.png
 sources:

diff --git a/stable/kube-bench/README.md b/stable/kube-bench/README.md
@@ -1,6 +1,6 @@
 # kube-bench
 
-![Version: 0.1.12](https://img.shields.io/badge/Version-0.1.12-informational?style=flat-square) ![AppVersion: 0.6.16](https://img.shields.io/badge/AppVersion-0.6.16-informational?style=flat-square)
+![Version: 0.1.13](https://img.shields.io/badge/Version-0.1.13-informational?style=flat-square) ![AppVersion: 0.6.17](https://img.shields.io/badge/AppVersion-0.6.17-informational?style=flat-square)
 
 Helm chart to deploy run kube-bench as a cronjob on aks, gke or eks.
 
@@ -54,12 +54,13 @@ helm install my-release deliveryhero/kube-bench -f values.yaml
 | fullnameOverride | string | `""` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"aquasec/kube-bench"` |  |
-| image.tag | string | `"v0.6.16"` |  |
+| image.tag | string | `"v0.6.17"` |  |
 | nameOverride | string | `""` |  |
 | nodeSelector | object | `{}` |  |
 | podLabels | object | `{}` |  |
 | provider | string | `"eks"` |  |
 | resources | object | `{}` |  |
+| securityContext | object | `{}` |  |
 | serviceAccount.annotations | object | `{}` |  |
 | serviceAccount.create | bool | `false` |  |
 | tolerations | list | `[]` |  |

diff --git a/stable/kube-bench/templates/cron.yaml b/stable/kube-bench/templates/cron.yaml
@@ -31,6 +31,9 @@ spec:
               {{- with .Values.volumeMounts }}
               volumeMounts: {{ toYaml . | nindent 16 }}
               {{- end }}
+              {{- with .Values.securityContext }}
+              securityContext: {{ toYaml . | nindent 16 }}
+              {{- end }}
           {{- with .Values.volumes }}
           volumes: {{ toYaml . | nindent 12 }}
           {{- end }}

diff --git a/stable/kube-bench/values.yaml b/stable/kube-bench/values.yaml
@@ -10,7 +10,7 @@ cronjob:
 
 image:
   repository: aquasec/kube-bench
-  tag: v0.6.16
+  tag: v0.6.17
   pullPolicy: IfNotPresent
 
 serviceAccount:
@@ -19,6 +19,14 @@ serviceAccount:
   # Annotations to add to the service account
   annotations: {}
 
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+# runAsUser: 1000
+
 extraLabels: {}
 podLabels: {}
 resources: {}

diff --git a/stable/kubecost-reports-exporter/Chart.yaml b/stable/kubecost-reports-exporter/Chart.yaml
@@ -6,7 +6,7 @@ description: |
   if you are using old installation please use v1 chart
 home: https://www.kubecost.com
 type: application
-version: 2.0.1
+version: 2.0.2
 appVersion: "2.0.0"
 maintainers:
   - name: nyambati

diff --git a/stable/kubecost-reports-exporter/README.md b/stable/kubecost-reports-exporter/README.md
@@ -1,6 +1,6 @@
 # kubecost-reports-exporter
 
-![Version: 2.0.1](https://img.shields.io/badge/Version-2.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square)
+![Version: 2.0.2](https://img.shields.io/badge/Version-2.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square)
 
 Helm chart for exporting kubernetes cost reports to AWS s3 bucket.
 N/B We have updated chart to use V2 scripts using allocations and assets api.
@@ -53,9 +53,10 @@ helm install my-release deliveryhero/kubecost-reports-exporter -f values.yaml
 | env | object | `{}` | Extra environment variables |
 | fullnameOverride | string | `""` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
-| image.repository | string | `"thomasnyambati/kubecost-reports-exporter"` |  |
+| image.repository | string | `"thomasnyambati/kubecost-reports-exporter"` | The container image to use |
+| image.tag | string | `""` |  |
 | imagePullSecrets | list | `[]` |  |
-| kubecost.allocationCostUrl | string | `"/model/allocation?window=15m&aggregate=pod"` | Url for allocation api cost reports |
+| kubecost.allocationCostUrl | string | `"/model/allocation?window=15m&aggregate=pod&includeAggregatedMetadata=true"` | Url for allocation api cost reports |
 | kubecost.assetsCostUrl | string | `"/model/assets?window=15m&filterCategories=Compute&filterTypes=Node&filterServices=Kubernetes"` | Url for assets api cost reports |
 | kubecost.bucketName | string | `"kubecost-reports-exporter"` | S3 Bucket name for reports export |
 | kubecost.clusters[0].endpoint | string | `"http://kubecost-cost-analyzer:9090"` |  |

diff --git a/stable/kubecost-reports-exporter/values.yaml b/stable/kubecost-reports-exporter/values.yaml
@@ -8,8 +8,11 @@ successfulJobsHistoryLimit: 1
 concurrencyPolicy: Forbid
 
 image:
+  # image.repository -- The container image to use
   repository: thomasnyambati/kubecost-reports-exporter
   pullPolicy: IfNotPresent
+  # Overrides the image tag whose default is the chart appVersion.
+  tag: ""
 
 imagePullSecrets: []
 nameOverride: ""
@@ -32,7 +35,7 @@ kubecost:
   # kubecost.bucketName -- S3 Bucket name for reports export
   bucketName: kubecost-reports-exporter
   # kubecost.allocationCostUrl -- Url for allocation api cost reports
-  allocationCostUrl: "/model/allocation?window=15m&aggregate=pod"
+  allocationCostUrl: "/model/allocation?window=15m&aggregate=pod&includeAggregatedMetadata=true"
   # kubecost.assetsCostUrl -- Url for assets api cost reports
   assetsCostUrl: "/model/assets?window=15m&filterCategories=Compute&filterTypes=Node&filterServices=Kubernetes"
   # kubecost.diagnosticsUrl -- Url for prometheus diagnostics