Skip to content

[rancher-monitoring 84.5] Rancher 2.15 Rebase#239

Open
mallardduck wants to merge 22 commits into
rancher:mainfrom
mallardduck:rebase-84.5
Open

[rancher-monitoring 84.5] Rancher 2.15 Rebase#239
mallardduck wants to merge 22 commits into
rancher:mainfrom
mallardduck:rebase-84.5

Conversation

@mallardduck

@mallardduck mallardduck commented May 11, 2026

Copy link
Copy Markdown
Member

For testing

Use this Cluster Repo config:

apiVersion: catalog.cattle.io/v1
kind: ClusterRepo
metadata:
  name: mallardduck-rebase-84.5
spec:
  gitBranch: rebase-84.5
  gitRepo: https://github.com/mallardduck/ob-team-charts

@mallardduck

mallardduck commented May 11, 2026

Copy link
Copy Markdown
Member Author
./bin/ob-charts-tool verifyChartImages 84.5.0-rancher.1
+----+-------------------------------------------------------------------------+--------+
|  # | IMAGE                                                                   | STATUS |
+----+-------------------------------------------------------------------------+--------+
|  1 | rancher/appco-grafana:13.0.1-3.2                                        ||
|  2 | rancher/appco-alertmanager:0.31.1-15.2                                  ||
|  3 | rancher/kuberlr-kubectl:v7.0.3                                          ||
|  4 | rancher/mirrored-jkroepke-kube-webhook-certgen:1.8.0                    ||
|  5 | rancher/mirrored-prometheus-adapter-prometheus-adapter:v0.12.0          ||
|  6 | rancher/mirrored-prometheus-windows-exporter:0.31.6                     ||
|  7 | rancher/mirrored-library-nginx:1.29.8-alpine                            ||
|  8 | rancher/mirrored-prometheus-operator-prometheus-operator:v0.89.0        ||
|  9 | rancher/mirrored-prometheus-prometheus:v3.11.0                          ||
| 10 | rancher/mirrored-prometheus-operator-prometheus-config-reloader:v0.89.0 ||
| 11 | rancher/appco-node-exporter:1.11.0-14.4                                 ||
| 12 | rancher/appco-thanos:0.41.0-12.2                                        ||
| 13 | rancher/appco-k8s-sidecar:2.7.1-7.6                                     ||
| 14 | rancher/appco-kube-state-metrics:2.18.0-15.2                            ||
+----+-------------------------------------------------------------------------+--------+

(Fixed bug in chart causing windows exporter to not be seen)

BTW ORBS team, if you didn't know you can start a rebase. Make the chart you expect to make, then run this command to quickly get all the images that need to be mirrored.

Here is an example after images are mirrored:

+----+-------------------------------------------------------------------------+--------+
|  # | IMAGE                                                                   | STATUS |
+----+-------------------------------------------------------------------------+--------+
|  1 | rancher/appco-grafana:13.0.1-3.2                                        | ✅     |
|  2 | rancher/kuberlr-kubectl:v7.0.3                                          | ✅     |
|  3 | rancher/mirrored-library-nginx:1.29.8-alpine                            | ✅     |
|  4 | rancher/mirrored-jkroepke-kube-webhook-certgen:1.8.0                    | ✅     |
|  5 | rancher/mirrored-prometheus-operator-prometheus-config-reloader:v0.89.0 | ✅     |
|  6 | rancher/appco-alertmanager:0.31.1-15.2                                  | ✅     |
|  7 | rancher/appco-node-exporter:1.11.0-14.4                                 | ✅     |
|  8 | rancher/mirrored-prometheus-windows-exporter:0.31.6                     | ✅     |
|  9 | rancher/appco-kube-state-metrics:2.18.0-15.2                            | ✅     |
| 10 | rancher/mirrored-prometheus-operator-prometheus-operator:v0.89.0        | ✅     |
| 11 | rancher/appco-thanos:0.41.0-12.2                                        | ✅     |
| 12 | rancher/mirrored-prometheus-adapter-prometheus-adapter:v0.12.0          | ✅     |
| 13 | rancher/appco-k8s-sidecar:2.7.1-7.6                                     | ✅     |
| 14 | rancher/mirrored-prometheus-prometheus:v3.11.0                          | ✅     |
+----+-------------------------------------------------------------------------+--------+

@mallardduck

Copy link
Copy Markdown
Member Author

This ob-charts-tool PR should fix the issue with PR validation this PR highlights: rancher/ob-charts-tool#73

@mallardduck mallardduck force-pushed the rebase-84.5 branch 2 times, most recently from f59f109 to 7257935 Compare May 13, 2026 12:57
@mallardduck

Copy link
Copy Markdown
Member Author

CI is failing due to missing RPM builds from previous branches.

To fix:

@mallardduck mallardduck mentioned this pull request Jun 1, 2026
3 tasks
@@ -0,0 +1,2 @@
url: https://github.com/rancher/PushProx/releases/download/v0.1.10/rancher-pushprox-0.1.10.tgz

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
url: https://github.com/rancher/PushProx/releases/download/v0.1.10/rancher-pushprox-0.1.10.tgz
url: https://github.com/rancher/PushProx/releases/download/v0.1.11/rancher-pushprox-0.1.11.tgz

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TYty. Just did a big rebase and included this as a new commit.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants