Fix cni metrics helper manifest (#1920)

* 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 <[email protected]>
Co-authored-by: Jayanth Varavani <[email protected]>
Co-authored-by: Scott Merrill <[email protected]>

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

config/master/cni-metrics-helper.yaml

@@ -64,9 +64,6 @@ spec:
           value: ""
         - name: USE_CLOUDWATCH
           value: "true"
-        # Optional: Should be ClusterName/ClusterIdentifier used as the metric dimension 
-        - name: AWS_CLUSTER_ID
-          value: ""
         name: cni-metrics-helper
         image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/cni-metrics-helper:v1.10.2"
       serviceAccountName: cni-metrics-helper