Merge branch 'dev-v2.6' into disable_client_metrics

charts/fleet-agent/100.0.3+up0.3.9-rc2/Chart.yaml

@@ -5,8 +5,8 @@ annotations:
   catalog.cattle.io/os: linux
   catalog.cattle.io/release-name: fleet-agent
 apiVersion: v2
-appVersion: 0.3.9-rc1
+appVersion: 0.3.9-rc2
 description: Fleet Manager Agent - GitOps at Scale
 icon: https://charts.rancher.io/assets/logos/fleet.svg
 name: fleet-agent
-version: 100.0.3+up0.3.9-rc1
+version: 100.0.3+up0.3.9-rc2

charts/fleet-agent/100.0.3+up0.3.9-rc2/values.yaml

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

charts/fleet-crd/100.0.3+up0.3.9-rc2/Chart.yaml

@@ -5,8 +5,8 @@ annotations:
   catalog.cattle.io/os: linux
   catalog.cattle.io/release-name: fleet-crd
 apiVersion: v2
-appVersion: 0.3.9-rc1
+appVersion: 0.3.9-rc2
 description: Fleet Manager CustomResourceDefinitions
 icon: https://charts.rancher.io/assets/logos/fleet.svg
 name: fleet-crd
-version: 100.0.3+up0.3.9-rc1
+version: 100.0.3+up0.3.9-rc2

charts/fleet/100.0.3+up0.3.9-rc2/Chart.yaml

@@ -8,7 +8,7 @@ annotations:
   catalog.cattle.io/provides-gvr: clusters.fleet.cattle.io/v1alpha1
   catalog.cattle.io/release-name: fleet
 apiVersion: v2
-appVersion: 0.3.9-rc1
+appVersion: 0.3.9-rc2
 dependencies:
 - condition: gitops.enabled
   name: gitjob
@@ -16,4 +16,4 @@ dependencies:
 description: Fleet Manager - GitOps at Scale
 icon: https://charts.rancher.io/assets/logos/fleet.svg
 name: fleet
-version: 100.0.3+up0.3.9-rc1
+version: 100.0.3+up0.3.9-rc2

charts/fleet/100.0.3+up0.3.9-rc2/charts/gitjob/Chart.yaml

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

charts/fleet/100.0.3+up0.3.9-rc2/charts/gitjob/values.yaml

@@ -1,6 +1,6 @@
 gitjob:
   repository: rancher/gitjob
-  tag: v0.1.23
+  tag: v0.1.24
 
 tekton:
   repository: rancher/tekton-utils

charts/fleet/100.0.3+up0.3.9-rc2/values.yaml

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

charts/rancher-webhook/1.0.4+up0.2.5-rc1/Chart.yaml

@@ -5,11 +5,11 @@ annotations:
   catalog.cattle.io/os: linux
   catalog.cattle.io/release-name: rancher-webhook
 apiVersion: v2
-appVersion: 0.2.4-rc3
+appVersion: 0.2.5-rc1
 dependencies:
 - condition: capi.enabled
   name: capi
   repository: ""
 description: ValidatingAdmissionWebhook for Rancher types
 name: rancher-webhook
-version: 1.0.3+up0.2.4-rc3
+version: 1.0.4+up0.2.5-rc1

charts/rancher-webhook/1.0.4+up0.2.5-rc1/templates/deployment.yaml

@@ -18,6 +18,10 @@ spec:
       {{- if .Values.global.hostNetwork }}
       hostNetwork: true
       {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
       - env:
         - name: STAMP

charts/rancher-webhook/1.0.4+up0.2.5-rc1/templates/pre-delete-hook-job.yaml

@@ -18,9 +18,15 @@ spec:
     spec:
       serviceAccountName: rancher-webhook-pre-delete
       restartPolicy: OnFailure
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
         - name: rancher-webhook-pre-delete
           image: "{{ include "system_default_registry" . }}{{ .Values.preDelete.image.repository }}:{{ .Values.preDelete.image.tag }}"
           imagePullPolicy: IfNotPresent
+          securityContext:
+            runAsUser: 0
           command: [ "kubectl", "delete", "--ignore-not-found=true", "mutatingwebhookconfigurations", "rancher.cattle.io" ]
 {{- end }}

charts/rancher-webhook/1.0.4+up0.2.5-rc1/values.yaml

@@ -1,6 +1,6 @@
 image:
   repository: rancher/rancher-webhook
-  tag: v0.2.4-rc3
+  tag: v0.2.5-rc1
   imagePullPolicy: IfNotPresent
 
 global:
@@ -19,3 +19,6 @@ preDelete:
   image:
     repository: rancher/kubectl
     tag: v1.20.2
+
+# tolerations for the webhook deployment. See https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/ for more info
+tolerations: []

docs/developing.md

@@ -98,6 +98,10 @@ As a result, developers reviewing your chart can see changes made to `packages/`
 
 You are ready to make a PR!
 
+### Known Issue: Making Changes to the Version of an Existing Package
+
+If you are working with a repository using `charts-build-scripts` that uses remote validation (e.g. `validate.url` and `validate.branch` are provided in the `configuration.yaml`) and you are making a change that would modify the version of an existing package (e.g. replacing a version like `0.1.2-rc3` with `0.1.2-rc4`), please see the section `Modifying Chart Versions That Exist In Upstream` within [`docs/validation.md`](docs/validation.md) for how to ensure CI still passes after making your change.
+
 ### Versioning Packages
 
 Generally, repositories that are using `charts-build-scripts` use one of the following two types of built-in versioning schemes for packages:

docs/validation.md

@@ -45,3 +45,30 @@ longhorn-crd:
 - 100.0.0+up1.1.2
 - 100.0.0+up1.2.0
 ```
+
+### Modifying Chart Versions That Exist In Upstream
+
+One of the caveats with using the `release.yaml` is that **renames are not supported** (e.g. you cannot remove and replace a chart in a single step). 
+
+As a result, if you attempt to modify a version of a chart that already exists in upstream, **both the old version and the new version must exist in the release.yaml for CI to pass**. Once the changes have been merged, you can later remove the old version from the release.yaml (usually as part of a release process).
+
+To give a concrete example of such a scenario, let's say that you have currently committed `my-chart` version `0.1.2-rc3`. You then take the following steps:
+1. You modify the `package.yaml` to point at a new upstream URL that points to `0.1.2-rc4` and resolve any conflicts with the patch files under `packages/my-chart-package/generated-changes`
+2. You run `CHART=my-chart VERSION=0.1.2-rc3 make remove` to delete the older version of the chart
+3. You run `make charts` to produce the new assets and charts for `my-chart` version `0.1.2-rc4`.
+4. You modify the release.yaml to **replace** `my-chart[0] = 0.1.2-rc3` with `my-chart[0] = 0.1.2-rc4`.
+4. You make a PR to your repository.
+
+In this case, CI will fail since you are attempting to remove `0.1.2-rc3` but it is not tracked in the `release.yaml`.
+
+Therefore, the correct resolution would be to leave your `release.yaml` as:
+
+```yaml
+...
+my-chart:
+- 0.1.2-rc3
+- 0.1.2-rc4
+...
+```
+
+That way, both the removal of `0.1.2-rc3` and the addition of `0.1.2-rc4` are accepted. Later, you can remove `0.1.2-rc3` once the PR has been committed.

index.yaml

@@ -11,19 +11,19 @@ entries:
       catalog.cattle.io/provides-gvr: clusters.fleet.cattle.io/v1alpha1
       catalog.cattle.io/release-name: fleet
     apiVersion: v2
-    appVersion: 0.3.9-rc1
-    created: "2022-01-06T12:22:52.988147-08:00"
+    appVersion: 0.3.9-rc2
+    created: "2022-01-18T14:33:23.271964+05:30"
     dependencies:
     - condition: gitops.enabled
       name: gitjob
       repository: file://./charts/gitjob
     description: Fleet Manager - GitOps at Scale
-    digest: 0bdb5e5b40dd2a8314ded6f7168ce3cb87b0a625578acdc3a0dc2d3aa023ecb2
+    digest: 8d60e821c8602f5223152137d9ec061e5fbea8d7e52ee4efbb803f8e16fbff62
     icon: https://charts.rancher.io/assets/logos/fleet.svg
     name: fleet
     urls:
-    - assets/fleet/fleet-100.0.3+up0.3.9-rc1.tgz
-    version: 100.0.3+up0.3.9-rc1
+    - assets/fleet/fleet-100.0.3+up0.3.9-rc2.tgz
+    version: 100.0.3+up0.3.9-rc2
   - annotations:
       catalog.cattle.io/auto-install: fleet-crd=match
       catalog.cattle.io/certified: rancher
@@ -215,15 +215,15 @@ entries:
       catalog.cattle.io/os: linux
       catalog.cattle.io/release-name: fleet-agent
     apiVersion: v2
-    appVersion: 0.3.9-rc1
-    created: "2022-01-06T12:22:54.608073-08:00"
+    appVersion: 0.3.9-rc2
+    created: "2022-01-18T14:33:24.342677+05:30"
     description: Fleet Manager Agent - GitOps at Scale
-    digest: 873aad501d391986bcffd12227c86a86bef0a024675cca9a5cda083b1762b274
+    digest: 098d7b19386d01a73ede63274cd2ea8ae5f1608221e88157b84c0c6bcaa1c4a5
     icon: https://charts.rancher.io/assets/logos/fleet.svg
     name: fleet-agent
     urls:
-    - assets/fleet-agent/fleet-agent-100.0.3+up0.3.9-rc1.tgz
-    version: 100.0.3+up0.3.9-rc1
+    - assets/fleet-agent/fleet-agent-100.0.3+up0.3.9-rc2.tgz
+    version: 100.0.3+up0.3.9-rc2
   - annotations:
       catalog.cattle.io/certified: rancher
       catalog.cattle.io/hidden: "true"
@@ -376,15 +376,15 @@ entries:
       catalog.cattle.io/os: linux
       catalog.cattle.io/release-name: fleet-crd
     apiVersion: v2
-    appVersion: 0.3.9-rc1
-    created: "2022-01-06T12:22:59.527333-08:00"
+    appVersion: 0.3.9-rc2
+    created: "2022-01-18T14:33:23.819857+05:30"
     description: Fleet Manager CustomResourceDefinitions
-    digest: 9fe2dffc184ace4d545c3033722ecaaa6a5b37e36ae7fdc1b5c6b0db6174b804
+    digest: b1b4611e7840467eaa10d385daa8b5d97c14916f9373ac2d1131faeab92bfe60
     icon: https://charts.rancher.io/assets/logos/fleet.svg
     name: fleet-crd
     urls:
-    - assets/fleet-crd/fleet-crd-100.0.3+up0.3.9-rc1.tgz
-    version: 100.0.3+up0.3.9-rc1
+    - assets/fleet-crd/fleet-crd-100.0.3+up0.3.9-rc2.tgz
+    version: 100.0.3+up0.3.9-rc2
   - annotations:
       catalog.cattle.io/certified: rancher
       catalog.cattle.io/hidden: "true"
@@ -5929,18 +5929,18 @@ entries:
       catalog.cattle.io/os: linux
       catalog.cattle.io/release-name: rancher-webhook
     apiVersion: v2
-    appVersion: 0.2.4-rc3
-    created: "2022-01-10T12:40:18.900344-05:00"
+    appVersion: 0.2.5-rc1
+    created: "2022-01-21T16:27:53.531164-05:00"
     dependencies:
     - condition: capi.enabled
       name: capi
       repository: ""
     description: ValidatingAdmissionWebhook for Rancher types
-    digest: c6990274fb5dde94ee99faef7739312a81a4f8e8d383df8e5dd7827aa32c8a1a
+    digest: 47fc5d796c783324c41e8781269e04fb01131239ea22629980902816d847a61a
     name: rancher-webhook
     urls:
-    - assets/rancher-webhook/rancher-webhook-1.0.3+up0.2.4-rc3.tgz
-    version: 1.0.3+up0.2.4-rc3
+    - assets/rancher-webhook/rancher-webhook-1.0.4+up0.2.5-rc1.tgz
+    version: 1.0.4+up0.2.5-rc1
   - annotations:
       catalog.cattle.io/certified: rancher
       catalog.cattle.io/hidden: "true"

packages/fleet/fleet-agent/package.yaml

@@ -1,2 +1,2 @@
-url: https://github.com/rancher/fleet/releases/download/v0.3.9-rc1/fleet-agent-0.3.9-rc1.tgz
+url: https://github.com/rancher/fleet/releases/download/v0.3.9-rc2/fleet-agent-0.3.9-rc2.tgz
 version: 100.0.3

packages/fleet/fleet-crd/package.yaml

@@ -1,2 +1,2 @@
-url: https://github.com/rancher/fleet/releases/download/v0.3.9-rc1/fleet-crd-0.3.9-rc1.tgz
+url: https://github.com/rancher/fleet/releases/download/v0.3.9-rc2/fleet-crd-0.3.9-rc2.tgz
 version: 100.0.3

packages/fleet/fleet/generated-changes/dependencies/gitjob/dependency.yaml

@@ -1,3 +1,3 @@
 workingDir: ""
-url: https://github.com/rancher/fleet/releases/download/v0.3.9-rc1/fleet-0.3.9-rc1.tgz
+url: https://github.com/rancher/fleet/releases/download/v0.3.9-rc2/fleet-0.3.9-rc2.tgz
 subdirectory: charts/gitjob

packages/fleet/fleet/package.yaml

@@ -1,2 +1,2 @@
-url: https://github.com/rancher/fleet/releases/download/v0.3.9-rc1/fleet-0.3.9-rc1.tgz
+url: https://github.com/rancher/fleet/releases/download/v0.3.9-rc2/fleet-0.3.9-rc2.tgz
 version: 100.0.3

packages/rancher-webhook/package.yaml

@@ -1,2 +1,2 @@
-url: https://github.com/rancher/webhook/releases/download/v0.2.4-rc3/rancher-webhook-0.2.4-rc3.tgz
-version: 1.0.3
+url: https://github.com/rancher/webhook/releases/download/v0.2.5-rc1/rancher-webhook-0.2.5-rc1.tgz
+version: 1.0.4

release.yaml

@@ -1,9 +1,12 @@
 fleet:
 - 100.0.3+up0.3.9-rc1
+- 100.0.3+up0.3.9-rc2
 fleet-agent:
 - 100.0.3+up0.3.9-rc1
+- 100.0.3+up0.3.9-rc2
 fleet-crd:
 - 100.0.3+up0.3.9-rc1
+- 100.0.3+up0.3.9-rc2
 rancher-monitoring:
 - 100.1.1+up19.0.3
 rancher-monitoring-crd:
@@ -13,3 +16,6 @@ rancher-pushprox:
 rancher-webhook:
 - 1.0.3+up0.2.4-rc2
 - 1.0.3+up0.2.4-rc3
+- 1.0.3+up0.2.4-rc4
+- 1.0.3+up0.2.4-rc6
+- 1.0.4+up0.2.5-rc1

scripts/version

@@ -2,4 +2,4 @@
 set -e
 
 CHARTS_BUILD_SCRIPTS_REPO=https://github.com/rancher/charts-build-scripts.git
-CHARTS_BUILD_SCRIPT_VERSION=v0.3.1
+CHARTS_BUILD_SCRIPT_VERSION=v0.3.2