Merge branch 'dev-v2.8' into dev2.8_elemental-1.4.3

charts/fleet-agent/103.1.4+up0.9.4-rc.1/Chart.yaml → charts/fleet-agent/103.1.4+up0.9.4-rc.2/Chart.yaml

@@ -8,8 +8,8 @@ annotations:
   catalog.cattle.io/rancher-version: '>= 2.8.0-0 < 2.9.0-0'
   catalog.cattle.io/release-name: fleet-agent
 apiVersion: v2
-appVersion: 0.9.4-rc.1
+appVersion: 0.9.4-rc.2
 description: Fleet Manager Agent - GitOps at Scale
 icon: https://charts.rancher.io/assets/logos/fleet.svg
 name: fleet-agent
-version: 103.1.4+up0.9.4-rc.1
+version: 103.1.4+up0.9.4-rc.2

charts/fleet-agent/103.1.4+up0.9.4-rc.1/values.yaml → charts/fleet-agent/103.1.4+up0.9.4-rc.2/values.yaml

@@ -1,7 +1,7 @@
 image:
   os: "windows,linux"
   repository: rancher/fleet-agent
-  tag: v0.9.4-rc.1
+  tag: v0.9.4-rc.2
 
 # The public URL of the Kubernetes API server running the Fleet Manager must be set here
 # Example: https://example.com:6443

charts/fleet-crd/103.1.4+up0.9.4-rc.1/Chart.yaml → charts/fleet-crd/103.1.4+up0.9.4-rc.2/Chart.yaml

@@ -6,8 +6,8 @@ annotations:
   catalog.cattle.io/permits-os: linux,windows
   catalog.cattle.io/release-name: fleet-crd
 apiVersion: v2
-appVersion: 0.9.4-rc.1
+appVersion: 0.9.4-rc.2
 description: Fleet Manager CustomResourceDefinitions
 icon: https://charts.rancher.io/assets/logos/fleet.svg
 name: fleet-crd
-version: 103.1.4+up0.9.4-rc.1
+version: 103.1.4+up0.9.4-rc.2

charts/fleet/103.1.4+up0.9.4-rc.1/Chart.yaml → charts/fleet/103.1.4+up0.9.4-rc.2/Chart.yaml

@@ -11,12 +11,12 @@ annotations:
   catalog.cattle.io/rancher-version: '>= 2.8.0-0 < 2.9.0-0'
   catalog.cattle.io/release-name: fleet
 apiVersion: v2
-appVersion: 0.9.4-rc.1
+appVersion: 0.9.4-rc.2
 dependencies:
 - condition: gitops.enabled
   name: gitjob
   repository: file://./charts/gitjob
 description: Fleet Manager - GitOps at Scale
 icon: https://charts.rancher.io/assets/logos/fleet.svg
 name: fleet
-version: 103.1.4+up0.9.4-rc.1
+version: 103.1.4+up0.9.4-rc.2

charts/fleet/103.1.4+up0.9.4-rc.1/charts/gitjob/Chart.yaml → charts/fleet/103.1.4+up0.9.4-rc.2/charts/gitjob/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 0.9.6
+appVersion: 0.9.7
 description: Controller that run jobs based on git events
 name: gitjob
-version: 0.9.6
+version: 0.9.7

charts/fleet/103.1.4+up0.9.4-rc.1/charts/gitjob/values.yaml → charts/fleet/103.1.4+up0.9.4-rc.2/charts/gitjob/values.yaml

@@ -1,6 +1,6 @@
 gitjob:
   repository: rancher/gitjob
-  tag: v0.9.6
+  tag: v0.9.7
 
 global:
   cattle:

charts/fleet/103.1.4+up0.9.4-rc.1/values.yaml → charts/fleet/103.1.4+up0.9.4-rc.2/values.yaml

@@ -1,11 +1,11 @@
 image:
   repository: rancher/fleet
-  tag: v0.9.4-rc.1
+  tag: v0.9.4-rc.2
   imagePullPolicy: IfNotPresent
 
 agentImage:
   repository: rancher/fleet-agent
-  tag: v0.9.4-rc.1
+  tag: v0.9.4-rc.2
   imagePullPolicy: IfNotPresent
 
 # For cluster registration the public URL of the Kubernetes API server must be set here

index.yaml

@@ -676,19 +676,19 @@ entries:
       catalog.cattle.io/rancher-version: '>= 2.8.0-0 < 2.9.0-0'
       catalog.cattle.io/release-name: fleet
     apiVersion: v2
-    appVersion: 0.9.4-rc.1
-    created: "2024-04-23T10:29:49.642794264Z"
+    appVersion: 0.9.4-rc.2
+    created: "2024-04-29T08:46:47.478643658Z"
     dependencies:
     - condition: gitops.enabled
       name: gitjob
       repository: file://./charts/gitjob
     description: Fleet Manager - GitOps at Scale
-    digest: 29f050a7486036ec01fa105cbcee99efcb4d4a9f4499098850ea33641dd75bed
+    digest: c46d56a618caac6dd62b352a901badfb3dc30fe1d3151d80044f904cabb4eda1
     icon: https://charts.rancher.io/assets/logos/fleet.svg
     name: fleet
     urls:
-    - assets/fleet/fleet-103.1.4+up0.9.4-rc.1.tgz
-    version: 103.1.4+up0.9.4-rc.1
+    - assets/fleet/fleet-103.1.4+up0.9.4-rc.2.tgz
+    version: 103.1.4+up0.9.4-rc.2
   - annotations:
       catalog.cattle.io/auto-install: fleet-crd=match
       catalog.cattle.io/certified: rancher
@@ -1405,15 +1405,15 @@ entries:
       catalog.cattle.io/rancher-version: '>= 2.8.0-0 < 2.9.0-0'
       catalog.cattle.io/release-name: fleet-agent
     apiVersion: v2
-    appVersion: 0.9.4-rc.1
-    created: "2024-04-23T10:29:51.37676842Z"
+    appVersion: 0.9.4-rc.2
+    created: "2024-04-29T08:46:49.668803758Z"
     description: Fleet Manager Agent - GitOps at Scale
-    digest: 13a8c2539fd92fe082bc89f697c809f469ef921412739fd84bb44ec05861beea
+    digest: 66c9eee25d5a317566aa048c89192033e5a6032705e39f5c0f652487af52c758
     icon: https://charts.rancher.io/assets/logos/fleet.svg
     name: fleet-agent
     urls:
-    - assets/fleet-agent/fleet-agent-103.1.4+up0.9.4-rc.1.tgz
-    version: 103.1.4+up0.9.4-rc.1
+    - assets/fleet-agent/fleet-agent-103.1.4+up0.9.4-rc.2.tgz
+    version: 103.1.4+up0.9.4-rc.2
   - annotations:
       catalog.cattle.io/certified: rancher
       catalog.cattle.io/hidden: "true"
@@ -1949,15 +1949,15 @@ entries:
       catalog.cattle.io/permits-os: linux,windows
       catalog.cattle.io/release-name: fleet-crd
     apiVersion: v2
-    appVersion: 0.9.4-rc.1
-    created: "2024-04-23T10:29:53.166748184Z"
+    appVersion: 0.9.4-rc.2
+    created: "2024-04-29T08:46:51.625739865Z"
     description: Fleet Manager CustomResourceDefinitions
-    digest: a6c9023fa43635e3eb22d2a370934dbc638da62bd5454418e93b7b48233efe61
+    digest: bb6d28d3712b373644583343699ad26f3c8970a47d8603128eaab5c9c11fb9a3
     icon: https://charts.rancher.io/assets/logos/fleet.svg
     name: fleet-crd
     urls:
-    - assets/fleet-crd/fleet-crd-103.1.4+up0.9.4-rc.1.tgz
-    version: 103.1.4+up0.9.4-rc.1
+    - assets/fleet-crd/fleet-crd-103.1.4+up0.9.4-rc.2.tgz
+    version: 103.1.4+up0.9.4-rc.2
   - annotations:
       catalog.cattle.io/certified: rancher
       catalog.cattle.io/hidden: "true"

packages/fleet/fleet-agent/generated-changes/patch/Chart.yaml.patch

@@ -11,4 +11,4 @@
 +  catalog.cattle.io/rancher-version: '>= 2.8.0-0 < 2.9.0-0'
    catalog.cattle.io/release-name: fleet-agent
  apiVersion: v2
- appVersion: 0.9.4-rc.1
+ appVersion: 0.9.4-rc.2

packages/fleet/fleet-agent/package.yaml

@@ -1,2 +1,2 @@
-url: https://github.com/rancher/fleet/releases/download/v0.9.4-rc.1/fleet-agent-0.9.4-rc.1.tgz
+url: https://github.com/rancher/fleet/releases/download/v0.9.4-rc.2/fleet-agent-0.9.4-rc.2.tgz
 version: 103.1.4

packages/fleet/fleet-crd/package.yaml

@@ -1,2 +1,2 @@
-url: https://github.com/rancher/fleet/releases/download/v0.9.4-rc.1/fleet-crd-0.9.4-rc.1.tgz
+url: https://github.com/rancher/fleet/releases/download/v0.9.4-rc.2/fleet-crd-0.9.4-rc.2.tgz
 version: 103.1.4

packages/fleet/fleet/generated-changes/patch/Chart.yaml.patch

@@ -12,12 +12,12 @@
 +  catalog.cattle.io/rancher-version: '>= 2.8.0-0 < 2.9.0-0'
    catalog.cattle.io/release-name: fleet
  apiVersion: v2
- appVersion: 0.9.4-rc.1
+ appVersion: 0.9.4-rc.2
 @@ -14,7 +16,6 @@
  - condition: gitops.enabled
    name: gitjob
    repository: file://./charts/gitjob
--  version: 0.9.6
+-  version: 0.9.7
  description: Fleet Manager - GitOps at Scale
  icon: https://charts.rancher.io/assets/logos/fleet.svg
  name: fleet

packages/fleet/fleet/package.yaml

@@ -1,2 +1,2 @@
-url: https://github.com/rancher/fleet/releases/download/v0.9.4-rc.1/fleet-0.9.4-rc.1.tgz
+url: https://github.com/rancher/fleet/releases/download/v0.9.4-rc.2/fleet-0.9.4-rc.2.tgz
 version: 103.1.4

packages/fleet/gitjob/package.yaml

@@ -1,3 +1,3 @@
-url: https://github.com/rancher/fleet/releases/download/v0.9.4-rc.1/fleet-0.9.4-rc.1.tgz
+url: https://github.com/rancher/fleet/releases/download/v0.9.4-rc.2/fleet-0.9.4-rc.2.tgz
 subdirectory: charts/gitjob
 doNotRelease: true

regsync.yaml

@@ -231,6 +231,7 @@ sync:
     - 1.8.15
     - 1.8.9
     - 1.9.3
+    - v1.8.10
 - source: docker.io/rancher/fluent-bit-out-syslog
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/fluent-bit-out-syslog'
   type: repository
@@ -1037,6 +1038,12 @@ sync:
     - 1.15.9
     - 1.19.2
     - 1.24.6
+- source: docker.io/rancher/mirrored-kube-logging-logging-operator
+  target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-kube-logging-logging-operator'
+  type: repository
+  tags:
+    allow:
+    - 4.4.0
 - source: docker.io/rancher/mirrored-kube-rbac-proxy
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-kube-rbac-proxy'
   type: repository

release.yaml

@@ -3,22 +3,17 @@ elemental:
 elemental-crd:
   - 103.2.0+up1.4.3
 fleet:
-  - 102.2.3+up0.8.3
-  - 103.1.4+up0.9.4-rc.1
+  - 103.1.4+up0.9.4-rc.2
 fleet-agent:
-  - 102.2.3+up0.8.3
-  - 103.1.4+up0.9.4-rc.1
+  - 103.1.4+up0.9.4-rc.2
 fleet-crd:
-  - 102.2.3+up0.8.3
-  - 103.1.4+up0.9.4-rc.1
+  - 103.1.4+up0.9.4-rc.2
 longhorn:
   - 103.3.0+up1.6.1
 longhorn-crd:
   - 103.3.0+up1.6.1
 prometheus-federator:
   - 103.0.1+up0.4.1
-rancher-alerting-drivers:
-  - 103.0.2
 rancher-backup:
   - 103.0.2+up4.0.2-rc1
 rancher-backup-crd:
@@ -28,14 +23,7 @@ rancher-cis-benchmark:
 rancher-cis-benchmark-crd:
   - 5.2.0-rc1
 rancher-istio:
-  - 103.0.1+up1.18.2
-  - 103.1.1+up1.19.6
-  - 103.2.1+up1.20.3
   - 103.3.0+up1.21.1
-rancher-logging:
-  - 103.1.0+up4.4.0
-rancher-logging-crd:
-  - 103.1.0+up4.4.0
 rancher-monitoring:
   - 103.1.0-rc1+up45.31.1
 rancher-monitoring-crd:

scripts/release-validation/pr-review-template.md

@@ -1,4 +1,4 @@
-## Charts Checklist (built for v0.3.x charts-build-scripts)
+## Charts Checklist (built for v0.5.5 charts-build-scripts)
 
 ### Checkpoint 0: Validate `release.yaml`