Merge pull request #55 from aiyengar2/bump_hpo_and_add_psp_changes

Ensure that setting global.cattle.psp.enabled=false does not deploy PSP for hardened.yaml Job
rancher · Feb 22, 2023 · 8e5092d · 8e5092d
2 parents 7c88133 + da9201b
commit 8e5092d
Show file tree

Hide file tree

Showing 139 changed files with 36,246 additions and 135 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -9,7 +9,7 @@ Please fill out this table to identify which fields need to be modified in your
 
 | **Version to be incremented**                                              | 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                                                    |  |
+| `version` in rancher-project-monitoring `package.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 |  |

diff --git a/.github/workflows/e2e-ci.yaml b/.github/workflows/e2e-ci.yaml
@@ -35,7 +35,7 @@ env:
   TAG: dev
   APISERVER_PORT: 8001
   DEFAULT_SLEEP_TIMEOUT_SECONDS: 10
-  KUBECTL_WAIT_TIMEOUT: 120s
+  KUBECTL_WAIT_TIMEOUT: 300s
   DEBUG: ${{ github.event.inputs.debug || false }}
 
 permissions:

diff --git a/.github/workflows/e2e/scripts/generate-artifacts.sh b/.github/workflows/e2e/scripts/generate-artifacts.sh
@@ -58,6 +58,7 @@ kubectl logs deployment/rancher-monitoring-grafana -n cattle-monitoring-system -
 kubectl logs deployment/rancher-monitoring-grafana -n cattle-monitoring-system -c grafana-proxy > ${LOG_DIRECTORY}/rancher-monitoring/grafana_proxy.log || true
 kubectl logs deployment/rancher-monitoring-grafana -n cattle-monitoring-system -c grafana-sc-dashboard > ${LOG_DIRECTORY}/rancher-monitoring/grafana_sc_dashboard.log || true
 kubectl logs deployment/rancher-monitoring-grafana -n cattle-monitoring-system -c grafana-sc-datasources > ${LOG_DIRECTORY}/rancher-monitoring/grafana_sc_datasources.log || true
+kubectl logs deployment/rancher-monitoring-grafana -n cattle-monitoring-system -c grafana-init-sc-datasources > ${LOG_DIRECTORY}/rancher-monitoring/grafana_init_sc_datasources.log || true
 kubectl logs deployment/rancher-monitoring-kube-state-metrics -n cattle-monitoring-system > ${LOG_DIRECTORY}/rancher-monitoring/kube_state_metrics.log || true
 kubectl logs daemonset/rancher-monitoring-prometheus-node-exporter -n cattle-monitoring-system > ${LOG_DIRECTORY}/rancher-monitoring/node_exporter.log || true
 kubectl logs deployment/rancher-monitoring-prometheus-adapter -n cattle-monitoring-system > ${LOG_DIRECTORY}/rancher-monitoring/prometheus_adapter.log || true
@@ -79,3 +80,4 @@ kubectl logs deployment/cattle-project-p-example-monitoring-grafana -n cattle-pr
 kubectl logs deployment/cattle-project-p-example-monitoring-grafana -n cattle-project-p-example -c grafana-proxy > ${LOG_DIRECTORY}/project-monitoring/grafana_proxy.log || true
 kubectl logs deployment/cattle-project-p-example-monitoring-grafana -n cattle-project-p-example -c grafana-sc-dashboard > ${LOG_DIRECTORY}/project-monitoring/grafana_sc_dashboard.log || true
 kubectl logs deployment/cattle-project-p-example-monitoring-grafana -n cattle-project-p-example -c grafana-sc-datasources > ${LOG_DIRECTORY}/project-monitoring/grafana_sc_datasources.log || true
+kubectl logs deployment/cattle-project-p-example-monitoring-grafana -n cattle-project-p-example -c grafana-init-sc-datasources > ${LOG_DIRECTORY}/project-monitoring/grafana_init_sc_datasources.log || true
diff --git a/assets/prometheus-federator/prometheus-federator-0.2.1.tgz b/assets/prometheus-federator/prometheus-federator-0.2.1.tgz
diff --git a/assets/rancher-project-monitoring/rancher-project-monitoring-0.2.1.tgz b/assets/rancher-project-monitoring/rancher-project-monitoring-0.2.1.tgz
diff --git a/charts/prometheus-federator/0.2.1/Chart.yaml b/charts/prometheus-federator/0.2.1/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.1
+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.1