Merge pull request #39 from aiyengar2/bump_helm_project_operator

Bump Helm Project Operator to add 1.25 support for Prometheus Federator main chart and fix Grafana templating bug

.github/pull_request_template.md

@@ -1,52 +1,26 @@
-## Issue: <!-- link the issue or issues this PR resolves here -->
+Related Issue: <!-- link the issue or issues this PR resolves here -->
 <!-- If your PR depends on changes from another pr link them here and describe why they are needed on your solution section. -->
-
-## Problem
-<!-- Describe the root cause of the issue you are resolving. This may include what behavior is observed and why it is not desirable. If this is a new feature describe why we need this feature and how it will be used. -->
-
-## Solution
-<!-- Describe what you changed to fix the issue. Relate your changes back to the original issue / feature and explain why this addresses the issue. -->
-
-## Testing
-<!-- Note: Confirm if the repro steps in the GitHub issue are valid, if not, please update the issue with accurate repro steps. -->
 
-## Versioning
+### Checklist
 
-### For Community Members or Maintainers Making Changes
+In general, the rules for bumping versions are:
+- If the current version is an RC, increment it `0.0.0-rc1` -> `0.0.0-rc2`
+- If the current version is not an RC, bump the patch and set it to `-rc1` (`0.0.0` -> `0.0.1-rc1`)
 
-Please checkmark one of the boxes below to indicate you have following the versioning guidelines for `rancher-project-monitoring`:
+Please fill out this table to identify which fields need to be modified in your PR.
 
-- If you are introducing a change to `packages/rancher-project-monitoring` or `packages/rancher-project-grafana`:
-  - [ ] Increment the patch version in the `version` of `packages/rancher-project-monitoring/charts/Chart.yaml` by 1
-- [ ] I am not introducing a change to `package/rancher-project-monitoring`
+**Under `Status`, either indicate `Does Not Apply` or `Added to this PR`**.
 
-> **Note:** We do not use RC versions for `rancher-project-monitoring` since it is hidden anyways and not intended for standalone use
-
-Please checkmark one of the boxes below to indicate that you have followed the versioning guidelines for `prometheus-federator`:
-
-- If you are introducing a change to `main.go` or `packages/rancher-project-monitoring` (including a change introduced in the above step):
-  - [ ] If `packages/prometheus-federator/charts/Chart.yaml` has a `version` that is a `-rc` version, increment the `-rc` version in this file by one (i.e. `0.1.2-rc1` -> `0.1.2-rc2`). Modify the `appVersion` to match this new `version`. Modify the `helmProjectOperator.image.tag` in `packages/prometheus-federator/charts/values.yaml` to match this `appVersion`.
-  - [ ] If `packages/prometheus-federator/charts/Chart.yaml` has a `version` that is **not** a `-rc` version, increment the patch version in this file by 1 and add `-rc1` (i.e. `0.1.1` -> `0.1.2-rc1`). Modify the `appVersion` to match this new `version`. Modify the `helmProjectOperator.image.tag` in `packages/prometheus-federator/charts/values.yaml` to match this `appVersion`.
-- If you are **only** introducing a change to `packages/prometheus-federator`:
-  - [ ] If `packages/prometheus-federator/charts/Chart.yaml` has a `version` that is a `-rc` version, increment the `-rc` version in this file by one (i.e. `0.1.2-rc1` -> `0.1.2-rc2`). **Do not modify the `appVersion` or the `helmProjectOperator.image.tag` in `packages/prometheus-federator/charts/values.yaml`**.
-  - [ ] If `packages/prometheus-federator/charts/Chart.yaml` has a `version` that is **not** a `-rc` version, increment the patch version by 1 in this file and add `-rc1` (i.e. `0.1.1` -> `0.1.2-rc1`). **Do not modify the `appVersion` or the `helmProjectOperator.image.tag` in `packages/prometheus-federator/charts/values.yaml`**.
+| **Field to be modified**                                              | Why should this be modified?                                                                                                           | Status                                      |
+|-----------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------|
+| `version` in rancher-project-monitoring `Chart.yaml`                  | - You modified the contents of the `rancher-project-monitoring` chart to make changes                                                    |  |
+| `helmProjectOperator.image.tag` in prometheus-federator `values.yaml` | Either you modified the rancher-project-monitoring chart or you modified the `main.go` file                                          |  |
+| `appVersion` in prometheus-federator `Chart.yaml`                     | You modified the `helmProjectOperator.image.tag` in the above box                                                                      |  |
+| `version` in prometheus-federator `Chart.yaml`                        | Either you modified the `appVersion` in the above box or you modified the contents of the `prometheus-federator` chart to make changes |  |
 
 ### For Maintainers Releasing The Chart On QA Validation
 
 Please checkmark **both** of the boxes below to indicate that you have followed the versioning guidelines for `prometheus-federator`:
 - [ ] The `-rc` tag has been removed from the `version` in `packages/prometheus-federator/charts/Chart.yaml`
 - [ ] The `-rc` tag has been removed from the `helmProjectOperator.image.tag` in `packages/prometheus-federator/charts/values.yaml`
 
-## Engineering Testing
-### Manual Testing
-<!-- Describe what manual testing you did (if no testing was done, explain why). -->
-
-### Automated Testing
-<!--If you added/updated unit/integration/validation tests, describe what cases they cover and do not cover. -->
-
-## QA Testing Considerations
-<!-- Highlight areas or (additional) cases that QA should test w.r.t a fresh install as well as the upgrade scenarios -->
-
-### Regressions Considerations
-<!-- Dedicated section to specifically call out any areas that with higher chance of regressions caused by this change, include estimation of probability of regressions -->
-

.github/workflows/e2e/scripts/validate-project-grafana-dashboard-data.sh

@@ -57,6 +57,22 @@ exclude_queries=(
     "db/kubernetes-persistent-volumes/Volume_inodes_Usage_query0"
     "db/kubernetes-persistent-volumes/Volume_inodes_Usage_query1"
     "db/kubernetes-persistent-volumes/Volume_inodes_Usage_query0"
+
+    # Flakey Tests
+    "db/kubernetes-compute-resources-namespace-pods/IOPS(Reads+Writes)_query0"
+    "db/kubernetes-compute-resources-namespace-pods/Current_Storage_IO_query0"
+    "db/kubernetes-compute-resources-namespace-pods/Current_Storage_IO_query1"
+    "db/kubernetes-compute-resources-namespace-pods/Current_Storage_IO_query2"
+    "db/kubernetes-compute-resources-pod/IOPS_query0"
+    "db/kubernetes-compute-resources-pod/IOPS_query1"
+    "db/kubernetes-compute-resources-pod/IOPS(Reads+Writes)_query0"
+    "db/kubernetes-compute-resources-pod/Current_Storage_IO_query0"
+    "db/kubernetes-compute-resources-pod/Current_Storage_IO_query1"
+    "db/kubernetes-compute-resources-pod/Current_Storage_IO_query2"
+    "db/kubernetes-compute-resources-project/IOPS(Reads+Writes)_query0"
+    "db/kubernetes-compute-resources-project/Current_Storage_IO_query0"
+    "db/kubernetes-compute-resources-project/Current_Storage_IO_query1"
+    "db/kubernetes-compute-resources-project/Current_Storage_IO_query2"
 )
 
 
@@ -127,12 +143,14 @@ EOF
         # echo "QUERY: ${query}"
         echo "INTERNAL ERROR: Request to /api/ds/query failed due to malformed request: ${query_response}"
         echo "QUERY BODY: ${query_body}"
+        echo ""
         FAILED=1
         continue
     fi
     if [[ "$(echo ${query_response} | yq '.results.A.frames | length' -)" == "0" ]]; then
         # echo "QUERY: ${query}"
         echo "ERROR: No data was found for query ${query_key}: ${query_response}"
+        echo ""
         FAILED=1
         continue
     fi

charts/prometheus-federator/0.2.0-rc2/Chart.yaml

@@ -0,0 +1,20 @@
+annotations:
+  catalog.cattle.io/certified: rancher
+  catalog.cattle.io/display-name: Prometheus Federator
+  catalog.cattle.io/kube-version: '>=1.16.0-0'
+  catalog.cattle.io/namespace: cattle-monitoring-system
+  catalog.cattle.io/os: linux,windows
+  catalog.cattle.io/permits-os: linux,windows
+  catalog.cattle.io/provides-gvr: helm.cattle.io.projecthelmchart/v1alpha1
+  catalog.cattle.io/rancher-version: '>= 2.6.5-0 <= 2.6.100-0'
+  catalog.cattle.io/release-name: prometheus-federator
+apiVersion: v2
+appVersion: 0.2.0-rc2
+dependencies:
+- condition: helmProjectOperator.enabled
+  name: helmProjectOperator
+  repository: file://./charts/helmProjectOperator
+description: Prometheus Federator
+icon: https://raw.githubusercontent.com/rancher/prometheus-federator/main/assets/logos/prometheus-federator.svg
+name: prometheus-federator
+version: 0.2.0-rc2