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

1.10.2 changes #1830

Merged
merged 13 commits into from
Feb 3, 2022
Merged

1.10.2 changes #1830

merged 13 commits into from
Feb 3, 2022

Conversation

cgchinmay
Copy link
Contributor

@cgchinmay cgchinmay commented Jan 28, 2022

What type of PR is this?
feature

Which issue does this PR fix:
Changes for v1.10.2

What does this PR do / Why do we need it:
cherry picking these 6 changes for v1.10.2 release (already merged to master)
#1773 - ipamd error code fix
#1715 - cni metrics helper change
#1705 - vlanId changes
#1823 - disable network provisioning condition fix
#1832 - go version updated to 1.17
#1804 - use public ecr for AL2
#1776 - auto sync manifest changes
#1818 - remove sudo from workflow files for docker prune
#1802 - remove set -x from bash, add -Ss to curl

Testing done on this change:

yes

Will this break upgrades or downgrades. Has updating a running cluster been tested?:
It shouldn't affect. Tried following upgrade/downgrade tests
for x : range(v1.7.5: v1.10.1)

  • Create pod with x and delete with v1.10.2
  • Create pod with v1.10.2 and delete with x

Will add this to ginkgo

Does this change require updates to the CNI daemonset config files to work?:

yes

Does this PR introduce any user-facing change?:

No

** Will this PR introduce any new dependencies?**:
Requires CNI spec 0.4.0

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

Chinmay Gadgil added 6 commits December 13, 2021 10:43
PPSG Test agent changes

CNI metrics helper changes

minor fix

Move logging for CLUSTER_ID and Region inside publisher.go from main.go

revert manifest changes as the image is not released yet
vlanID changes
disable network provisioning fix
ipamd error code fix
# Conflicts:
#	.github/workflows/build-multi-arch.yaml
#	charts/cni-metrics-helper/templates/clusterrole.yaml
#	cmd/routed-eni-cni-plugin/cni.go
#	pkg/ipamd/rpc_handler.go
#	pkg/publisher/publisher.go
#	pkg/publisher/publisher_test.go
#	test/framework/resources/k8s/utils/daemonset.go
#	test/framework/utils/const.go
Copy link
Contributor

@jayanthvn jayanthvn left a comment

Choose a reason for hiding this comment

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

lgtm

cgchinmay and others added 3 commits January 31, 2022 10:41
* Switch to public ecr for al2 image

- Removed docker_arch variable which is redundant with this change

* Fix makefile and dockerfile entries
@cgchinmay cgchinmay requested a review from srini-ram February 1, 2022 18:30
@vikasmb
Copy link
Contributor

vikasmb commented Feb 2, 2022

@cgchinmay could you please cherrypick this change #1818 to release 1.10 in this PR ? It would be needed for the integ tests to pass.

@vikasmb
Copy link
Contributor

vikasmb commented Feb 2, 2022

Regarding inclusion of '.github/workflows/weekly-cron-test.yml', wouldn't cron based workflow trigger in master/main branches only ? https://github.saobby.my.eu.orgmunity/t/scheduled-builds-of-non-default-branch/16306/21

@cgchinmay
Copy link
Contributor Author

cgchinmay commented Feb 2, 2022

Regarding inclusion of '.github/workflows/weekly-cron-test.yml', wouldn't cron based workflow trigger in master/main branches only ? https://github.saobby.my.eu.orgmunity/t/scheduled-builds-of-non-default-branch/16306/21

I think we can remove it . It got added with cherry-picked commit

@cgchinmay cgchinmay merged commit 6b269a3 into aws:release-1.10 Feb 3, 2022
cgchinmay pushed a commit to cgchinmay/amazon-vpc-cni-k8s that referenced this pull request Feb 4, 2022
* Change workflow to use git install (aws#1785)

- Change workflow to use git install as the go get command was
  altering go.mod file without updating go.sum file

* Workflow file updates (aws#1787)

* Change workflow to use git install

- Change workflow to use git install as the go get command was
  altering go.mod file without updating go.sum file

* Update workflow files to use go 1.16

- Updated workflow files to use go 1.16 for consistency.
- Changed integ test script to use git commit id and deleted unused code

* Specify go version at 1.16 for workflow files

Cherry pick multi-arch changes in release branch

1.10.2 changes (aws#1830)

* VlanID changes

PPSG Test agent changes

CNI metrics helper changes

minor fix

Move logging for CLUSTER_ID and Region inside publisher.go from main.go

revert manifest changes as the image is not released yet

* Cherry pick multi-arch changes in release branch

* cni-metrics-helper changes
vlanID changes
disable network provisioning fix
ipamd error code fix

* Minor change

* remove redundant changes

* Go version changes

* Switch to public ECR for AL2 (aws#1804)

* Switch to public ecr for al2 image

- Removed docker_arch variable which is redundant with this change

* Fix makefile and dockerfile entries

* Merge changes to auto-sync manifests

* minor change: add ContainerID to dummyVlanInterface

* Remove sudo from workflow files (aws#1818)

* remove set -x from bash, add -Ss to curl (aws#1802)

* remove weekly-cron-test.yml as its not needed for this branch

Co-authored-by: Vikas Basavaraj <5373156+vikasmb@users.noreply.github.com>
Co-authored-by: Jayanth Varavani <1111446+jayanthvn@users.noreply.github.com>
Co-authored-by: Scott Merrill <skippy@skippy.net>

fixed conflicts with routed-eni-cni-plugin/cni.go
cgchinmay pushed a commit that referenced this pull request Feb 4, 2022
* Cherry pick of workflow changes from master branch (#1793)

* Change workflow to use git install (#1785)

- Change workflow to use git install as the go get command was
  altering go.mod file without updating go.sum file

* Workflow file updates (#1787)

* Change workflow to use git install

- Change workflow to use git install as the go get command was
  altering go.mod file without updating go.sum file

* Update workflow files to use go 1.16

- Updated workflow files to use go 1.16 for consistency.
- Changed integ test script to use git commit id and deleted unused code

* Specify go version at 1.16 for workflow files

Cherry pick multi-arch changes in release branch

1.10.2 changes (#1830)

* VlanID changes

PPSG Test agent changes

CNI metrics helper changes

minor fix

Move logging for CLUSTER_ID and Region inside publisher.go from main.go

revert manifest changes as the image is not released yet

* Cherry pick multi-arch changes in release branch

* cni-metrics-helper changes
vlanID changes
disable network provisioning fix
ipamd error code fix

* Minor change

* remove redundant changes

* Go version changes

* Switch to public ECR for AL2 (#1804)

* Switch to public ecr for al2 image

- Removed docker_arch variable which is redundant with this change

* Fix makefile and dockerfile entries

* Merge changes to auto-sync manifests

* minor change: add ContainerID to dummyVlanInterface

* Remove sudo from workflow files (#1818)

* remove set -x from bash, add -Ss to curl (#1802)

* remove weekly-cron-test.yml as its not needed for this branch

Co-authored-by: Vikas Basavaraj <5373156+vikasmb@users.noreply.github.com>
Co-authored-by: Jayanth Varavani <1111446+jayanthvn@users.noreply.github.com>
Co-authored-by: Scott Merrill <skippy@skippy.net>

fixed conflicts with routed-eni-cni-plugin/cni.go

* Updated config files for v1.10.2
orsenthil pushed a commit that referenced this pull request Feb 5, 2022
* Cherry pick of workflow changes from master branch (#1793)

* Change workflow to use git install (#1785)

- Change workflow to use git install as the go get command was
  altering go.mod file without updating go.sum file

* Workflow file updates (#1787)

* Change workflow to use git install

- Change workflow to use git install as the go get command was
  altering go.mod file without updating go.sum file

* Update workflow files to use go 1.16

- Updated workflow files to use go 1.16 for consistency.
- Changed integ test script to use git commit id and deleted unused code

* Specify go version at 1.16 for workflow files

Cherry pick multi-arch changes in release branch

1.10.2 changes (#1830)

* VlanID changes

PPSG Test agent changes

CNI metrics helper changes

minor fix

Move logging for CLUSTER_ID and Region inside publisher.go from main.go

revert manifest changes as the image is not released yet

* Cherry pick multi-arch changes in release branch

* cni-metrics-helper changes
vlanID changes
disable network provisioning fix
ipamd error code fix

* Minor change

* remove redundant changes

* Go version changes

* Switch to public ECR for AL2 (#1804)

* Switch to public ecr for al2 image

- Removed docker_arch variable which is redundant with this change

* Fix makefile and dockerfile entries

* Merge changes to auto-sync manifests

* minor change: add ContainerID to dummyVlanInterface

* Remove sudo from workflow files (#1818)

* remove set -x from bash, add -Ss to curl (#1802)

* remove weekly-cron-test.yml as its not needed for this branch

Co-authored-by: Vikas Basavaraj <5373156+vikasmb@users.noreply.github.com>
Co-authored-by: Jayanth Varavani <1111446+jayanthvn@users.noreply.github.com>
Co-authored-by: Scott Merrill <skippy@skippy.net>

fixed conflicts with routed-eni-cni-plugin/cni.go

* Updated config files for v1.10.2

* Updated changelog for v1.10.2
@chlunde
Copy link

chlunde commented Feb 7, 2022

@cgchinmay I think it is possible to improve the changelog a bit, it's difficult to relate to the changes from a consumer perspective. For example, maybe the VLAN change should mention statefulset. Maybe something along the lines of "Fix an issue with for securitygroups per pod where statefulset did not get working network" would be better than "Add VlanId in the cmdAdd Result struct"

@cgchinmay
Copy link
Contributor Author

@cgchinmay I think it is possible to improve the changelog a bit, it's difficult to relate to the changes from a consumer perspective. For example, maybe the VLAN change should mention statefulset. Maybe something along the lines of "Fix an issue with for securitygroups per pod where statefulset did not get working network" would be better than "Add VlanId in the cmdAdd Result struct"

Thanks for the feedback. I have updated the changelog to explicitly call out the Issue with security group for pods.

cgchinmay pushed a commit that referenced this pull request Mar 8, 2022
* Cherry pick of workflow changes from master branch (#1793)

* Change workflow to use git install (#1785)

- Change workflow to use git install as the go get command was
  altering go.mod file without updating go.sum file

* Workflow file updates (#1787)

* Change workflow to use git install

- Change workflow to use git install as the go get command was
  altering go.mod file without updating go.sum file

* Update workflow files to use go 1.16

- Updated workflow files to use go 1.16 for consistency.
- Changed integ test script to use git commit id and deleted unused code

* Specify go version at 1.16 for workflow files

Cherry pick multi-arch changes in release branch

1.10.2 changes (#1830)

* VlanID changes

PPSG Test agent changes

CNI metrics helper changes

minor fix

Move logging for CLUSTER_ID and Region inside publisher.go from main.go

revert manifest changes as the image is not released yet

* Cherry pick multi-arch changes in release branch

* cni-metrics-helper changes
vlanID changes
disable network provisioning fix
ipamd error code fix

* Minor change

* remove redundant changes

* Go version changes

* Switch to public ECR for AL2 (#1804)

* Switch to public ecr for al2 image

- Removed docker_arch variable which is redundant with this change

* Fix makefile and dockerfile entries

* Merge changes to auto-sync manifests

* minor change: add ContainerID to dummyVlanInterface

* Remove sudo from workflow files (#1818)

* remove set -x from bash, add -Ss to curl (#1802)

* remove weekly-cron-test.yml as its not needed for this branch

Co-authored-by: Vikas Basavaraj <5373156+vikasmb@users.noreply.github.com>
Co-authored-by: Jayanth Varavani <1111446+jayanthvn@users.noreply.github.com>
Co-authored-by: Scott Merrill <skippy@skippy.net>

fixed conflicts with routed-eni-cni-plugin/cni.go

* Updated config files for v1.10.2

* Changelog updates

* rremove duplicate AWS_CLUSTER_ID from cni-metrics-helper manifest file
cgchinmay pushed a commit to cgchinmay/amazon-vpc-cni-k8s that referenced this pull request Mar 31, 2022
* Change workflow to use git install (aws#1785)

- Change workflow to use git install as the go get command was
  altering go.mod file without updating go.sum file

* Workflow file updates (aws#1787)

* Change workflow to use git install

- Change workflow to use git install as the go get command was
  altering go.mod file without updating go.sum file

* Update workflow files to use go 1.16

- Updated workflow files to use go 1.16 for consistency.
- Changed integ test script to use git commit id and deleted unused code

* Specify go version at 1.16 for workflow files

Cherry pick multi-arch changes in release branch

1.10.2 changes (aws#1830)

* VlanID changes

PPSG Test agent changes

CNI metrics helper changes

minor fix

Move logging for CLUSTER_ID and Region inside publisher.go from main.go

revert manifest changes as the image is not released yet

* Cherry pick multi-arch changes in release branch

* cni-metrics-helper changes
vlanID changes
disable network provisioning fix
ipamd error code fix

* Minor change

* remove redundant changes

* Go version changes

* Switch to public ECR for AL2 (aws#1804)

* Switch to public ecr for al2 image

- Removed docker_arch variable which is redundant with this change

* Fix makefile and dockerfile entries

* Merge changes to auto-sync manifests

* minor change: add ContainerID to dummyVlanInterface

* Remove sudo from workflow files (aws#1818)

* remove set -x from bash, add -Ss to curl (aws#1802)

* remove weekly-cron-test.yml as its not needed for this branch

Co-authored-by: Vikas Basavaraj <5373156+vikasmb@users.noreply.github.com>
Co-authored-by: Jayanth Varavani <1111446+jayanthvn@users.noreply.github.com>
Co-authored-by: Scott Merrill <skippy@skippy.net>

fixed conflicts with routed-eni-cni-plugin/cni.go
cgchinmay pushed a commit to cgchinmay/amazon-vpc-cni-k8s that referenced this pull request Mar 31, 2022
* Change workflow to use git install (aws#1785)

- Change workflow to use git install as the go get command was
  altering go.mod file without updating go.sum file

* Workflow file updates (aws#1787)

* Change workflow to use git install

- Change workflow to use git install as the go get command was
  altering go.mod file without updating go.sum file

* Update workflow files to use go 1.16

- Updated workflow files to use go 1.16 for consistency.
- Changed integ test script to use git commit id and deleted unused code

* Specify go version at 1.16 for workflow files

Cherry pick multi-arch changes in release branch

1.10.2 changes (aws#1830)

* VlanID changes

PPSG Test agent changes

CNI metrics helper changes

minor fix

Move logging for CLUSTER_ID and Region inside publisher.go from main.go

revert manifest changes as the image is not released yet

* Cherry pick multi-arch changes in release branch

* cni-metrics-helper changes
vlanID changes
disable network provisioning fix
ipamd error code fix

* Minor change

* remove redundant changes

* Go version changes

* Switch to public ECR for AL2 (aws#1804)

* Switch to public ecr for al2 image

- Removed docker_arch variable which is redundant with this change

* Fix makefile and dockerfile entries

* Merge changes to auto-sync manifests

* minor change: add ContainerID to dummyVlanInterface

* Remove sudo from workflow files (aws#1818)

* remove set -x from bash, add -Ss to curl (aws#1802)

* remove weekly-cron-test.yml as its not needed for this branch

Co-authored-by: Vikas Basavaraj <5373156+vikasmb@users.noreply.github.com>
Co-authored-by: Jayanth Varavani <1111446+jayanthvn@users.noreply.github.com>
Co-authored-by: Scott Merrill <skippy@skippy.net>

fixed conflicts with routed-eni-cni-plugin/cni.go

Updated config files for v1.10.2

Changelog updates

fixed empty netns bug (aws#1941)

minor logging change

Updated GO SDK

added c7g instance

PD on bare metal instance

fixed dependabot warning
cgchinmay pushed a commit that referenced this pull request Apr 4, 2022
* Cherry pick of workflow changes from master branch (#1793)

* Change workflow to use git install (#1785)

- Change workflow to use git install as the go get command was
  altering go.mod file without updating go.sum file

* Workflow file updates (#1787)

* Change workflow to use git install

- Change workflow to use git install as the go get command was
  altering go.mod file without updating go.sum file

* Update workflow files to use go 1.16

- Updated workflow files to use go 1.16 for consistency.
- Changed integ test script to use git commit id and deleted unused code

* Specify go version at 1.16 for workflow files

Cherry pick multi-arch changes in release branch

1.10.2 changes (#1830)

* VlanID changes

PPSG Test agent changes

CNI metrics helper changes

minor fix

Move logging for CLUSTER_ID and Region inside publisher.go from main.go

revert manifest changes as the image is not released yet

* Cherry pick multi-arch changes in release branch

* cni-metrics-helper changes
vlanID changes
disable network provisioning fix
ipamd error code fix

* Minor change

* remove redundant changes

* Go version changes

* Switch to public ECR for AL2 (#1804)

* Switch to public ecr for al2 image

- Removed docker_arch variable which is redundant with this change

* Fix makefile and dockerfile entries

* Merge changes to auto-sync manifests

* minor change: add ContainerID to dummyVlanInterface

* Remove sudo from workflow files (#1818)

* remove set -x from bash, add -Ss to curl (#1802)

* remove weekly-cron-test.yml as its not needed for this branch

Co-authored-by: Vikas Basavaraj <5373156+vikasmb@users.noreply.github.com>
Co-authored-by: Jayanth Varavani <1111446+jayanthvn@users.noreply.github.com>
Co-authored-by: Scott Merrill <skippy@skippy.net>

fixed conflicts with routed-eni-cni-plugin/cni.go

* Cherry pick of workflow changes from master branch (#1793)

* Change workflow to use git install (#1785)

- Change workflow to use git install as the go get command was
  altering go.mod file without updating go.sum file

* Workflow file updates (#1787)

* Change workflow to use git install

- Change workflow to use git install as the go get command was
  altering go.mod file without updating go.sum file

* Update workflow files to use go 1.16

- Updated workflow files to use go 1.16 for consistency.
- Changed integ test script to use git commit id and deleted unused code

* Specify go version at 1.16 for workflow files

Cherry pick multi-arch changes in release branch

1.10.2 changes (#1830)

* VlanID changes

PPSG Test agent changes

CNI metrics helper changes

minor fix

Move logging for CLUSTER_ID and Region inside publisher.go from main.go

revert manifest changes as the image is not released yet

* Cherry pick multi-arch changes in release branch

* cni-metrics-helper changes
vlanID changes
disable network provisioning fix
ipamd error code fix

* Minor change

* remove redundant changes

* Go version changes

* Switch to public ECR for AL2 (#1804)

* Switch to public ecr for al2 image

- Removed docker_arch variable which is redundant with this change

* Fix makefile and dockerfile entries

* Merge changes to auto-sync manifests

* minor change: add ContainerID to dummyVlanInterface

* Remove sudo from workflow files (#1818)

* remove set -x from bash, add -Ss to curl (#1802)

* remove weekly-cron-test.yml as its not needed for this branch

Co-authored-by: Vikas Basavaraj <5373156+vikasmb@users.noreply.github.com>
Co-authored-by: Jayanth Varavani <1111446+jayanthvn@users.noreply.github.com>
Co-authored-by: Scott Merrill <skippy@skippy.net>

fixed conflicts with routed-eni-cni-plugin/cni.go

Updated config files for v1.10.2

Changelog updates

fixed empty netns bug (#1941)

minor logging change

Updated GO SDK

added c7g instance

PD on bare metal instance

fixed dependabot warning

* Updated go.mod and go.sum
cgchinmay pushed a commit that referenced this pull request Apr 8, 2022
* Cherry pick of workflow changes from master branch (#1793)

* Change workflow to use git install (#1785)

- Change workflow to use git install as the go get command was
  altering go.mod file without updating go.sum file

* Workflow file updates (#1787)

* Change workflow to use git install

- Change workflow to use git install as the go get command was
  altering go.mod file without updating go.sum file

* Update workflow files to use go 1.16

- Updated workflow files to use go 1.16 for consistency.
- Changed integ test script to use git commit id and deleted unused code

* Specify go version at 1.16 for workflow files

Cherry pick multi-arch changes in release branch

1.10.2 changes (#1830)

* VlanID changes

PPSG Test agent changes

CNI metrics helper changes

minor fix

Move logging for CLUSTER_ID and Region inside publisher.go from main.go

revert manifest changes as the image is not released yet

* Cherry pick multi-arch changes in release branch

* cni-metrics-helper changes
vlanID changes
disable network provisioning fix
ipamd error code fix

* Minor change

* remove redundant changes

* Go version changes

* Switch to public ECR for AL2 (#1804)

* Switch to public ecr for al2 image

- Removed docker_arch variable which is redundant with this change

* Fix makefile and dockerfile entries

* Merge changes to auto-sync manifests

* minor change: add ContainerID to dummyVlanInterface

* Remove sudo from workflow files (#1818)

* remove set -x from bash, add -Ss to curl (#1802)

* remove weekly-cron-test.yml as its not needed for this branch

Co-authored-by: Vikas Basavaraj <5373156+vikasmb@users.noreply.github.com>
Co-authored-by: Jayanth Varavani <1111446+jayanthvn@users.noreply.github.com>
Co-authored-by: Scott Merrill <skippy@skippy.net>

fixed conflicts with routed-eni-cni-plugin/cni.go

* Updated config files for v1.10.2

* Changelog updates

* Cherry pick of workflow changes from master branch (#1793)

* Change workflow to use git install (#1785)

- Change workflow to use git install as the go get command was
  altering go.mod file without updating go.sum file

* Workflow file updates (#1787)

* Change workflow to use git install

- Change workflow to use git install as the go get command was
  altering go.mod file without updating go.sum file

* Update workflow files to use go 1.16

- Updated workflow files to use go 1.16 for consistency.
- Changed integ test script to use git commit id and deleted unused code

* Specify go version at 1.16 for workflow files

Cherry pick multi-arch changes in release branch

1.10.2 changes (#1830)

* VlanID changes

PPSG Test agent changes

CNI metrics helper changes

minor fix

Move logging for CLUSTER_ID and Region inside publisher.go from main.go

revert manifest changes as the image is not released yet

* Cherry pick multi-arch changes in release branch

* cni-metrics-helper changes
vlanID changes
disable network provisioning fix
ipamd error code fix

* Minor change

* remove redundant changes

* Go version changes

* Switch to public ECR for AL2 (#1804)

* Switch to public ecr for al2 image

- Removed docker_arch variable which is redundant with this change

* Fix makefile and dockerfile entries

* Merge changes to auto-sync manifests

* minor change: add ContainerID to dummyVlanInterface

* Remove sudo from workflow files (#1818)

* remove set -x from bash, add -Ss to curl (#1802)

* remove weekly-cron-test.yml as its not needed for this branch

Co-authored-by: Vikas Basavaraj <5373156+vikasmb@users.noreply.github.com>
Co-authored-by: Jayanth Varavani <1111446+jayanthvn@users.noreply.github.com>
Co-authored-by: Scott Merrill <skippy@skippy.net>

fixed conflicts with routed-eni-cni-plugin/cni.go

* Cherry pick of workflow changes from master branch (#1793)

* Change workflow to use git install (#1785)

- Change workflow to use git install as the go get command was
  altering go.mod file without updating go.sum file

* Workflow file updates (#1787)

* Change workflow to use git install

- Change workflow to use git install as the go get command was
  altering go.mod file without updating go.sum file

* Update workflow files to use go 1.16

- Updated workflow files to use go 1.16 for consistency.
- Changed integ test script to use git commit id and deleted unused code

* Specify go version at 1.16 for workflow files

Cherry pick multi-arch changes in release branch

1.10.2 changes (#1830)

* VlanID changes

PPSG Test agent changes

CNI metrics helper changes

minor fix

Move logging for CLUSTER_ID and Region inside publisher.go from main.go

revert manifest changes as the image is not released yet

* Cherry pick multi-arch changes in release branch

* cni-metrics-helper changes
vlanID changes
disable network provisioning fix
ipamd error code fix

* Minor change

* remove redundant changes

* Go version changes

* Switch to public ECR for AL2 (#1804)

* Switch to public ecr for al2 image

- Removed docker_arch variable which is redundant with this change

* Fix makefile and dockerfile entries

* Merge changes to auto-sync manifests

* minor change: add ContainerID to dummyVlanInterface

* Remove sudo from workflow files (#1818)

* remove set -x from bash, add -Ss to curl (#1802)

* remove weekly-cron-test.yml as its not needed for this branch

Co-authored-by: Vikas Basavaraj <5373156+vikasmb@users.noreply.github.com>
Co-authored-by: Jayanth Varavani <1111446+jayanthvn@users.noreply.github.com>
Co-authored-by: Scott Merrill <skippy@skippy.net>

fixed conflicts with routed-eni-cni-plugin/cni.go

Updated config files for v1.10.2

Changelog updates

fixed empty netns bug (#1941)

minor logging change

Updated GO SDK

added c7g instance

PD on bare metal instance

fixed dependabot warning

* Updated go.mod and go.sum

* sync upload-resources-to-github file with master
cgchinmay pushed a commit that referenced this pull request Apr 11, 2022
* Cherry pick of workflow changes from master branch (#1793)

* Change workflow to use git install (#1785)

- Change workflow to use git install as the go get command was
  altering go.mod file without updating go.sum file

* Workflow file updates (#1787)

* Change workflow to use git install

- Change workflow to use git install as the go get command was
  altering go.mod file without updating go.sum file

* Update workflow files to use go 1.16

- Updated workflow files to use go 1.16 for consistency.
- Changed integ test script to use git commit id and deleted unused code

* Specify go version at 1.16 for workflow files

Cherry pick multi-arch changes in release branch

1.10.2 changes (#1830)

* VlanID changes

PPSG Test agent changes

CNI metrics helper changes

minor fix

Move logging for CLUSTER_ID and Region inside publisher.go from main.go

revert manifest changes as the image is not released yet

* Cherry pick multi-arch changes in release branch

* cni-metrics-helper changes
vlanID changes
disable network provisioning fix
ipamd error code fix

* Minor change

* remove redundant changes

* Go version changes

* Switch to public ECR for AL2 (#1804)

* Switch to public ecr for al2 image

- Removed docker_arch variable which is redundant with this change

* Fix makefile and dockerfile entries

* Merge changes to auto-sync manifests

* minor change: add ContainerID to dummyVlanInterface

* Remove sudo from workflow files (#1818)

* remove set -x from bash, add -Ss to curl (#1802)

* remove weekly-cron-test.yml as its not needed for this branch

Co-authored-by: Vikas Basavaraj <5373156+vikasmb@users.noreply.github.com>
Co-authored-by: Jayanth Varavani <1111446+jayanthvn@users.noreply.github.com>
Co-authored-by: Scott Merrill <skippy@skippy.net>

fixed conflicts with routed-eni-cni-plugin/cni.go

* Updated config files for v1.10.2

* Changelog updates

* Cherry pick of workflow changes from master branch (#1793)

* Change workflow to use git install (#1785)

- Change workflow to use git install as the go get command was
  altering go.mod file without updating go.sum file

* Workflow file updates (#1787)

* Change workflow to use git install

- Change workflow to use git install as the go get command was
  altering go.mod file without updating go.sum file

* Update workflow files to use go 1.16

- Updated workflow files to use go 1.16 for consistency.
- Changed integ test script to use git commit id and deleted unused code

* Specify go version at 1.16 for workflow files

Cherry pick multi-arch changes in release branch

1.10.2 changes (#1830)

* VlanID changes

PPSG Test agent changes

CNI metrics helper changes

minor fix

Move logging for CLUSTER_ID and Region inside publisher.go from main.go

revert manifest changes as the image is not released yet

* Cherry pick multi-arch changes in release branch

* cni-metrics-helper changes
vlanID changes
disable network provisioning fix
ipamd error code fix

* Minor change

* remove redundant changes

* Go version changes

* Switch to public ECR for AL2 (#1804)

* Switch to public ecr for al2 image

- Removed docker_arch variable which is redundant with this change

* Fix makefile and dockerfile entries

* Merge changes to auto-sync manifests

* minor change: add ContainerID to dummyVlanInterface

* Remove sudo from workflow files (#1818)

* remove set -x from bash, add -Ss to curl (#1802)

* remove weekly-cron-test.yml as its not needed for this branch

Co-authored-by: Vikas Basavaraj <5373156+vikasmb@users.noreply.github.com>
Co-authored-by: Jayanth Varavani <1111446+jayanthvn@users.noreply.github.com>
Co-authored-by: Scott Merrill <skippy@skippy.net>

fixed conflicts with routed-eni-cni-plugin/cni.go

* Cherry pick of workflow changes from master branch (#1793)

* Change workflow to use git install (#1785)

- Change workflow to use git install as the go get command was
  altering go.mod file without updating go.sum file

* Workflow file updates (#1787)

* Change workflow to use git install

- Change workflow to use git install as the go get command was
  altering go.mod file without updating go.sum file

* Update workflow files to use go 1.16

- Updated workflow files to use go 1.16 for consistency.
- Changed integ test script to use git commit id and deleted unused code

* Specify go version at 1.16 for workflow files

Cherry pick multi-arch changes in release branch

1.10.2 changes (#1830)

* VlanID changes

PPSG Test agent changes

CNI metrics helper changes

minor fix

Move logging for CLUSTER_ID and Region inside publisher.go from main.go

revert manifest changes as the image is not released yet

* Cherry pick multi-arch changes in release branch

* cni-metrics-helper changes
vlanID changes
disable network provisioning fix
ipamd error code fix

* Minor change

* remove redundant changes

* Go version changes

* Switch to public ECR for AL2 (#1804)

* Switch to public ecr for al2 image

- Removed docker_arch variable which is redundant with this change

* Fix makefile and dockerfile entries

* Merge changes to auto-sync manifests

* minor change: add ContainerID to dummyVlanInterface

* Remove sudo from workflow files (#1818)

* remove set -x from bash, add -Ss to curl (#1802)

* remove weekly-cron-test.yml as its not needed for this branch

Co-authored-by: Vikas Basavaraj <5373156+vikasmb@users.noreply.github.com>
Co-authored-by: Jayanth Varavani <1111446+jayanthvn@users.noreply.github.com>
Co-authored-by: Scott Merrill <skippy@skippy.net>

fixed conflicts with routed-eni-cni-plugin/cni.go

Updated config files for v1.10.2

Changelog updates

fixed empty netns bug (#1941)

minor logging change

Updated GO SDK

added c7g instance

PD on bare metal instance

fixed dependabot warning

* Updated go.mod and go.sum

* Updated Chart and appversion for vpc-cni
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants