Solve Warning when supplying sidecar resources (#16597)

The resources value is currently nil, but requires a map to be supplied
Fixes this warning:
  Merging destination map for chart 'jenkins'. The destination item 'resources' is a table and ignoring the source 'resources' as it has a non-table value of: <nil>

Signed-off-by: Jo Rhett <jrhett@netconsonance.com>
This commit is contained in:
Jo Rhett
2019-08-23 13:44:27 -07:00
committed by Kubernetes Prow Robot
parent 54b6e73cbf
commit effc23794f
3 changed files with 6 additions and 2 deletions
+4
View File
@@ -6,6 +6,10 @@ numbering uses [semantic versioning](http://semver.org).
NOTE: The change log until version 1.5.7 is auto generated based on git commits. Those include a reference to the git commit to be able to get more details.
## 1.5.9
Fixed a warning when sidecar resources are provided through a parent chart or override values
## 1.5.8
Fixed an issue when master.enableXmlConfig is set to false: Always mount jenkins-secrets volume if secretsFilesSecret is set (#16512)
+1 -1
View File
@@ -1,7 +1,7 @@
apiVersion: v1
name: jenkins
home: https://jenkins.io/
version: 1.5.8
version: 1.5.9
appVersion: lts
description: Open source continuous integration server. It supports multiple SCM tools
including CVS, Subversion and Git. It can execute Apache Ant and Apache Maven-based
+1 -1
View File
@@ -225,7 +225,7 @@ master:
enabled: false
image: shadwell/k8s-sidecar:0.0.2
imagePullPolicy: IfNotPresent
resources:
resources: {}
# limits:
# cpu: 100m
# memory: 100Mi