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

Update calico.yaml for 1.3 branch #368

Merged
merged 2 commits into from
Apr 4, 2019
Merged

Update calico.yaml for 1.3 branch #368

merged 2 commits into from
Apr 4, 2019

Conversation

mogren
Copy link
Contributor

@mogren mogren commented Mar 29, 2019

Description of changes:

Based on #232, but includes a version bump to v3.3.6 to get the
libcalico-go #1051 fix.

For details, see https://docs.projectcalico.org/v3.3/releases/

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@mogren mogren added the calico Calico integration issue label Mar 29, 2019
@mogren mogren added this to the v1.4 milestone Mar 29, 2019
@mogren mogren self-assigned this Mar 29, 2019
@mogren
Copy link
Contributor Author

mogren commented Mar 29, 2019

@2ffs2nns I'm closing #232 in favor of this PR. I would really appreciate some help on how to verify this update works as intended.

@mogren mogren modified the milestones: v1.4, v1.5 Mar 29, 2019
@2ffs2nns
Copy link
Contributor

2ffs2nns commented Apr 2, 2019

looking at it tonight, and running it through our CI. will post result when it's done. Thanks for picking it up @mogren

config/v1.3/calico.yaml Outdated Show resolved Hide resolved
config/v1.3/calico.yaml Outdated Show resolved Hide resolved
@2ffs2nns
Copy link
Contributor

2ffs2nns commented Apr 2, 2019

@mogren manifest passed our CI w/3.3.6 images but after a manual diff of changes between v3.1.3 and v3.3.6, I want to suggest some more changes and run another test.

@mogren
Copy link
Contributor Author

mogren commented Apr 2, 2019

@2ffs2nns Sure! I'm fine with that, thanks for testing.

@2ffs2nns
Copy link
Contributor

2ffs2nns commented Apr 3, 2019

@mogren my git foo is failing me, there are multiple edits that need to be made to get this manifest in-sync with calico-v3.3.6 I've created a gist based off of your edits and posted here you can look at
https://gist.githubusercontent.com/2ffs2nns/53eed486b3040edefe0b1ed5295e8935/raw/b322cf3ff7d0f65fef6a76776b16ece17e374baa/et-eks

the edits I made

Add to lines 88-89
         resources:
            requests:
              cpu: 250m

Add to line 112-113
            - mountPath: /var/lib/calico
              name: var-lib-calico
              readOnly: false

Add to line 120
        - name: var-lib-calico
          hostPath:
            path: /var/lib/calico

Add to line 127
      tolerations:
        # Make sure calico-node gets scheduled on all nodes.
        - effect: NoSchedule
           operator: Exists
        # Mark the pod as a critical add-on for rescheduling.
        - key: CriticalAddonsOnly
          operator: Exists
        - effect: NoExecute
          operator: Exists

Add to lines 376-377
      tolerations:
        # Mark the pod as a critical add-on for rescheduling.
        - key: CriticalAddonsOnly

Remove lines 409-412
          volumeMounts:
	            - mountPath: /etc/calico
	              name: etc-calico
	              readOnly: true

Remove lines 428-431
      volumes:
	        - name: etc-calico
	          hostPath:
	            path: /etc/calico

validation I completed w/above edits

  • installed original calico-v3.1.3 based version w/EKS guestbook demo deployed
  • performed rolling-upgrade from v3.1.3 w/new v3.3.6 based version (above gist)
  • ran k8s NetworkPolicy e2e's

all looked good/passing. If you make these changes, I'll run through our CI again if you like w/your final changes

Claes Mogren added 2 commits April 3, 2019 10:59
Based on aws#232, but includes a version bump to v3.3.5 to get the
libcalico-go aws#1051 fix.
@@ -177,7 +198,10 @@ metadata:
spec:
scope: Cluster
group: crd.projectcalico.org
version: v1
versions:
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@mogren
Copy link
Contributor Author

mogren commented Apr 3, 2019

Thanks again @2ffs2nns, I added your changes and updated the config for 1.4 as well. Preparing to get a release out soon. The new changes are in a separate commit: ee13f3e

@mogren mogren modified the milestones: v1.5, v1.4 Apr 3, 2019
@2ffs2nns
Copy link
Contributor

2ffs2nns commented Apr 3, 2019

I ran the 1.3 file in ee13f3e through our CI. all good from my perspective @mogren

@mogren mogren merged commit 35696ad into aws:master Apr 4, 2019
@mogren mogren deleted the calico-bump branch April 5, 2019 19:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
calico Calico integration issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants