Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

chore: Upgrade CNI to v1.2.0 #4058

Merged
merged 4 commits into from
Nov 20, 2020
Merged

chore: Upgrade CNI to v1.2.0 #4058

merged 4 commits into from
Nov 20, 2020

Conversation

thatmattlong
Copy link
Contributor

Reason for Change:

Issue Fixed:

Credit Where Due:

Does this change contain code from or inspired by another project?

  • No
  • Yes

If "Yes," did you notify that project's maintainers and provide attribution?

  • No
  • Yes

Requirements:

Notes:

@welcome
Copy link

welcome bot commented Nov 19, 2020

💖 Thanks for opening your first pull request! 💖 We use semantic commit messages to streamline the release process. Before your pull request can be merged, you should make sure your first commit and PR title start with a semantic prefix. Examples of commit messages with semantic prefixes: - fix: change azure disk cachingMode to ReadOnly - feat: make maximumLoadBalancerRuleCount configurable - docs: add note on AKS Engine and AKS relationship
Make sure to check out the developer guide for guidance on testing your change.

@acs-bot acs-bot added the size/S label Nov 19, 2020
@jackfrancis
Copy link
Member

Thanks @thatmattlong!

Does this version of Azure CNI include transparent mode by default in the released tarball?

@thatmattlong
Copy link
Contributor Author

Hey @jackfrancis , yes this version is transparent by default

sed -i 's#"mode":"bridge"#"mode":"transparent"#g' $CNI_CONFIG_DIR/10-azure.conflist
elif [[ "${NETWORK_POLICY}" == "" || "${NETWORK_POLICY}" == "none" ]] && [[ "${NETWORK_MODE}" == "transparent" ]]; then
sed -i 's#"mode":"bridge"#"mode":"transparent"#g' $CNI_CONFIG_DIR/10-azure.conflist
if [[ "${NETWORK_MODE}" == "bridge" ]]; then
Copy link
Member

Choose a reason for hiding this comment

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

@xuto2 @paulgmiller FYI, I'm inverting the CSE "NetworkMode" logic here to account for the fact that 1.2.0 of Azure CNI is transparent by default in the extracted tarball.

@jackfrancis
Copy link
Member

Hey @jackfrancis , yes this version is transparent by default

thanks! I've added some changes to the bootstrap scripts to accommodate that

@jackfrancis
Copy link
Member

/azp run pr-e2e

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@sozercan
Copy link
Member

@thatmattlong artifacts should be uploaded now

@jackfrancis
Copy link
Member

/azp run pr-e2e

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@codecov
Copy link

codecov bot commented Nov 19, 2020

Codecov Report

Merging #4058 (5312bfa) into master (6db78a8) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #4058   +/-   ##
=======================================
  Coverage   73.23%   73.23%           
=======================================
  Files         135      135           
  Lines       20640    20640           
=======================================
  Hits        15115    15115           
  Misses       4549     4549           
  Partials      976      976           
Impacted Files Coverage Δ
pkg/engine/templates_generated.go 43.70% <ø> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8d44bcd...5312bfa. Read the comment docs.

@jackfrancis
Copy link
Member

@sozercan this from ~45 mins ago"

==> azure-arm: + timeout 60 curl -fsSL https://kubernetesartifacts.azureedge.net/azure-cni/v1.2.0/binaries/azure-vnet-cni-linux-amd64-v1.2.0.tgz -o /opt/cni/downloads/azure-vnet-cni-linux-amd64-v1.2.0.tgz
==> azure-arm: curl: (22) The requested URL returned error: 404

Should I retry?

@sozercan
Copy link
Member

@jackfrancis if you try again, it might just magically work :) (there was a path issue - fixed now)

@jackfrancis
Copy link
Member

/azp run pr-e2e

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Copy link
Member

@jackfrancis jackfrancis left a comment

Choose a reason for hiding this comment

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

/lgtm

@acs-bot acs-bot added the lgtm label Nov 20, 2020
@jackfrancis jackfrancis merged commit cff0a34 into Azure:master Nov 20, 2020
@welcome
Copy link

welcome bot commented Nov 20, 2020

Congrats on merging your first pull request! 🎉🎉🎉

@acs-bot
Copy link

acs-bot commented Nov 20, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jackfrancis, thatmattlong

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants