diff --git a/assets/fleet-agent/fleet-agent-100.0.3+up0.3.9-rc1.tgz b/assets/fleet-agent/fleet-agent-100.0.3+up0.3.9-rc1.tgz deleted file mode 100644 index 6476e1460..000000000 Binary files a/assets/fleet-agent/fleet-agent-100.0.3+up0.3.9-rc1.tgz and /dev/null differ diff --git a/assets/fleet-agent/fleet-agent-100.0.3+up0.3.9-rc2.tgz b/assets/fleet-agent/fleet-agent-100.0.3+up0.3.9-rc2.tgz new file mode 100644 index 000000000..b0ec07032 Binary files /dev/null and b/assets/fleet-agent/fleet-agent-100.0.3+up0.3.9-rc2.tgz differ diff --git a/assets/fleet-crd/fleet-crd-100.0.3+up0.3.9-rc1.tgz b/assets/fleet-crd/fleet-crd-100.0.3+up0.3.9-rc1.tgz deleted file mode 100644 index d15b971c6..000000000 Binary files a/assets/fleet-crd/fleet-crd-100.0.3+up0.3.9-rc1.tgz and /dev/null differ diff --git a/assets/fleet-crd/fleet-crd-100.0.3+up0.3.9-rc2.tgz b/assets/fleet-crd/fleet-crd-100.0.3+up0.3.9-rc2.tgz new file mode 100644 index 000000000..fc0898776 Binary files /dev/null and b/assets/fleet-crd/fleet-crd-100.0.3+up0.3.9-rc2.tgz differ diff --git a/assets/fleet/fleet-100.0.3+up0.3.9-rc1.tgz b/assets/fleet/fleet-100.0.3+up0.3.9-rc1.tgz deleted file mode 100644 index e671edbb2..000000000 Binary files a/assets/fleet/fleet-100.0.3+up0.3.9-rc1.tgz and /dev/null differ diff --git a/assets/fleet/fleet-100.0.3+up0.3.9-rc2.tgz b/assets/fleet/fleet-100.0.3+up0.3.9-rc2.tgz new file mode 100644 index 000000000..a97047c67 Binary files /dev/null and b/assets/fleet/fleet-100.0.3+up0.3.9-rc2.tgz differ diff --git a/assets/rancher-webhook/rancher-webhook-1.0.3+up0.2.4-rc3.tgz b/assets/rancher-webhook/rancher-webhook-1.0.3+up0.2.4-rc3.tgz deleted file mode 100644 index ccf133a2c..000000000 Binary files a/assets/rancher-webhook/rancher-webhook-1.0.3+up0.2.4-rc3.tgz and /dev/null differ diff --git a/assets/rancher-webhook/rancher-webhook-1.0.4+up0.2.5-rc1.tgz b/assets/rancher-webhook/rancher-webhook-1.0.4+up0.2.5-rc1.tgz new file mode 100644 index 000000000..90104e335 Binary files /dev/null and b/assets/rancher-webhook/rancher-webhook-1.0.4+up0.2.5-rc1.tgz differ diff --git a/charts/fleet-agent/100.0.3+up0.3.9-rc1/Chart.yaml b/charts/fleet-agent/100.0.3+up0.3.9-rc2/Chart.yaml similarity index 87% rename from charts/fleet-agent/100.0.3+up0.3.9-rc1/Chart.yaml rename to charts/fleet-agent/100.0.3+up0.3.9-rc2/Chart.yaml index 264cea235..6948f658e 100644 --- a/charts/fleet-agent/100.0.3+up0.3.9-rc1/Chart.yaml +++ b/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 diff --git a/charts/fleet-agent/100.0.3+up0.3.9-rc1/templates/_helpers.tpl b/charts/fleet-agent/100.0.3+up0.3.9-rc2/templates/_helpers.tpl similarity index 100% rename from charts/fleet-agent/100.0.3+up0.3.9-rc1/templates/_helpers.tpl rename to charts/fleet-agent/100.0.3+up0.3.9-rc2/templates/_helpers.tpl diff --git a/charts/fleet-agent/100.0.3+up0.3.9-rc1/templates/configmap.yaml b/charts/fleet-agent/100.0.3+up0.3.9-rc2/templates/configmap.yaml similarity index 100% rename from charts/fleet-agent/100.0.3+up0.3.9-rc1/templates/configmap.yaml rename to charts/fleet-agent/100.0.3+up0.3.9-rc2/templates/configmap.yaml diff --git a/charts/fleet-agent/100.0.3+up0.3.9-rc1/templates/deployment.yaml b/charts/fleet-agent/100.0.3+up0.3.9-rc2/templates/deployment.yaml similarity index 100% rename from charts/fleet-agent/100.0.3+up0.3.9-rc1/templates/deployment.yaml rename to charts/fleet-agent/100.0.3+up0.3.9-rc2/templates/deployment.yaml diff --git a/charts/fleet-agent/100.0.3+up0.3.9-rc1/templates/network_policy_allow_all.yaml b/charts/fleet-agent/100.0.3+up0.3.9-rc2/templates/network_policy_allow_all.yaml similarity index 100% rename from charts/fleet-agent/100.0.3+up0.3.9-rc1/templates/network_policy_allow_all.yaml rename to charts/fleet-agent/100.0.3+up0.3.9-rc2/templates/network_policy_allow_all.yaml diff --git a/charts/fleet-agent/100.0.3+up0.3.9-rc1/templates/patch_default_serviceaccount.yaml b/charts/fleet-agent/100.0.3+up0.3.9-rc2/templates/patch_default_serviceaccount.yaml similarity index 100% rename from charts/fleet-agent/100.0.3+up0.3.9-rc1/templates/patch_default_serviceaccount.yaml rename to charts/fleet-agent/100.0.3+up0.3.9-rc2/templates/patch_default_serviceaccount.yaml diff --git a/charts/fleet-agent/100.0.3+up0.3.9-rc1/templates/rbac.yaml b/charts/fleet-agent/100.0.3+up0.3.9-rc2/templates/rbac.yaml similarity index 100% rename from charts/fleet-agent/100.0.3+up0.3.9-rc1/templates/rbac.yaml rename to charts/fleet-agent/100.0.3+up0.3.9-rc2/templates/rbac.yaml diff --git a/charts/fleet-agent/100.0.3+up0.3.9-rc1/templates/secret.yaml b/charts/fleet-agent/100.0.3+up0.3.9-rc2/templates/secret.yaml similarity index 100% rename from charts/fleet-agent/100.0.3+up0.3.9-rc1/templates/secret.yaml rename to charts/fleet-agent/100.0.3+up0.3.9-rc2/templates/secret.yaml diff --git a/charts/fleet-agent/100.0.3+up0.3.9-rc1/templates/serviceaccount.yaml b/charts/fleet-agent/100.0.3+up0.3.9-rc2/templates/serviceaccount.yaml similarity index 100% rename from charts/fleet-agent/100.0.3+up0.3.9-rc1/templates/serviceaccount.yaml rename to charts/fleet-agent/100.0.3+up0.3.9-rc2/templates/serviceaccount.yaml diff --git a/charts/fleet-agent/100.0.3+up0.3.9-rc1/templates/validate.yaml b/charts/fleet-agent/100.0.3+up0.3.9-rc2/templates/validate.yaml similarity index 100% rename from charts/fleet-agent/100.0.3+up0.3.9-rc1/templates/validate.yaml rename to charts/fleet-agent/100.0.3+up0.3.9-rc2/templates/validate.yaml diff --git a/charts/fleet-agent/100.0.3+up0.3.9-rc1/values.yaml b/charts/fleet-agent/100.0.3+up0.3.9-rc2/values.yaml similarity index 98% rename from charts/fleet-agent/100.0.3+up0.3.9-rc1/values.yaml rename to charts/fleet-agent/100.0.3+up0.3.9-rc2/values.yaml index f6ab4ccdf..954b119c7 100644 --- a/charts/fleet-agent/100.0.3+up0.3.9-rc1/values.yaml +++ b/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 diff --git a/charts/fleet-crd/100.0.3+up0.3.9-rc1/Chart.yaml b/charts/fleet-crd/100.0.3+up0.3.9-rc2/Chart.yaml similarity index 87% rename from charts/fleet-crd/100.0.3+up0.3.9-rc1/Chart.yaml rename to charts/fleet-crd/100.0.3+up0.3.9-rc2/Chart.yaml index 66ddb4cb7..b296c1d0d 100644 --- a/charts/fleet-crd/100.0.3+up0.3.9-rc1/Chart.yaml +++ b/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 diff --git a/charts/fleet-crd/100.0.3+up0.3.9-rc1/templates/crds.yaml b/charts/fleet-crd/100.0.3+up0.3.9-rc2/templates/crds.yaml similarity index 100% rename from charts/fleet-crd/100.0.3+up0.3.9-rc1/templates/crds.yaml rename to charts/fleet-crd/100.0.3+up0.3.9-rc2/templates/crds.yaml diff --git a/charts/fleet-crd/100.0.3+up0.3.9-rc1/templates/gitjobs-crds.yaml b/charts/fleet-crd/100.0.3+up0.3.9-rc2/templates/gitjobs-crds.yaml similarity index 100% rename from charts/fleet-crd/100.0.3+up0.3.9-rc1/templates/gitjobs-crds.yaml rename to charts/fleet-crd/100.0.3+up0.3.9-rc2/templates/gitjobs-crds.yaml diff --git a/charts/fleet/100.0.3+up0.3.9-rc1/Chart.yaml b/charts/fleet/100.0.3+up0.3.9-rc2/Chart.yaml similarity index 92% rename from charts/fleet/100.0.3+up0.3.9-rc1/Chart.yaml rename to charts/fleet/100.0.3+up0.3.9-rc2/Chart.yaml index 436f4fa6c..3b44ebf08 100644 --- a/charts/fleet/100.0.3+up0.3.9-rc1/Chart.yaml +++ b/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 diff --git a/charts/fleet/100.0.3+up0.3.9-rc1/charts/gitjob/.helmignore b/charts/fleet/100.0.3+up0.3.9-rc2/charts/gitjob/.helmignore similarity index 100% rename from charts/fleet/100.0.3+up0.3.9-rc1/charts/gitjob/.helmignore rename to charts/fleet/100.0.3+up0.3.9-rc2/charts/gitjob/.helmignore diff --git a/charts/fleet/100.0.3+up0.3.9-rc1/charts/gitjob/Chart.yaml b/charts/fleet/100.0.3+up0.3.9-rc2/charts/gitjob/Chart.yaml similarity index 71% rename from charts/fleet/100.0.3+up0.3.9-rc1/charts/gitjob/Chart.yaml rename to charts/fleet/100.0.3+up0.3.9-rc2/charts/gitjob/Chart.yaml index 1166f156b..b3842cd91 100644 --- a/charts/fleet/100.0.3+up0.3.9-rc1/charts/gitjob/Chart.yaml +++ b/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 diff --git a/charts/fleet/100.0.3+up0.3.9-rc1/charts/gitjob/templates/_helpers.tpl b/charts/fleet/100.0.3+up0.3.9-rc2/charts/gitjob/templates/_helpers.tpl similarity index 100% rename from charts/fleet/100.0.3+up0.3.9-rc1/charts/gitjob/templates/_helpers.tpl rename to charts/fleet/100.0.3+up0.3.9-rc2/charts/gitjob/templates/_helpers.tpl diff --git a/charts/fleet/100.0.3+up0.3.9-rc1/charts/gitjob/templates/clusterrole.yaml b/charts/fleet/100.0.3+up0.3.9-rc2/charts/gitjob/templates/clusterrole.yaml similarity index 100% rename from charts/fleet/100.0.3+up0.3.9-rc1/charts/gitjob/templates/clusterrole.yaml rename to charts/fleet/100.0.3+up0.3.9-rc2/charts/gitjob/templates/clusterrole.yaml diff --git a/charts/fleet/100.0.3+up0.3.9-rc1/charts/gitjob/templates/clusterrolebinding.yaml b/charts/fleet/100.0.3+up0.3.9-rc2/charts/gitjob/templates/clusterrolebinding.yaml similarity index 100% rename from charts/fleet/100.0.3+up0.3.9-rc1/charts/gitjob/templates/clusterrolebinding.yaml rename to charts/fleet/100.0.3+up0.3.9-rc2/charts/gitjob/templates/clusterrolebinding.yaml diff --git a/charts/fleet/100.0.3+up0.3.9-rc1/charts/gitjob/templates/deployment.yaml b/charts/fleet/100.0.3+up0.3.9-rc2/charts/gitjob/templates/deployment.yaml similarity index 100% rename from charts/fleet/100.0.3+up0.3.9-rc1/charts/gitjob/templates/deployment.yaml rename to charts/fleet/100.0.3+up0.3.9-rc2/charts/gitjob/templates/deployment.yaml diff --git a/charts/fleet/100.0.3+up0.3.9-rc1/charts/gitjob/templates/service.yaml b/charts/fleet/100.0.3+up0.3.9-rc2/charts/gitjob/templates/service.yaml similarity index 100% rename from charts/fleet/100.0.3+up0.3.9-rc1/charts/gitjob/templates/service.yaml rename to charts/fleet/100.0.3+up0.3.9-rc2/charts/gitjob/templates/service.yaml diff --git a/charts/fleet/100.0.3+up0.3.9-rc1/charts/gitjob/templates/serviceaccount.yaml b/charts/fleet/100.0.3+up0.3.9-rc2/charts/gitjob/templates/serviceaccount.yaml similarity index 100% rename from charts/fleet/100.0.3+up0.3.9-rc1/charts/gitjob/templates/serviceaccount.yaml rename to charts/fleet/100.0.3+up0.3.9-rc2/charts/gitjob/templates/serviceaccount.yaml diff --git a/charts/fleet/100.0.3+up0.3.9-rc1/charts/gitjob/values.yaml b/charts/fleet/100.0.3+up0.3.9-rc2/charts/gitjob/values.yaml similarity index 95% rename from charts/fleet/100.0.3+up0.3.9-rc1/charts/gitjob/values.yaml rename to charts/fleet/100.0.3+up0.3.9-rc2/charts/gitjob/values.yaml index 4b9434d38..c5d884cff 100644 --- a/charts/fleet/100.0.3+up0.3.9-rc1/charts/gitjob/values.yaml +++ b/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 diff --git a/charts/fleet/100.0.3+up0.3.9-rc1/templates/_helpers.tpl b/charts/fleet/100.0.3+up0.3.9-rc2/templates/_helpers.tpl similarity index 100% rename from charts/fleet/100.0.3+up0.3.9-rc1/templates/_helpers.tpl rename to charts/fleet/100.0.3+up0.3.9-rc2/templates/_helpers.tpl diff --git a/charts/fleet/100.0.3+up0.3.9-rc1/templates/configmap.yaml b/charts/fleet/100.0.3+up0.3.9-rc2/templates/configmap.yaml similarity index 100% rename from charts/fleet/100.0.3+up0.3.9-rc1/templates/configmap.yaml rename to charts/fleet/100.0.3+up0.3.9-rc2/templates/configmap.yaml diff --git a/charts/fleet/100.0.3+up0.3.9-rc1/templates/deployment.yaml b/charts/fleet/100.0.3+up0.3.9-rc2/templates/deployment.yaml similarity index 100% rename from charts/fleet/100.0.3+up0.3.9-rc1/templates/deployment.yaml rename to charts/fleet/100.0.3+up0.3.9-rc2/templates/deployment.yaml diff --git a/charts/fleet/100.0.3+up0.3.9-rc1/templates/rbac.yaml b/charts/fleet/100.0.3+up0.3.9-rc2/templates/rbac.yaml similarity index 100% rename from charts/fleet/100.0.3+up0.3.9-rc1/templates/rbac.yaml rename to charts/fleet/100.0.3+up0.3.9-rc2/templates/rbac.yaml diff --git a/charts/fleet/100.0.3+up0.3.9-rc1/templates/serviceaccount.yaml b/charts/fleet/100.0.3+up0.3.9-rc2/templates/serviceaccount.yaml similarity index 100% rename from charts/fleet/100.0.3+up0.3.9-rc1/templates/serviceaccount.yaml rename to charts/fleet/100.0.3+up0.3.9-rc2/templates/serviceaccount.yaml diff --git a/charts/fleet/100.0.3+up0.3.9-rc1/values.yaml b/charts/fleet/100.0.3+up0.3.9-rc2/values.yaml similarity index 97% rename from charts/fleet/100.0.3+up0.3.9-rc1/values.yaml rename to charts/fleet/100.0.3+up0.3.9-rc2/values.yaml index 4efa9ead4..fdef63958 100644 --- a/charts/fleet/100.0.3+up0.3.9-rc1/values.yaml +++ b/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 diff --git a/charts/rancher-webhook/1.0.3+up0.2.4-rc3/Chart.yaml b/charts/rancher-webhook/1.0.4+up0.2.5-rc1/Chart.yaml similarity index 88% rename from charts/rancher-webhook/1.0.3+up0.2.4-rc3/Chart.yaml rename to charts/rancher-webhook/1.0.4+up0.2.5-rc1/Chart.yaml index cead26d31..13c4b4226 100644 --- a/charts/rancher-webhook/1.0.3+up0.2.4-rc3/Chart.yaml +++ b/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 diff --git a/charts/rancher-webhook/1.0.3+up0.2.4-rc3/charts/capi/Chart.yaml b/charts/rancher-webhook/1.0.4+up0.2.5-rc1/charts/capi/Chart.yaml similarity index 100% rename from charts/rancher-webhook/1.0.3+up0.2.4-rc3/charts/capi/Chart.yaml rename to charts/rancher-webhook/1.0.4+up0.2.5-rc1/charts/capi/Chart.yaml diff --git a/charts/rancher-webhook/1.0.3+up0.2.4-rc3/charts/capi/templates/service.yaml b/charts/rancher-webhook/1.0.4+up0.2.5-rc1/charts/capi/templates/service.yaml similarity index 100% rename from charts/rancher-webhook/1.0.3+up0.2.4-rc3/charts/capi/templates/service.yaml rename to charts/rancher-webhook/1.0.4+up0.2.5-rc1/charts/capi/templates/service.yaml diff --git a/charts/rancher-webhook/1.0.3+up0.2.4-rc3/templates/_helpers.tpl b/charts/rancher-webhook/1.0.4+up0.2.5-rc1/templates/_helpers.tpl similarity index 100% rename from charts/rancher-webhook/1.0.3+up0.2.4-rc3/templates/_helpers.tpl rename to charts/rancher-webhook/1.0.4+up0.2.5-rc1/templates/_helpers.tpl diff --git a/charts/rancher-webhook/1.0.3+up0.2.4-rc3/templates/deployment.yaml b/charts/rancher-webhook/1.0.4+up0.2.5-rc1/templates/deployment.yaml similarity index 91% rename from charts/rancher-webhook/1.0.3+up0.2.4-rc3/templates/deployment.yaml rename to charts/rancher-webhook/1.0.4+up0.2.5-rc1/templates/deployment.yaml index 5104e7eef..4431a78ba 100644 --- a/charts/rancher-webhook/1.0.3+up0.2.4-rc3/templates/deployment.yaml +++ b/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 diff --git a/charts/rancher-webhook/1.0.3+up0.2.4-rc3/templates/pre-delete-hook-cluster-role-binding.yaml b/charts/rancher-webhook/1.0.4+up0.2.5-rc1/templates/pre-delete-hook-cluster-role-binding.yaml similarity index 100% rename from charts/rancher-webhook/1.0.3+up0.2.4-rc3/templates/pre-delete-hook-cluster-role-binding.yaml rename to charts/rancher-webhook/1.0.4+up0.2.5-rc1/templates/pre-delete-hook-cluster-role-binding.yaml diff --git a/charts/rancher-webhook/1.0.3+up0.2.4-rc3/templates/pre-delete-hook-cluster-role.yaml b/charts/rancher-webhook/1.0.4+up0.2.5-rc1/templates/pre-delete-hook-cluster-role.yaml similarity index 100% rename from charts/rancher-webhook/1.0.3+up0.2.4-rc3/templates/pre-delete-hook-cluster-role.yaml rename to charts/rancher-webhook/1.0.4+up0.2.5-rc1/templates/pre-delete-hook-cluster-role.yaml diff --git a/charts/rancher-webhook/1.0.3+up0.2.4-rc3/templates/pre-delete-hook-job.yaml b/charts/rancher-webhook/1.0.4+up0.2.5-rc1/templates/pre-delete-hook-job.yaml similarity index 85% rename from charts/rancher-webhook/1.0.3+up0.2.4-rc3/templates/pre-delete-hook-job.yaml rename to charts/rancher-webhook/1.0.4+up0.2.5-rc1/templates/pre-delete-hook-job.yaml index de1233b57..ad80c6085 100644 --- a/charts/rancher-webhook/1.0.3+up0.2.4-rc3/templates/pre-delete-hook-job.yaml +++ b/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 }} diff --git a/charts/rancher-webhook/1.0.3+up0.2.4-rc3/templates/pre-delete-hook-psp.yaml b/charts/rancher-webhook/1.0.4+up0.2.5-rc1/templates/pre-delete-hook-psp.yaml similarity index 100% rename from charts/rancher-webhook/1.0.3+up0.2.4-rc3/templates/pre-delete-hook-psp.yaml rename to charts/rancher-webhook/1.0.4+up0.2.5-rc1/templates/pre-delete-hook-psp.yaml diff --git a/charts/rancher-webhook/1.0.3+up0.2.4-rc3/templates/pre-delete-hook-service-account.yaml b/charts/rancher-webhook/1.0.4+up0.2.5-rc1/templates/pre-delete-hook-service-account.yaml similarity index 100% rename from charts/rancher-webhook/1.0.3+up0.2.4-rc3/templates/pre-delete-hook-service-account.yaml rename to charts/rancher-webhook/1.0.4+up0.2.5-rc1/templates/pre-delete-hook-service-account.yaml diff --git a/charts/rancher-webhook/1.0.3+up0.2.4-rc3/templates/rbac.yaml b/charts/rancher-webhook/1.0.4+up0.2.5-rc1/templates/rbac.yaml similarity index 100% rename from charts/rancher-webhook/1.0.3+up0.2.4-rc3/templates/rbac.yaml rename to charts/rancher-webhook/1.0.4+up0.2.5-rc1/templates/rbac.yaml diff --git a/charts/rancher-webhook/1.0.3+up0.2.4-rc3/templates/service.yaml b/charts/rancher-webhook/1.0.4+up0.2.5-rc1/templates/service.yaml similarity index 100% rename from charts/rancher-webhook/1.0.3+up0.2.4-rc3/templates/service.yaml rename to charts/rancher-webhook/1.0.4+up0.2.5-rc1/templates/service.yaml diff --git a/charts/rancher-webhook/1.0.3+up0.2.4-rc3/templates/serviceaccount.yaml b/charts/rancher-webhook/1.0.4+up0.2.5-rc1/templates/serviceaccount.yaml similarity index 100% rename from charts/rancher-webhook/1.0.3+up0.2.4-rc3/templates/serviceaccount.yaml rename to charts/rancher-webhook/1.0.4+up0.2.5-rc1/templates/serviceaccount.yaml diff --git a/charts/rancher-webhook/1.0.3+up0.2.4-rc3/templates/webhook.yaml b/charts/rancher-webhook/1.0.4+up0.2.5-rc1/templates/webhook.yaml similarity index 100% rename from charts/rancher-webhook/1.0.3+up0.2.4-rc3/templates/webhook.yaml rename to charts/rancher-webhook/1.0.4+up0.2.5-rc1/templates/webhook.yaml diff --git a/charts/rancher-webhook/1.0.3+up0.2.4-rc3/values.yaml b/charts/rancher-webhook/1.0.4+up0.2.5-rc1/values.yaml similarity index 61% rename from charts/rancher-webhook/1.0.3+up0.2.4-rc3/values.yaml rename to charts/rancher-webhook/1.0.4+up0.2.5-rc1/values.yaml index 68c64340b..a516882bb 100644 --- a/charts/rancher-webhook/1.0.3+up0.2.4-rc3/values.yaml +++ b/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: [] diff --git a/docs/developing.md b/docs/developing.md index 3ee85c739..56b478666 100755 --- a/docs/developing.md +++ b/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: diff --git a/docs/validation.md b/docs/validation.md index 50d45b591..f9b18fbb8 100755 --- a/docs/validation.md +++ b/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. diff --git a/index.yaml b/index.yaml index ba0706e38..0da8f7105 100755 --- a/index.yaml +++ b/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" diff --git a/packages/fleet/fleet-agent/package.yaml b/packages/fleet/fleet-agent/package.yaml index ec6b5bf0c..eb9510371 100644 --- a/packages/fleet/fleet-agent/package.yaml +++ b/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 diff --git a/packages/fleet/fleet-crd/package.yaml b/packages/fleet/fleet-crd/package.yaml index c7254472c..1c3412a77 100644 --- a/packages/fleet/fleet-crd/package.yaml +++ b/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 diff --git a/packages/fleet/fleet/generated-changes/dependencies/gitjob/dependency.yaml b/packages/fleet/fleet/generated-changes/dependencies/gitjob/dependency.yaml index 611cb0dca..9c2720b9d 100644 --- a/packages/fleet/fleet/generated-changes/dependencies/gitjob/dependency.yaml +++ b/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 diff --git a/packages/fleet/fleet/package.yaml b/packages/fleet/fleet/package.yaml index e5075b147..90b81ad7c 100644 --- a/packages/fleet/fleet/package.yaml +++ b/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 diff --git a/packages/rancher-webhook/package.yaml b/packages/rancher-webhook/package.yaml index 897e8aa5d..366fbb2b5 100644 --- a/packages/rancher-webhook/package.yaml +++ b/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 diff --git a/release.yaml b/release.yaml index c8e9b8c31..655a24e2d 100644 --- a/release.yaml +++ b/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 diff --git a/scripts/version b/scripts/version index 237f7257d..00ccb7744 100755 --- a/scripts/version +++ b/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