Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes cilium-agent helm chart so the daemonset can be configured with… #11203

Merged
merged 2 commits into from May 8, 2020
Merged

Fixes cilium-agent helm chart so the daemonset can be configured with… #11203

merged 2 commits into from May 8, 2020

Conversation

seanmwinn
Copy link
Contributor

Fixes cilium-agent helm chart so the daemonset can be configured with correct sleepAfterInit key

Fixes: #11201

Signed-off-by: Sean Winn sean@isovalent.com

Setting the agent.sleepAfterInit helm chart value to True will correctly configure the agent to sleep after Init

… correct sleepAfterInit key

Fixes: #11201

Signed-off-by: Sean Winn <sean@isovalent.com>
@seanmwinn seanmwinn requested a review from a team April 28, 2020 20:38
@maintainer-s-little-helper
Copy link

Please set the appropriate release note label.

@maintainer-s-little-helper maintainer-s-little-helper bot added this to In progress in 1.8.0 Apr 28, 2020
@seanmwinn seanmwinn added needs-backport/1.6 release-note/misc This PR makes changes that have no direct user impact. labels Apr 28, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.6.9 Apr 28, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.7.3 Apr 28, 2020
@coveralls
Copy link

coveralls commented Apr 28, 2020

Coverage Status

Coverage decreased (-0.2%) to 44.462% when pulling d938b6d on seanmwinn:cilium-11201 into ebe156f on cilium:master.

@aanm
Copy link
Member

aanm commented Apr 29, 2020

test-me-please

Copy link
Member

@aanm aanm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For future reference, fixes a86c3a1

@aanm aanm added release-note/bug This PR fixes an issue in a previous release of Cilium. and removed release-note/misc This PR makes changes that have no direct user impact. labels Apr 29, 2020
@joestringer joestringer added this to Needs backport from master in 1.7.4 Apr 29, 2020
@joestringer joestringer removed this from Needs backport from master in 1.7.3 Apr 29, 2020
@aanm
Copy link
Member

aanm commented May 1, 2020

test-me-please

@aanm aanm added kind/bug This is a bug in the Cilium logic. and removed kind/bug This is a bug in the Cilium logic. labels May 1, 2020
@aanm
Copy link
Member

aanm commented May 1, 2020

@seanmwinn the CI is failing because of the changes:

/home/jenkins/workspace/Cilium-PR-Ginkgo-Tests-Validated/k8s-1.11-gopath/src/github.com/cilium/cilium/test/ginkgo-ext/scopes.go:385
Cilium cannot be installed
Expected
    <*helpers.cmdError | 0xc0006bf7f0>: Unable to generate YAML (exit status 1) output: cmd: helm template /home/jenkins/workspace/Cilium-PR-Ginkgo-Tests-Validated/k8s-1.11-gopath/src/github.com/cilium/cilium/install/kubernetes/cilium --namespace=kube-system  --set managed-etcd.registry=docker.io/cilium  --set global.sessionAffinity.enabled=false  --set global.tag=latest  --set global.ipv4.enabled=true  --set global.psp.enabled=true  --set preflight.image=cilium-dev  --set operator.image=operator  --set global.debug.verbose=flow  --set global.nodePort.device=enp0s8  --set global.k8sServiceHost=192.168.36.11  --set global.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].values[0]=k8s3  --set global.pprof.enabled=true  --set global.k8s.requireIPv4PodCIDR=true  --set agent.image=cilium-dev  --set global.ci.kubeCacheMutationDetector=true  --set global.registry=147.75.77.59/cilium  --set global.bpf.preallocateMaps=true  --set global.etcd.leaseTTL=30s  --set global.ipv6.enabled=true  --set global.kubeProxyReplacement=strict  --set global.k8sServicePort=6443  --set global.logSystemLoad=true  --set global.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].key=cilium.io/ci-node  --set global.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].operator=NotIn  --set global.debug.enabled=true  > cilium-160ada03849d902e.yaml
Exitcode: 1 
Stdout:
 	 
Stderr:
 	 Error: template: cilium/charts/agent/templates/daemonset.yaml:41:14: executing "cilium/charts/agent/templates/daemonset.yaml" at <.Values.agent.sleepAfterInit>: nil pointer evaluating interface {}.sleepAfterInit
	 

to be nil
/home/jenkins/workspace/Cilium-PR-Ginkgo-Tests-Validated/k8s-1.11-gopath/src/github.com/cilium/cilium/test/k8sT/assertionHelpers.go:98

Signed-off-by: Sean Winn <sean@isovalent.com>
@seanmwinn
Copy link
Contributor Author

test-me-please

@aanm aanm merged commit 6d364cd into cilium:master May 8, 2020
1.8.0 automation moved this from In progress to Merged May 8, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.6 in 1.6.9 May 8, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.6 in 1.6.9 May 8, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.6 to Backport done to v1.6 in 1.6.9 May 13, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.6 to Backport done to v1.6 in 1.6.9 May 13, 2020
@aanm aanm moved this from Needs backport from master to Backport pending to v1.7 in 1.7.4 May 13, 2020
@aanm aanm moved this from Backport pending to v1.7 to Backport done to v1.7 in 1.7.4 May 13, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note/bug This PR fixes an issue in a previous release of Cilium.
Projects
No open projects
1.6.9
Backport done to v1.6
1.7.4
Backport done to v1.7
1.8.0
  
Merged
Development

Successfully merging this pull request may close these issues.

Helm: agent daemonset has wrong variable scope global.sleepAfterInit
5 participants