(dev-v2.6-archive) Removes quotes around pvc storageClassName

The field storageClassName uses "quote" template function. So the quotes around it
lead to errors. This commit removes the quotes

(partially cherry picked from commit 4fbdb77861)
pull/1680/head
rajashree 2020-09-10 14:43:53 -07:00 committed by Arvind Iyengar
parent 5fbdeaedb4
commit b39c8588a4
No known key found for this signature in database
GPG Key ID: A8DD9BFD6C811498
10 changed files with 65 additions and 51 deletions

View File

@ -1,5 +1,5 @@
apiVersion: v1
appVersion: v0.0.1-rc10
appVersion: v0.0.1-rc11
description: Backup-restore-operator can be used to backup kubernetes cluster metadata
for certain applications and restore from it
name: backup-restore-operator

View File

@ -17,7 +17,7 @@ spec:
{{- if (eq "-" .storageClass) }}
storageClassName: ""
{{- else }}
storageClassName: "{{ .storageClass | quote }}"
storageClassName: {{ .storageClass | quote }}
{{- end }}
{{- end }}
{{- if .volumeName }}

View File

@ -1,6 +1,6 @@
image:
repository: rancher/backup-restore-operator
tag: v0.0.1-rc10
tag: v0.0.1-rc11
## Default s3 bucket for storing all backup files created by the backup-restore-operator
s3:

View File

@ -1,15 +1,17 @@
# Changelog
All notable changes from the upstream OPA Gatekeeper chart will be added to this file
## [Package Version 00] - 2020-09-10
## [Package Version 00] - 2020-07-27
### Added
- Enabled the CRD chart generator in `package.yaml`
### Modified
- Updated namespace to `cattle-gatekeeper-system`
- Updated `rancher/istio-kubectl` image to `1.5.8`
- Updated for Helm 3 compatibility
- Moved crds to `crds` directory
- Removed `crd-install` hooks and templates from crds
### Removed
- Removed `gatekeeper-system-namespace.yaml` as Rancher handles namespaces for chart installation
- Removed unnecessary `index.yaml` as we package and host our charts

View File

@ -1,4 +1,6 @@
url: https://open-policy-agent.github.io/gatekeeper/charts/gatekeeper-v3.1.0.tgz
packageVersion: 00
url: https://github.com/open-policy-agent/gatekeeper.git
subdirectory: charts/gatekeeper
type: git
commit: 58ae7eacd2f93831b55557d0cd56ffdc3e04ab9a
generateCRDChart:
enabled: true

View File

@ -1,28 +1,26 @@
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/Chart.yaml packages/rancher-gatekeeper/charts/Chart.yaml
--- packages/rancher-gatekeeper/charts-original/Chart.yaml
+++ packages/rancher-gatekeeper/charts/Chart.yaml
@@ -1,10 +1,17 @@
@@ -1,6 +1,6 @@
apiVersion: v1
appVersion: v3.1.0
-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
description: A Helm chart for Gatekeeper
-name: gatekeeper
+ - open policy agent
+ - security
+name: rancher-gatekeeper
keywords:
- open policy agent
version: v3.1.0-rc.1
@@ -8,3 +8,11 @@
sources:
-- https://github.com/open-policy-agent/gatekeeper.git
+ - https://github.com/open-policy-agent/gatekeeper.git
version: v3.1.0
- https://github.com/open-policy-agent/gatekeeper.git
appVersion: v3.1.0-rc.1
+icon: https://charts.rancher.io/assets/logos/gatekeeper.svg
+annotations:
+ catalog.cattle.io/certified: rancher
+ catalog.cattle.io/experimental: true
+ catalog.cattle.io/namespace: cattle-gatekeeper-system
+ catalog.cattle.io/release-name: rancher-gatekeeper
+ catalog.cattle.io/provides-gvr: config.gatekeeper.sh.config/v1alpha1
+ catalog.cattle.io/auto-install: rancher-gatekeeper-crd=match
+ catalog.cattle.io/provides-gvr: configs.config.gatekeeper.sh/v1alpha1
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/README.md packages/rancher-gatekeeper/charts/README.md
--- packages/rancher-gatekeeper/charts-original/README.md
+++ packages/rancher-gatekeeper/charts/README.md
@ -423,6 +421,28 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/crd
+ plural: ""
+ conditions: []
+ storedVersions: []
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/index.yaml packages/rancher-gatekeeper/charts/index.yaml
--- packages/rancher-gatekeeper/charts-original/index.yaml
+++ packages/rancher-gatekeeper/charts/index.yaml
@@ -1,18 +0,0 @@
-apiVersion: v1
-entries:
- gatekeeper:
- - apiVersion: v1
- appVersion: v3.1.0-rc.1
- created: "2020-08-14T12:56:49.1898705-07:00"
- description: A Helm chart for Gatekeeper
- digest: 92d0b106768faa7d880fb772f7c6b2cba591ab348897db4317543241b32c7fb7
- home: https://github.com/open-policy-agent/gatekeeper
- keywords:
- - open policy agent
- name: gatekeeper
- sources:
- - https://github.com/open-policy-agent/gatekeeper.git
- urls:
- - https://raw.githubusercontent.com/open-policy-agent/gatekeeper/v3.1.0-rc.1/charts/gatekeeper/gatekeeper-v3.1.0-rc.1.tgz
- version: v3.1.0-rc.1
-generated: "2020-08-14T12:56:49.1890596-07:00"
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/templates/_helpers.tpl packages/rancher-gatekeeper/charts/templates/_helpers.tpl
--- packages/rancher-gatekeeper/charts-original/templates/_helpers.tpl
+++ packages/rancher-gatekeeper/charts/templates/_helpers.tpl
@ -432,8 +452,8 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/tem
{{- end -}}
+
+{{- define "system_default_registry" -}}
+{{- if .Values.global.cattle.systemDefaultRegistry -}}
+{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
+{{- if .Values.global.systemDefaultRegistry -}}
+{{- printf "%s/" .Values.global.systemDefaultRegistry -}}
+{{- else -}}
+{{- "" -}}
+{{- end -}}
@ -992,19 +1012,18 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/val
emitAuditEvents: false
image:
- repository: openpolicyagent/gatekeeper
- release: v3.1.0
+ repository: rancher/openpolicyagent-gatekeeper
+ tag: v3.1.0
- release: v3.1.0-rc.1
+ repository: rancher/opa-gatekeeper
+ tag: v3.1.0-rc.1
pullPolicy: IfNotPresent
nodeSelector: { kubernetes.io/os: linux }
affinity: {}
@@ -23,3 +23,9 @@
@@ -23,3 +23,8 @@
requests:
cpu: 100m
memory: 256Mi
+global:
+ cattle:
+ systemDefaultRegistry: ""
+ systemDefaultRegistry: ""
+ kubectl:
+ repository: rancher/kubectl
+ tag: v1.18.6
+ repository: rancher/istio-kubectl
+ tag: 1.5.8

View File

@ -1,8 +1,8 @@
apiVersion: v1
appVersion: 1.6.8
appVersion: 1.7.0
description: Helm chart for installing istio components with the istioctl
name: rancher-istio
version: 1.6.800
version: 1.7.000
icon: https://charts.rancher.io/assets/logos/istio.svg
keywords:
- networking

View File

@ -4,14 +4,6 @@ spec:
addonComponents:
istiocoredns:
enabled: {{ .Values.istiocoredns.enabled }}
prometheus:
enabled: false
grafana:
enabled: false
kiali:
enabled: false
tracing:
enabled: false
components:
base:
enabled: {{ .Values.base.enabled }}

View File

@ -4,8 +4,8 @@
{{- end -}}
{{- define "system_default_registry" -}}
{{- if .Values.global.cattle.systemDefaultRegistry -}}
{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
{{- if .Values.global.systemDefaultRegistry -}}
{{- printf "%s/" .Values.global.systemDefaultRegistry -}}
{{- else -}}
{{- "" -}}
{{- end -}}

View File

@ -1,6 +1,6 @@
overlayFile: ""
tag: 1.6.8
installerVersion: 1.6.8-rancher1
tag: 1.7.0
installerVersion: 1.7.0-rancher1
forceInstall: false
istiocoredns:
@ -18,7 +18,7 @@ base:
cni:
enabled: false
repository: rancher/istio-install-cni
tag: 1.6.8
tag: 1.7.0
egressGateways:
enabled: false
@ -34,17 +34,17 @@ istiodRemote:
pilot:
enabled: true
repository: rancher/istio-pilot
tag: 1.6.8
tag: 1.7.0
policy:
enabled: true
repository: rancher/istio-mixer
tag: 1.6.8
tag: 1.7.0
telemetry:
enabled: true
repository: rancher/istio-mixer
tag: 1.6.8
tag: 1.7.0
sidecarInjectorWebhook:
enableNamespacesByDefault: false
@ -54,14 +54,13 @@ sidecarInjectorWebhook:
rewriteAppHTTPProbe: true
global:
cattle:
systemDefaultRegistry: ""
systemDefaultRegistry: ""
proxy:
repository: rancher/istio-proxyv2
tag: 1.6.8
tag: 1.7.0
proxy_init:
repository: rancher/istio-proxyv2
tag: 1.6.8
tag: 1.7.0
defaultPodDisruptionBudget:
enabled: true