Merge remote-tracking branch 'upstream/release-v2.7' into sync-dev-27…

…-after-2.7.16

.gitignore

@@ -2,6 +2,6 @@ bin
 *.DS_Store
 .idea
 .charts-build-scripts
-logs/*
 *.swp
+logs/*
 state.json

index.yaml

@@ -13528,69 +13528,91 @@ entries:
  - condition: grafana.enabled
  name: grafana
  repository: file://./charts/grafana
+ version: 6.38.6
  - condition: hardenedKubelet.enabled
  name: hardenedKubelet
  repository: file://./charts/hardenedKubelet
+ version: 0.2.0
  - condition: hardenedNodeExporter.enabled
  name: hardenedNodeExporter
  repository: file://./charts/hardenedNodeExporter
+ version: 0.2.0
  - condition: k3sServer.enabled
  name: k3sServer
  repository: file://./charts/k3sServer
+ version: 0.2.0
  - condition: kubeStateMetrics.enabled
  name: kube-state-metrics
  repository: file://./charts/kube-state-metrics
+ version: 4.18.0
  - condition: kubeAdmControllerManager.enabled
  name: kubeAdmControllerManager
  repository: file://./charts/kubeAdmControllerManager
+ version: 0.2.0
  - condition: kubeAdmEtcd.enabled
  name: kubeAdmEtcd
  repository: file://./charts/kubeAdmEtcd
+ version: 0.2.0
  - condition: kubeAdmProxy.enabled
  name: kubeAdmProxy
  repository: file://./charts/kubeAdmProxy
+ version: 0.2.0
  - condition: kubeAdmScheduler.enabled
  name: kubeAdmScheduler
  repository: file://./charts/kubeAdmScheduler
+ version: 0.2.0
  - condition: prometheus-adapter.enabled
  name: prometheus-adapter
  repository: file://./charts/prometheus-adapter
+ version: 3.4.0
  - condition: nodeExporter.enabled
  name: prometheus-node-exporter
  repository: file://./charts/prometheus-node-exporter
+ version: 4.2.0
  - condition: rke2ControllerManager.enabled
  name: rke2ControllerManager
  repository: file://./charts/rke2ControllerManager
+ version: 0.2.0
  - condition: rke2Etcd.enabled
  name: rke2Etcd
  repository: file://./charts/rke2Etcd
+ version: 0.2.0
  - condition: rke2IngressNginx.enabled
  name: rke2IngressNginx
  repository: file://./charts/rke2IngressNginx
+ version: 0.2.0
  - condition: rke2Proxy.enabled
  name: rke2Proxy
  repository: file://./charts/rke2Proxy
+ version: 0.2.0
  - condition: rke2Scheduler.enabled
  name: rke2Scheduler
  repository: file://./charts/rke2Scheduler
+ version: 0.2.0
  - condition: rkeControllerManager.enabled
  name: rkeControllerManager
  repository: file://./charts/rkeControllerManager
+ version: 0.2.0
  - condition: rkeEtcd.enabled
  name: rkeEtcd
  repository: file://./charts/rkeEtcd
+ version: 0.2.0
  - condition: rkeIngressNginx.enabled
  name: rkeIngressNginx
  repository: file://./charts/rkeIngressNginx
+ version: 0.2.0
  - condition: rkeProxy.enabled
  name: rkeProxy
  repository: file://./charts/rkeProxy
+ version: 0.2.0
  - condition: rkeScheduler.enabled
  name: rkeScheduler
  repository: file://./charts/rkeScheduler
+ version: 0.2.0
  - condition: global.cattle.windows.enabled
  name: windowsExporter
  repository: file://./charts/windowsExporter
+ version: 0.1.1
  description: Collects several related Helm charts, Grafana dashboards, and Prometheus
  rules combined with documentation and scripts to provide easy to operate end-to-end
  Kubernetes cluster monitoring with Prometheus using the Prometheus Operator.

regsync.yaml

@@ -31,6 +31,7 @@ sync:
  - v1.1.2
  - v1.1.3
  - v1.1.4
+ - v1.1.5
 - source: docker.io/rancher/backup-restore-operator
  target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/backup-restore-operator'
  type: repository
@@ -137,6 +138,7 @@ sync:
  - v1.2.1
  - v1.2.2
  - v1.2.3
+ - v1.2.4
 - source: docker.io/rancher/externalip-webhook
  target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/externalip-webhook'
  type: repository
@@ -178,6 +180,7 @@ sync:
  - v0.8.3
  - v0.8.4
  - v0.8.5
+ - v0.8.6
 - source: docker.io/rancher/fleet-agent
  target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/fleet-agent'
  type: repository
@@ -210,6 +213,7 @@ sync:
  - v0.8.3
  - v0.8.4
  - v0.8.5
+ - v0.8.6
 - source: docker.io/rancher/fluent-bit
  target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/fluent-bit'
  type: repository
@@ -258,6 +262,7 @@ sync:
  - v0.1.76
  - v0.1.76-security1
  - v0.1.8
+ - v0.8.13
  - v0.8.2
  - v0.8.3
  - v0.8.7
@@ -274,6 +279,7 @@ sync:
  - v1.1.5
  - v1.1.6
  - v1.1.7
+ - v1.1.8
 - source: docker.io/rancher/grafana-grafana
  target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/grafana-grafana'
  type: repository
@@ -1786,6 +1792,7 @@ sync:
  - v0.1.37
  - v0.1.43
  - v0.1.44
+ - v0.1.47
  - v0.1.5
  - v0.1.6
  - v0.1.7