ServiceAccount should precede DaemonSet in yaml aws #1637
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ServiceAccount should precede DaemonSet in yaml aws#1632 Alphabetic order of jsonet object decides the order of k8s objects in yaml file. This fix ensures serviceAccount appears at top. This is a temporary change to address manual manifest generation from jsonet. Starting CNI 1.10 version, Github workflow will be added to automatically generate CNI manifests (and Calico) using helm and these auto generated artifacts will be placed in CNI 1.10 release dir. Github workflow changes are already available in CNI master branch.
srini-ram
changed the title
jayanthvn
pushed a commit
that referenced
this pull request
Sep 29, 2021
* This change address following Github issue (#1637) ServiceAccount should precede DaemonSet in yaml #1632 Alphabetic order of jsonet object decides the order of k8s objects in yaml file. This fix ensures serviceAccount appears at top. This is a temporary change to address manual manifest generation from jsonet. Starting CNI 1.10 version, Github workflow will be added to automatically generate CNI manifests (and Calico) using helm and these auto generated artifacts will be placed in CNI 1.10 release dir. Github workflow changes are already available in CNI master branch. * Move IPv6 settings to init container * Fix UT Co-authored-by: Srinivasan Ramabadran <[email protected]>
jayanthvn
pushed a commit
to jayanthvn/amazon-vpc-cni-k8s
that referenced
this pull request
Oct 14, 2021
ServiceAccount should precede DaemonSet in yaml aws#1632 Alphabetic order of jsonet object decides the order of k8s objects in yaml file. This fix ensures serviceAccount appears at top. This is a temporary change to address manual manifest generation from jsonet. Starting CNI 1.10 version, Github workflow will be added to automatically generate CNI manifests (and Calico) using helm and these auto generated artifacts will be placed in CNI 1.10 release dir. Github workflow changes are already available in CNI master branch.
jayanthvn
added a commit
that referenced
this pull request
Oct 14, 2021
ServiceAccount should precede DaemonSet in yaml #1632 Alphabetic order of jsonet object decides the order of k8s objects in yaml file. This fix ensures serviceAccount appears at top. This is a temporary change to address manual manifest generation from jsonet. Starting CNI 1.10 version, Github workflow will be added to automatically generate CNI manifests (and Calico) using helm and these auto generated artifacts will be placed in CNI 1.10 release dir. Github workflow changes are already available in CNI master branch. Co-authored-by: Srinivasan Ramabadran <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this?: bug
Which issue does this PR fix:
fixes #1632
What does this PR do / Why do we need it:
Ensure serviceAccount obj is created before daemonSet creation to avoid race condition mentioned in #1632
Alphabetic order of jsonet object name in manifest.jsonet file decides the order of k8s objects in
CNI yaml manifest. This fix ensures serviceAccount appears at top of CNI manifest for manual yaml generation work flow.
Starting CNI 1.10 version, Github workflow will be added to
automatically generate CNI manifests (and Calico manifest) using helm and these
auto generated artifacts will be placed in CNI 1.10 release Dir. Github
workflow changes are already available in CNI master branch.
If an issue # is not available please add repro steps and logs from IPAMD/CNI showing the issue:
Testing done on this change:
Automation added to e2e: No
Will this break upgrades or downgrades. Has updating a running cluster been tested?: Yes
Rollback to 1.91 from master didnt have any impact
ramabad@88665a3712d6 cni-manifest-1.10 % kubectl apply -f https://raw.githubusercontent.com/aws/amazon-vpc-cni-k8s/v1.9.1/config/v1.9/aws-k8s-cni.yaml
clusterrolebinding.rbac.authorization.k8s.io/aws-node unchanged
clusterrole.rbac.authorization.k8s.io/aws-node unchanged
Warning: apiextensions.k8s.io/v1beta1 CustomResourceDefinition is deprecated in v1.16+, unavailable in v1.22+; use apiextensions.k8s.io/v1 CustomResourceDefinition
customresourcedefinition.apiextensions.k8s.io/eniconfigs.crd.k8s.amazonaws.com configured
daemonset.apps/aws-node configured
serviceaccount/aws-node unchanged
Upgrade from 1.9.1 to manually generated manifest didnt have any issues
ramabad@88665a3712d6 cni-manifest-1.10 % k apply -f aws-k8s-cni.yaml
serviceaccount/aws-node unchanged
clusterrolebinding.rbac.authorization.k8s.io/aws-node unchanged
clusterrole.rbac.authorization.k8s.io/aws-node unchanged
customresourcedefinition.apiextensions.k8s.io/eniconfigs.crd.k8s.amazonaws.com configured
daemonset.apps/aws-node configured
Does this change require updates to the CNI daemonset config files to work?: No
Does this PR introduce any user-facing change?: No
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.