(dev-v2.6-archive) Update rancher-cis-benchmark to 2.0.1

(partially cherry picked from commit 8a669ab826)
pull/1680/head
Jake Hyde 2021-09-10 16:43:12 -04:00 committed by Arvind Iyengar
parent e5277446f9
commit a83c393737
No known key found for this signature in database
GPG Key ID: A8DD9BFD6C811498
12 changed files with 24 additions and 38 deletions

View File

@ -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

View File

@ -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

View File

@ -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"

View File

@ -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

View File

@ -1,5 +1,5 @@
url: local
version: 2.0.0
version: 2.0.1
additionalCharts:
- workingDir: charts-crd
crdOptions:

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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:

View File

@ -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