diff --git a/packages/rancher-aks-operator-crd/package.yaml b/packages/rancher-aks-operator-crd/package.yaml index 5d7a1436e..754679220 100644 --- a/packages/rancher-aks-operator-crd/package.yaml +++ b/packages/rancher-aks-operator-crd/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/aks-operator/releases/download/v1.0.2-rc1/rancher-aks-operator-crd-1.0.2-rc1.tgz -version: 100.0.1 +url: https://github.com/rancher/aks-operator/releases/download/v1.0.1/rancher-aks-operator-crd-1.0.1.tgz +version: 100.0.0 diff --git a/packages/rancher-aks-operator/package.yaml b/packages/rancher-aks-operator/package.yaml index c1585fca1..b8b03e344 100644 --- a/packages/rancher-aks-operator/package.yaml +++ b/packages/rancher-aks-operator/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/aks-operator/releases/download/v1.0.2-rc1/rancher-aks-operator-1.0.2-rc1.tgz -version: 100.0.1 +url: https://github.com/rancher/aks-operator/releases/download/v1.0.1/rancher-aks-operator-1.0.1.tgz +version: 100.0.0 diff --git a/packages/rancher-cis-benchmark/charts/Chart.yaml b/packages/rancher-cis-benchmark/charts/Chart.yaml index 1f39422b7..1c1cd49c3 100644 --- a/packages/rancher-cis-benchmark/charts/Chart.yaml +++ b/packages/rancher-cis-benchmark/charts/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: v1.0.5 +appVersion: v1.0.6 description: The cis-operator enables running CIS benchmark security scans on a kubernetes cluster name: rancher-cis-benchmark version: 1.0.6 @@ -16,3 +16,4 @@ annotations: catalog.cattle.io/display-name: "CIS Benchmark" catalog.cattle.io/os: linux catalog.cattle.io/auto-install: rancher-cis-benchmark-crd=match + catalog.cattle.io/rancher-version: ">= 2.6.0" diff --git a/packages/rancher-cis-benchmark/charts/values.yaml b/packages/rancher-cis-benchmark/charts/values.yaml index ed39c8353..8c3fc3e16 100644 --- a/packages/rancher-cis-benchmark/charts/values.yaml +++ b/packages/rancher-cis-benchmark/charts/values.yaml @@ -5,13 +5,13 @@ image: cisoperator: repository: rancher/cis-operator - tag: v1.0.5 + tag: v1.0.6-rc1 securityScan: repository: rancher/security-scan - tag: v0.2.3 + tag: v0.2.4-rc1 sonobuoy: repository: rancher/mirrored-sonobuoy-sonobuoy - tag: v0.16.3 + tag: v0.53.2 resources: {} # We usually recommend not to specify default resources and to leave this as a conscious diff --git a/packages/rancher-cis-benchmark/package.yaml b/packages/rancher-cis-benchmark/package.yaml index 27c074821..6fd046315 100644 --- a/packages/rancher-cis-benchmark/package.yaml +++ b/packages/rancher-cis-benchmark/package.yaml @@ -1,5 +1,5 @@ url: local -version: 2.0.0 +version: 2.0.1 additionalCharts: - workingDir: charts-crd crdOptions: diff --git a/packages/rancher-gatekeeper/generated-changes/patch/Chart.yaml.patch b/packages/rancher-gatekeeper/generated-changes/patch/Chart.yaml.patch index 490894b83..a687f6d1c 100644 --- a/packages/rancher-gatekeeper/generated-changes/patch/Chart.yaml.patch +++ b/packages/rancher-gatekeeper/generated-changes/patch/Chart.yaml.patch @@ -2,20 +2,18 @@ +++ charts/Chart.yaml @@ -1,10 +1,22 @@ apiVersion: v2 - appVersion: v3.6.0 + appVersion: v3.5.1 -description: A Helm chart for Gatekeeper +description: Modifies Open Policy Agent's upstream gatekeeper chart that provides policy-based control for cloud native environments home: https://github.com/open-policy-agent/gatekeeper keywords: --- open policy agent + - open policy agent -name: gatekeeper -+ - open policy agent -+ - security ++- security +name: rancher-gatekeeper sources: --- https://github.com/open-policy-agent/gatekeeper.git -+ - https://github.com/open-policy-agent/gatekeeper.git - version: 3.6.0 + - https://github.com/open-policy-agent/gatekeeper.git + version: 3.5.1 +icon: https://charts.rancher.io/assets/logos/gatekeeper.svg +annotations: + catalog.cattle.io/certified: rancher diff --git a/packages/rancher-gatekeeper/generated-changes/patch/templates/gatekeeper-audit-deployment.yaml.patch b/packages/rancher-gatekeeper/generated-changes/patch/templates/gatekeeper-audit-deployment.yaml.patch index 6e833d2ad..8df99ab2a 100644 --- a/packages/rancher-gatekeeper/generated-changes/patch/templates/gatekeeper-audit-deployment.yaml.patch +++ b/packages/rancher-gatekeeper/generated-changes/patch/templates/gatekeeper-audit-deployment.yaml.patch @@ -1,6 +1,6 @@ --- charts-original/templates/gatekeeper-audit-deployment.yaml +++ charts/templates/gatekeeper-audit-deployment.yaml -@@ -65,7 +65,7 @@ +@@ -63,7 +63,7 @@ valueFrom: fieldRef: fieldPath: metadata.name diff --git a/packages/rancher-gatekeeper/generated-changes/patch/templates/gatekeeper-controller-manager-deployment.yaml.patch b/packages/rancher-gatekeeper/generated-changes/patch/templates/gatekeeper-controller-manager-deployment.yaml.patch index bc9ad5195..f885fca90 100644 --- a/packages/rancher-gatekeeper/generated-changes/patch/templates/gatekeeper-controller-manager-deployment.yaml.patch +++ b/packages/rancher-gatekeeper/generated-changes/patch/templates/gatekeeper-controller-manager-deployment.yaml.patch @@ -1,6 +1,6 @@ --- charts-original/templates/gatekeeper-controller-manager-deployment.yaml +++ charts/templates/gatekeeper-controller-manager-deployment.yaml -@@ -71,7 +71,7 @@ +@@ -65,7 +65,7 @@ valueFrom: fieldRef: fieldPath: metadata.name diff --git a/packages/rancher-gatekeeper/generated-changes/patch/templates/upgrade-crds-hook.yaml.patch b/packages/rancher-gatekeeper/generated-changes/patch/templates/upgrade-crds-hook.yaml.patch deleted file mode 100644 index 031645501..000000000 --- a/packages/rancher-gatekeeper/generated-changes/patch/templates/upgrade-crds-hook.yaml.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- charts-original/templates/upgrade-crds-hook.yaml -+++ charts/templates/upgrade-crds-hook.yaml -@@ -72,7 +72,7 @@ - restartPolicy: Never - containers: - - name: crds-upgrade -- image: '{{ .Values.image.crdRepository }}:{{ .Values.image.release }}' -+ image: '{{ template "system_default_registry" . }}{{ .Values.image.crdRepository }}:{{ .Values.image.tag }}' - imagePullPolicy: '{{ .Values.image.pullPolicy }}' - args: - - apply diff --git a/packages/rancher-gatekeeper/generated-changes/patch/values.yaml.patch b/packages/rancher-gatekeeper/generated-changes/patch/values.yaml.patch index 5f151b41c..b1a501fce 100644 --- a/packages/rancher-gatekeeper/generated-changes/patch/values.yaml.patch +++ b/packages/rancher-gatekeeper/generated-changes/patch/values.yaml.patch @@ -7,7 +7,7 @@ auditMatchKindOnly: false constraintViolationsLimit: 20 auditFromCache: false -@@ -19,14 +19,14 @@ +@@ -16,13 +16,13 @@ labelNamespace: enabled: true image: @@ -19,15 +19,13 @@ pullSecrets: [] image: - repository: openpolicyagent/gatekeeper -- crdRepository: openpolicyagent/gatekeeper-crds -- release: v3.6.0 +- release: v3.5.1 + repository: rancher/mirrored-openpolicyagent-gatekeeper -+ crdRepository: rancher/mirrored-openpolicyagent-gatekeeper-crds -+ tag: v3.6.0 ++ tag: v3.5.1 pullPolicy: IfNotPresent pullSecrets: [] podAnnotations: -@@ -80,5 +80,11 @@ +@@ -70,5 +70,11 @@ pdb: controllerManager: minAvailable: 1 diff --git a/packages/rancher-gatekeeper/package.yaml b/packages/rancher-gatekeeper/package.yaml index 17c0c3534..0aa23231c 100644 --- a/packages/rancher-gatekeeper/package.yaml +++ b/packages/rancher-gatekeeper/package.yaml @@ -1,5 +1,5 @@ -url: https://open-policy-agent.github.io/gatekeeper/charts/gatekeeper-3.6.0.tgz -version: 100.0.1 +url: https://open-policy-agent.github.io/gatekeeper/charts/gatekeeper-3.5.1.tgz +version: 100.0.0 additionalCharts: - workingDir: charts-crd crdOptions: diff --git a/packages/rancher-gatekeeper/templates/crd-template/Chart.yaml b/packages/rancher-gatekeeper/templates/crd-template/Chart.yaml index f7ec02fa3..2d33b09bb 100644 --- a/packages/rancher-gatekeeper/templates/crd-template/Chart.yaml +++ b/packages/rancher-gatekeeper/templates/crd-template/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -version: 3.6.0 +version: 3.5.1 description: Installs the CRDs for rancher-gatekeeper. name: rancher-gatekeeper-crd type: application