Merge branch 'main' of github.com:rh-mobb/charts

rh-mobb · May 30, 2024 · a619782 · a619782
2 parents ffb7870 + 9e69b79
commit a619782
Show file tree

Hide file tree

Showing 26 changed files with 239 additions and 347 deletions.
diff --git a/charts/aro-clf-am/Chart.yaml b/charts/aro-clf-am/Chart.yaml
@@ -3,7 +3,7 @@ name: aro-clf-am
 description: A Helm chart for Kubernetes
 
 type: application
-version: 0.1.1
+version: 0.1.2
 
 home: "https://rh-mobb.github.io/helm-charts/"
 

diff --git a/charts/aro-clf-am/values.yaml b/charts/aro-clf-am/values.yaml
@@ -18,7 +18,7 @@ image:
   repository: fluent/fluent-bit
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: 1.6
+  tag: 2.2
 
 nameOverride: ""
 fullnameOverride: ""

diff --git a/charts/aro-machinesets/Chart.yaml b/charts/aro-machinesets/Chart.yaml
@@ -3,7 +3,7 @@ name: aro-machinesets
 description: A Helm chart to configure machinesets for ARO
 type: application
 
-version: 0.4.0
+version: 0.5.0
 maintainers:
   - name: paulczar
 home: https://github.com/rh-mobb/helm-charts
diff --git a/charts/aro-machinesets/templates/machineset.yaml b/charts/aro-machinesets/templates/machineset.yaml
@@ -60,6 +60,9 @@ spec:
           publicLoadBalancer: {{ $machineSetSpec.publicLoadBalancer }}
           resourceGroup: {{ $machineSetSpec.resourceGroup }}
           subnet: {{ $machineSetSpec.subnet }}
+          {{- if $machineSetSpec.tags }}
+          tags: {{ $machineSetSpec.tags | toYaml | nindent 12 }}
+          {{- end }}
           userDataSecret:
             name: worker-user-data
           vmSize: {{ $.Values.vmSize }}

diff --git a/charts/aro-machinesets/values.yaml b/charts/aro-machinesets/values.yaml
@@ -51,6 +51,10 @@ machineSetSpec:
   resourceGroup: aro-cddajpe1
   subnet: aro-cluster-machine-subnet
   vnet: aro-cluster-vnet
+  ## uncomment to add tags on the vms
+  # tags:
+  #   key1: value1
+  #   key2: value2
   ## spotVMOptions - optionally declare spotVMOptions when setting enableSpot to true as described on
   ## https://docs.openshift.com/container-platform/4.12/machine_management/creating_machinesets/creating-machineset-azure.html#machineset-non-guaranteed-instance_creating-machineset-azure
   # spotVMOptions:

diff --git a/charts/aro-thanos-af/Chart.yaml b/charts/aro-thanos-af/Chart.yaml
@@ -2,12 +2,11 @@ apiVersion: v2
 name: aro-thanos-af
 description: A Helm chart for Kubernetes
 type: application
-version: 0.6.3
+version: 0.7.0
 dependencies:
   - name: grafana-cr
-    version: "0.4.0"
+    version: "0.5.0"
     repository: "https://rh-mobb.github.io/helm-charts/"
-    # repository: file://../grafana-cr
 home: "https://rh-mobb.github.io/helm-charts/"
 maintainers:
   - name: rh-mobb
diff --git a/charts/aro-thanos-af/files/dashboards/cluster_metrics.ocp411.grafanadashboard.yaml b/charts/aro-thanos-af/files/dashboards/cluster_metrics.ocp411.grafanadashboard.yaml
@@ -1,10 +1,11 @@
-apiVersion: integreatly.org/v1alpha1
+apiVersion: grafana.integreatly.org/v1beta1
 kind: GrafanaDashboard
 metadata:
-  labels:
-    app: grafana
   name: cluster-metrics
 spec:
+  instanceSelector:
+    matchLabels:
+      dashboards: "grafana"
   json: |
     {
       "annotations": {

diff --git a/charts/aro-thanos-af/files/dashboards/infra_metrics.ocp411.grafanadashboard.yaml b/charts/aro-thanos-af/files/dashboards/infra_metrics.ocp411.grafanadashboard.yaml
@@ -1,10 +1,11 @@
-apiVersion: integreatly.org/v1alpha1
+apiVersion: grafana.integreatly.org/v1beta1
 kind: GrafanaDashboard
 metadata:
-  labels:
-    app: grafana
   name: infra-metrics
 spec:
+  instanceSelector:
+    matchLabels:
+      dashboards: "grafana"
   json: |
     {
       "annotations": {

diff --git a/charts/aro-thanos-af/files/grafana-operator.yaml b/charts/aro-thanos-af/files/grafana-operator.yaml
@@ -1,6 +1,6 @@
 subscriptions:
   - name: grafana-operator
-    channel: v4
+    channel: v5
     installPlanApproval: Automatic
     source: community-operators
     sourceNamespace: openshift-marketplace

diff --git a/charts/aro-thanos-af/templates/grafana/dashboards.yaml b/charts/aro-thanos-af/templates/grafana/dashboards.yaml
@@ -1,11 +1,12 @@
 {{ range $path, $_ := .Files.Glob "files/dashboards/*.json" }}
 ---
-apiVersion: integreatly.org/v1alpha1
+apiVersion: grafana.integreatly.org/v1beta1
 kind: GrafanaDashboard
 metadata:
   name: {{ base $path }}
-  labels:
-    app: grafana
 spec:
+  instanceSelector:
+    matchLabels:
+      dashboards: "grafana"
   json: {{ $.Files.Get $path }}
 {{ end }}
diff --git a/charts/aro-thanos-af/templates/grafana/grafanadatasource.yaml b/charts/aro-thanos-af/templates/grafana/grafanadatasource.yaml
@@ -1,17 +1,19 @@
-apiVersion: integreatly.org/v1alpha1
-kind: GrafanaDataSource
+apiVersion: grafana.integreatly.org/v1beta1
+kind: GrafanaDatasource
 metadata:
   name: {{ include "aro-thanos-af.fullname" . }}-prometheus
   labels:
     {{- include "aro-thanos-af.labels" . | nindent 4 }}
 spec:
-  name: {{ include "aro-thanos-af.fullname" . }}.yaml
-  datasources:
-    - access: proxy
-      editable: false
-      isDefault: true
-      jsonData:
-        timeInterval: 5s
-      name: prometheus
-      type: prometheus
-      url: 'http://thanos-querier.{{ .Release.Namespace }}.svc.cluster.local:9090'
+  instanceSelector:
+    matchLabels:
+      dashboards: grafana
+  datasource:
+    access: proxy
+    editable: false
+    isDefault: true
+    jsonData:
+      timeInterval: 5s
+    name: prometheus
+    type: prometheus
+    url: 'http://thanos-querier.{{ .Release.Namespace }}.svc.cluster.local:9090'
diff --git a/charts/aro-thanos-af/templates/thanos/thanos-querier.yaml b/charts/aro-thanos-af/templates/thanos/thanos-querier.yaml
@@ -27,7 +27,7 @@ spec:
       #   fsGroup: 65534
       containers:
       - name: thanos
-        image: quay.io/thanos/thanos:v0.24.0-rc.2
+        image: quay.io/thanos/thanos:v0.34.1
         args:
         - query
         - --query.replica-label=replica

diff --git a/charts/aro-thanos-af/templates/thanos/thanos-receive.yaml b/charts/aro-thanos-af/templates/thanos/thanos-receive.yaml
@@ -23,7 +23,7 @@ spec:
         fsGroup: 65534
       containers:
       - name: thanos-receive
-        image: quay.io/thanos/thanos:v0.24.0-rc.2
+        image: quay.io/thanos/thanos:v0.34.1
         args:
         - receive
         - --tsdb.path=/data/remote-write-receive-data

diff --git a/charts/aro-thanos-af/templates/thanos/thanos-store.yaml b/charts/aro-thanos-af/templates/thanos/thanos-store.yaml
@@ -24,7 +24,7 @@ spec:
         fsGroup: 65534
       containers:
       - name: thanos
-        image: quay.io/thanos/thanos:v0.24.0-rc.2
+        image: quay.io/thanos/thanos:v0.34.1
         args:
         - store
         - --data-dir=/data

diff --git a/charts/grafana-cr/Chart.yaml b/charts/grafana-cr/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: grafana-cr
 description: A Helm chart for Deploying Grafana instances using the Grafana Operator
 type: application
-version: 0.4.0
+version: 0.5.0
 home: https://github.com/rh-mobb/helm-charts
 maintainers:
   - name: paulczar
diff --git a/charts/grafana-cr/templates/configmap.yaml b/charts/grafana-cr/templates/configmap.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "grafana-cr.fullname" . }}-certs
+  labels:
+    config.openshift.io/inject-trusted-cabundle: "true"
+  name: {{ include "grafana-cr.fullname" . }}-certs
diff --git a/charts/grafana-cr/templates/dashboards.yaml b/charts/grafana-cr/templates/dashboards.yaml
@@ -1,12 +1,13 @@
 {{ range .Values.dashboards }}
 ---
-apiVersion: integreatly.org/v1alpha1
+apiVersion: grafana.integreatly.org/v1beta1
 kind: GrafanaDashboard
 metadata:
   name: {{ .name }}
-  labels:
-    app: grafana
 spec:
+  instanceSelector:
+    matchLabels:
+      dashboards: "grafana"
   json: {{ .json }}
 {{ end }}