rancher
diff --git a/‎.github/renovate.json‎
Lines changed: 19 additions & 3 deletions b/‎.github/renovate.json‎
Lines changed: 19 additions & 3 deletions
diff --git a/‎.github/scripts/branch-tags.sh‎
Lines changed: 0 additions & 55 deletions b/‎.github/scripts/branch-tags.sh‎
Lines changed: 0 additions & 55 deletions
diff --git a/‎.github/workflows/prom-fed-ci.yaml‎ renamed to ‎.github/workflows/ci.yaml‎
Lines changed: 15 additions & 4 deletions b/‎.github/workflows/prom-fed-ci.yaml‎ renamed to ‎.github/workflows/ci.yaml‎
Lines changed: 15 additions & 4 deletions
diff --git a/‎.github/workflows/e2e/package/Dockerfile‎
Lines changed: 2 additions & 2 deletions b/‎.github/workflows/e2e/package/Dockerfile‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎.github/workflows/e2e/scripts/cluster-args.sh‎
Lines changed: 2 additions & 44 deletions b/‎.github/workflows/e2e/scripts/cluster-args.sh‎
Lines changed: 2 additions & 44 deletions
diff --git a/‎.github/workflows/e2e/scripts/create-projecthelmchart.sh‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/e2e/scripts/create-projecthelmchart.sh‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/workflows/e2e/scripts/entry‎
Lines changed: 9 additions & 1 deletion b/‎.github/workflows/e2e/scripts/entry‎
Lines changed: 9 additions & 1 deletion
diff --git a/‎.github/workflows/e2e/scripts/generate-artifacts.sh‎
Lines changed: 9 additions & 0 deletions b/‎.github/workflows/e2e/scripts/generate-artifacts.sh‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎.github/workflows/e2e/scripts/install-federator.sh‎
Lines changed: 6 additions & 5 deletions b/‎.github/workflows/e2e/scripts/install-federator.sh‎
Lines changed: 6 additions & 5 deletions
diff --git a/‎.github/workflows/e2e/scripts/install-monitoring.sh‎
Lines changed: 3 additions & 2 deletions b/‎.github/workflows/e2e/scripts/install-monitoring.sh‎
Lines changed: 3 additions & 2 deletions
@@ -8,16 +8,32 @@
     "main",
     "release/v3.x",
     "release/v2.x",
-    "release/v1.x",
-    "release/v0.x"
+    "release/v1.x"
   ],
   "enabledManagers": [
     "dockerfile",
     "github-actions",
     "helm-values",
-    "regex"
+    "custom.regex",
+    "gomod"
   ],
   "packageRules": [
+    {
+      "matchBaseBranches" : ["main"],
+      "extends" : ["github>rancher/renovate-config:rancher-main#release"]
+    },
+    {
+      "matchBaseBranches" : ["release/v3.x"],
+      "extends" : ["github>rancher/renovate-config:rancher-2.11#release"]
+    },
+    {
+      "matchBaseBranches" : ["release/v2.x"],
+      "extends" : ["github>rancher/renovate-config:rancher-2.10#release"]
+    },
+    {
+      "matchBaseBranches": ["release/v1.x"],
+      "extends" : ["github>rancher/renovate-config:rancher-2.9#release"]
+    },
     {
       "groupName": "GitHub Workflow Actions",
       "groupSlug": "gha-deps",
 
@@ -33,18 +33,29 @@ jobs:
         arch:
           - x64
           - arm64
-    runs-on : runs-on,image=ubuntu22-full-${{ matrix.arch }},runner=4cpu-linux-${{ matrix.arch }},run-id=${{ github.run_id }}
+    runs-on: ${{ github.repository == 'rancher/prometheus-federator' && format('runs-on,image=ubuntu22-full-{1},runner=4cpu-linux-{1},run-id={0}', github.run_id, matrix.arch) || 'ubuntu-latest' }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - name : Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
         with:
           go-version: '1.22'
+      - name: Check if yq is installed
+        id: check_yq
+        run: |
+          if ! command -v yq &> /dev/null; then
+            echo "yq not found, installing..."
+            echo "::set-output name=install_yq::true"
+          else
+            echo "yq is already installed"
+            echo "::set-output name=install_yq::false"
+          fi
       - name : Install YQ
+        if: steps.check_yq.outputs.install_yq == 'true'
         run: |
           sudo wget https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_${{ matrix.arch == 'x64' && 'amd64' || matrix.arch  }} -O /usr/bin/yq && sudo chmod +x /usr/bin/yq;
       - name : Install helm
-        uses: azure/setup-helm@v3
+        uses: azure/setup-helm@b9e51907a09c216f16ebe8536097933489208112 # v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
       - name: Run CI
 
@@ -1,9 +1,9 @@
-FROM registry.suse.com/bci/golang:1.20 AS helm
+FROM registry.suse.com/bci/golang:1.23 AS helm
 RUN zypper -n install git
 RUN git -C / clone --branch release-v3.9.0 --depth=1 https://github.com/rancher/helm
 RUN make -C /helm
 
-FROM registry.suse.com/bci/golang:1.20
+FROM registry.suse.com/bci/golang:1.23
 
 ARG ARCH=amd64
 ENV KUBECTL_VERSION v1.21.8
 
@@ -8,55 +8,13 @@ cd $(dirname $0)/../../../..
 
 case "${KUBERNETES_DISTRIBUTION_TYPE}" in
 "k3s")
-    cluster_args=""
-    kubernetes_version=$(kubectl version | grep "Server Version" | cut -d ' ' -f3)
-    case "${kubernetes_version}" in
-    v1.23.*)
-        embedded_helm_controller_fixed_version="v1.23.14"
-        if [[ $(echo ${kubernetes_version} ${embedded_helm_controller_fixed_version} | tr " " "\n" | sort -rV | head -n 1 ) == "${embedded_helm_controller_fixed_version}" ]]; then
-            cluster_args="--set helmProjectOperator.helmController.enabled=false"
-        fi
-        ;;
-    v1.24.*)
-        embedded_helm_controller_fixed_version="v1.24.8"
-        if [[ $(echo ${kubernetes_version} ${embedded_helm_controller_fixed_version} | tr " " "\n" | sort -rV | head -n 1 ) == "${embedded_helm_controller_fixed_version}" ]]; then
-            cluster_args="--set helmProjectOperator.helmController.enabled=false"
-        fi
-        ;;
-    v1.25.*)
-        embedded_helm_controller_fixed_version="v1.25.4"
-        if [[ $(echo ${kubernetes_version} ${embedded_helm_controller_fixed_version} | tr " " "\n" | sort -rV | head -n 1 ) == "${embedded_helm_controller_fixed_version}" ]]; then
-            cluster_args="--set helmProjectOperator.helmController.enabled=false"
-        fi
-        ;;
-    esac
+    cluster_args="--set helmProjectOperator.helmController.enabled=false"
     ;;
 "rke")
     cluster_args=""
     ;;
 "rke2")
-    cluster_args=""
-    kubernetes_version=$(kubectl version | grep "Server Version" | cut -d ' ' -f3)
-    case "${kubernetes_version}" in
-    v1.23.*)
-        embedded_helm_controller_fixed_version="v1.23.14"
-        if [[ $(echo ${kubernetes_version} ${embedded_helm_controller_fixed_version} | tr " " "\n" | sort -rV | head -n 1 ) == "${embedded_helm_controller_fixed_version}" ]]; then
-            cluster_args="--set helmProjectOperator.helmController.enabled=false"
-        fi
-        ;;
-    v1.24.*)
-        embedded_helm_controller_fixed_version="v1.24.8"
-        if [[ $(echo ${kubernetes_version} ${embedded_helm_controller_fixed_version} | tr " " "\n" | sort -rV | head -n 1 ) == "${embedded_helm_controller_fixed_version}" ]]; then
-            cluster_args="--set helmProjectOperator.helmController.enabled=false"
-        fi
-        ;;
-    v1.25.*)
-        embedded_helm_controller_fixed_version="v1.25.4"
-        if [[ $(echo ${kubernetes_version} ${embedded_helm_controller_fixed_version} | tr " " "\n" | sort -rV | head -n 1 ) == "${embedded_helm_controller_fixed_version}" ]]; then
-            cluster_args="--set helmProjectOperator.helmController.enabled=false"
-        fi
-        ;;
-    esac
+    cluster_args="--set helmProjectOperator.helmController.enabled=false"
     ;;
 *)
     echo "KUBERNETES_DISTRIBUTION_TYPE=${KUBERNETES_DISTRIBUTION_TYPE} is unknown"
 
@@ -11,7 +11,7 @@ if [[ "${E2E_CI}" == "true" ]]; then
 else
     kubectl apply -f ./examples/prometheus-federator/project-helm-chart.yaml
 fi
-sleep ${DEFAULT_SLEEP_TIMEOUT_SECONDS};
+sleep "${DEFAULT_SLEEP_TIMEOUT_SECONDS}";
 
 if ! kubectl get -n cattle-monitoring-system job/helm-install-cattle-project-p-example-monitoring; then
     echo "ERROR: Helm Install Job for Project Monitoring Stack was never created after ${DEFAULT_SLEEP_TIMEOUT_SECONDS} seconds"
 
@@ -12,6 +12,12 @@ if [[ ${DEBUG} == "true" ]]; then
     set -x
 fi
 
+echo "Using rancher monitoring version : ${RANCHER_MONITORING}"
+
+if [ "$RANCHER_MONITORING" != "latest" ]; then
+    RANCHER_MONITORING_VERSION_HELM_ARGS="--version ${RANCHER_MONITORING}"
+fi
+
 if [[ "${E2E_CI}" == "true" ]]; then
     KUBERNETES_DISTRIBUTION_TYPE=k3s
 fi
@@ -23,9 +29,11 @@ if [[ -n ${RANCHER_URL} ]] && [[ -n ${RANCHER_CLUSTER} ]] && [[ -n ${RANCHER_TOK
         API_SERVER_URL=${RANCHER_URL}
     fi 
     API_SERVER_CURL_AUTH_HEADERS="-k -H 'Authorization: Bearer ${RANCHER_TOKEN}'"
-    RANCHER_HELM_ARGS="--set global.cattle.url=${RANCHER_URL} --set global.cattle.clusterId=${RANCHER_CLUSTER}"
+    RANCHER_CLUSTER_HELM_ARGS="--set global.cattle.url=${RANCHER_URL} --set global.cattle.clusterId=${RANCHER_CLUSTER}"
 else
     kubectl proxy --port=${APISERVER_PORT:-8001} 2>/dev/null &
     API_SERVER_URL=http://localhost:${APISERVER_PORT:-8001}
     sleep 5
 fi
+
+RANCHER_HELM_ARGS="${RANCHER_CLUSTER_HELM_ARGS} ${RANCHER_MONITORING_VERSION_HELM_ARGS}"
@@ -34,6 +34,7 @@ case "${KUBERNETES_DISTRIBUTION_TYPE}" in
 esac
 
 ARTIFACT_DIRECTORY=artifacts
+DESCRIBE_DIRECTORY=${ARTIFACT_DIRECTORY}/described
 MANIFEST_DIRECTORY=${ARTIFACT_DIRECTORY}/manifests
 LOG_DIRECTORY=${ARTIFACT_DIRECTORY}/logs
 
@@ -114,3 +115,11 @@ 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-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
+
+# Resource Descriptions
+
+mkdir -p ${DESCRIBE_DIRECTORY}
+
+## Additional Context
+kubectl describe jobs -n cattle-monitoring-system helm-install-cattle-project-p-example-monitoring > ${DESCRIBE_DIRECTORY}/project-monitoring-helm-install-job.log
+kubectl describe pods -n cattle-monitoring-system -l job-name=helm-install-cattle-project-p-example-monitoring > ${DESCRIBE_DIRECTORY}/project-monitoring-helm-install-pod.log
@@ -8,11 +8,12 @@ source $(dirname $0)/cluster-args.sh
 cd $(dirname $0)/../../../..
 source "$(pwd)/scripts/util-team-charts"
 
-NEWEST_CHART_VERSION=$(newest-chart-version "prometheus-federator")
-fetch-team-chart "prometheus-federator" "$NEWEST_CHART_VERSION"
-LATEST_CHART_PATH="./build/charts/prometheus-federator-${NEWEST_CHART_VERSION}.tgz"
-tar -xvzf "$LATEST_CHART_PATH" -C ./build/charts/
+make package-helm
 
-helm upgrade --install --create-namespace -n cattle-monitoring-system prometheus-federator --set helmProjectOperator.image.repository=${REPO:-rancher}/prometheus-federator --set helmProjectOperator.image.tag=${TAG:-dev} ${cluster_args} ${RANCHER_HELM_ARGS} ./build/charts/prometheus-federator
+helm upgrade --install --create-namespace -n cattle-monitoring-system prometheus-federator \
+  --set helmProjectOperator.image.repository=${REPO:-rancher}/prometheus-federator \
+  --set helmProjectOperator.image.tag=${TAG:-dev} \
+  ${cluster_args} \
+  ${RANCHER_HELM_ARGS} ./build/charts/prometheus-federator
 
 echo "PASS: Prometheus Federator has been installed"
@@ -5,12 +5,13 @@ set -x
 source $(dirname $0)/entry
 
 HELM_REPO="rancher-charts"
+HELM_REPO_URL="https://charts.rancher.io"
 
 cd $(dirname $0)/../../../..
 
 helm version
 
-helm repo add ${HELM_REPO} https://charts.rancher.io
+helm repo add ${HELM_REPO} $HELM_REPO_URL
 helm repo update
 
 echo "Create required \`cattle-fleet-system\` namespace"
@@ -20,7 +21,7 @@ echo "Installing rancher monitoring crd with :\n"
 
 helm search repo ${HELM_REPO}/rancher-monitoring-crd --versions --max-col-width=0 | head -n 2
 
-helm upgrade --install --create-namespace -n cattle-monitoring-system rancher-monitoring-crd ${HELM_REPO}/rancher-monitoring-crd
+helm upgrade --install --create-namespace -n cattle-monitoring-system ${RANCHER_MONITORING_VERSION_HELM_ARGS} rancher-monitoring-crd ${HELM_REPO}/rancher-monitoring-crd
 
 if [[ "${E2E_CI}" == "true" ]]; then
     e2e_args="--set grafana.resources=null --set prometheus.prometheusSpec.resources=null --set alertmanager.alertmanagerSpec.resources=null"