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

Cni-metrics-helper was missing because of gitignore #1497

Merged
merged 1 commit into from
Jun 8, 2021

Conversation

jayanthvn
Copy link
Contributor

What type of PR is this?
feature

Which issue does this PR fix:
N/a

What does this PR do / Why do we need it:
Auto gen of cni metrics helper yaml

If an issue # is not available please add repro steps and logs from IPAMD/CNI showing the issue:

Testing done on this change:

Yes

make generate-cni-yaml
/local/home/varavaj/src/cni-metrics-helper/amazon-vpc-cni-k8s//scripts/generate-cni-yaml.sh
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100 11.5M  100 11.5M    0     0  15.7M      0 --:--:-- --:--:-- --:--:-- 15.7M
wrote /local/home/varavaj/src/cni-metrics-helper/amazon-vpc-cni-k8s/scripts/../build/cni-rel-yamls/v1.6.4-rc1-155-g98395831-dirty/individual-resources//aws-vpc-cni/templates/serviceaccount.yaml
wrote /local/home/varavaj/src/cni-metrics-helper/amazon-vpc-cni-k8s/scripts/../build/cni-rel-yamls/v1.6.4-rc1-155-g98395831-dirty/individual-resources//aws-vpc-cni/templates/customresourcedefinition.yaml
wrote /local/home/varavaj/src/cni-metrics-helper/amazon-vpc-cni-k8s/scripts/../build/cni-rel-yamls/v1.6.4-rc1-155-g98395831-dirty/individual-resources//aws-vpc-cni/templates/clusterrole.yaml
wrote /local/home/varavaj/src/cni-metrics-helper/amazon-vpc-cni-k8s/scripts/../build/cni-rel-yamls/v1.6.4-rc1-155-g98395831-dirty/individual-resources//aws-vpc-cni/templates/clusterrolebinding.yaml
wrote /local/home/varavaj/src/cni-metrics-helper/amazon-vpc-cni-k8s/scripts/../build/cni-rel-yamls/v1.6.4-rc1-155-g98395831-dirty/individual-resources//aws-vpc-cni/templates/daemonset.yaml

wrote /local/home/varavaj/src/cni-metrics-helper/amazon-vpc-cni-k8s/scripts/../build/cni-rel-yamls/v1.6.4-rc1-155-g98395831-dirty/individual-resources//cni-metrics-helper/templates/serviceaccount.yaml
wrote /local/home/varavaj/src/cni-metrics-helper/amazon-vpc-cni-k8s/scripts/../build/cni-rel-yamls/v1.6.4-rc1-155-g98395831-dirty/individual-resources//cni-metrics-helper/templates/clusterrole.yaml
wrote /local/home/varavaj/src/cni-metrics-helper/amazon-vpc-cni-k8s/scripts/../build/cni-rel-yamls/v1.6.4-rc1-155-g98395831-dirty/individual-resources//cni-metrics-helper/templates/clusterrolebinding.yaml
wrote /local/home/varavaj/src/cni-metrics-helper/amazon-vpc-cni-k8s/scripts/../build/cni-rel-yamls/v1.6.4-rc1-155-g98395831-dirty/individual-resources//cni-metrics-helper/templates/deployment.yaml

wrote /local/home/varavaj/src/cni-metrics-helper/amazon-vpc-cni-k8s/scripts/../build/cni-rel-yamls/v1.6.4-rc1-155-g98395831-dirty/individual-resources//aws-calico/templates/pod-disruption-budget.yaml
wrote /local/home/varavaj/src/cni-metrics-helper/amazon-vpc-cni-k8s/scripts/../build/cni-rel-yamls/v1.6.4-rc1-155-g98395831-dirty/individual-resources//aws-calico/templates/config-map.yaml
wrote /local/home/varavaj/src/cni-metrics-helper/amazon-vpc-cni-k8s/scripts/../build/cni-rel-yamls/v1.6.4-rc1-155-g98395831-dirty/individual-resources//aws-calico/templates/service-accounts.yaml
wrote /local/home/varavaj/src/cni-metrics-helper/amazon-vpc-cni-k8s/scripts/../build/cni-rel-yamls/v1.6.4-rc1-155-g98395831-dirty/individual-resources//aws-calico/templates/service-accounts.yaml
wrote /local/home/varavaj/src/cni-metrics-helper/amazon-vpc-cni-k8s/scripts/../build/cni-rel-yamls/v1.6.4-rc1-155-g98395831-dirty/individual-resources//aws-calico/templates/rbac.yaml
wrote /local/home/varavaj/src/cni-metrics-helper/amazon-vpc-cni-k8s/scripts/../build/cni-rel-yamls/v1.6.4-rc1-155-g98395831-dirty/individual-resources//aws-calico/templates/rbac.yaml
wrote /local/home/varavaj/src/cni-metrics-helper/amazon-vpc-cni-k8s/scripts/../build/cni-rel-yamls/v1.6.4-rc1-155-g98395831-dirty/individual-resources//aws-calico/templates/rbac.yaml
wrote /local/home/varavaj/src/cni-metrics-helper/amazon-vpc-cni-k8s/scripts/../build/cni-rel-yamls/v1.6.4-rc1-155-g98395831-dirty/individual-resources//aws-calico/templates/rbac.yaml
wrote /local/home/varavaj/src/cni-metrics-helper/amazon-vpc-cni-k8s/scripts/../build/cni-rel-yamls/v1.6.4-rc1-155-g98395831-dirty/individual-resources//aws-calico/templates/rbac.yaml
wrote /local/home/varavaj/src/cni-metrics-helper/amazon-vpc-cni-k8s/scripts/../build/cni-rel-yamls/v1.6.4-rc1-155-g98395831-dirty/individual-resources//aws-calico/templates/rbac.yaml
wrote /local/home/varavaj/src/cni-metrics-helper/amazon-vpc-cni-k8s/scripts/../build/cni-rel-yamls/v1.6.4-rc1-155-g98395831-dirty/individual-resources//aws-calico/templates/service.yaml
wrote /local/home/varavaj/src/cni-metrics-helper/amazon-vpc-cni-k8s/scripts/../build/cni-rel-yamls/v1.6.4-rc1-155-g98395831-dirty/individual-resources//aws-calico/templates/daemon-set.yaml
wrote /local/home/varavaj/src/cni-metrics-helper/amazon-vpc-cni-k8s/scripts/../build/cni-rel-yamls/v1.6.4-rc1-155-g98395831-dirty/individual-resources//aws-calico/templates/deployment.yaml
wrote /local/home/varavaj/src/cni-metrics-helper/amazon-vpc-cni-k8s/scripts/../build/cni-rel-yamls/v1.6.4-rc1-155-g98395831-dirty/individual-resources//aws-calico/templates/deployment.yaml

templates/clusterrolebinding.yaml
templates/clusterrole.yaml
templates/customresourcedefinition.yaml
templates/daemonset.yaml
templates/serviceaccount.yaml
templates/clusterrolebinding.yaml
templates/clusterrole.yaml
templates/deployment.yaml
templates/serviceaccount.yaml
templates/config-map.yaml
templates/daemon-set.yaml
templates/deployment.yaml
templates/pod-disruption-budget.yaml
templates/rbac.yaml
templates/service-accounts.yaml
templates/service.yaml
Generated aws-vpc-cni and cni-metrics-helper kubernetes yaml resources files in:
    - /local/home/varavaj/src/cni-metrics-helper/amazon-vpc-cni-k8s/scripts/../build/cni-rel-yamls/v1.6.4-rc1-155-g98395831-dirty/aws-vpc-cni
    - /local/home/varavaj/src/cni-metrics-helper/amazon-vpc-cni-k8s/scripts/../build/cni-rel-yamls/v1.6.4-rc1-155-g98395831-dirty/cni-metrics-helper
    - /local/home/varavaj/src/cni-metrics-helper/amazon-vpc-cni-k8s/scripts/../build/cni-rel-yamls/v1.6.4-rc1-155-g98395831-dirty/cni_individual-resources.tar
    - /local/home/varavaj/src/cni-metrics-helper/amazon-vpc-cni-k8s/scripts/../build/cni-rel-yamls/v1.6.4-rc1-155-g98395831-dirty/cni_metrics_individual-resources.tar
    - /local/home/varavaj/src/cni-metrics-helper/amazon-vpc-cni-k8s/scripts/../build/cni-rel-yamls/v1.6.4-rc1-155-g98395831-dirty/calico_individual-resources.tar

 % [cni-rel-yamls]
dev-dsk-varavaj-2b-72f02457 % cd v1.6.4-rc1-155-g98395831-dirty

 % [v1.6.4-rc1-155-g98395831-dirty]
dev-dsk-varavaj-2b-72f02457 % ls
aws-vpc-cni-cn.yaml             calico_individual-resources.tar  cni-metrics-helper-us-gov-east-1.yaml  helm
aws-vpc-cni-us-gov-east-1.yaml  calico.yaml                      cni-metrics-helper-us-gov-west-1.yaml  individual-resources
aws-vpc-cni-us-gov-west-1.yaml  cni_individual-resources.tar     cni-metrics-helper.yaml
aws-vpc-cni.yaml                cni-metrics-helper-cn.yaml       cni_metrics_individual-resources.tar

helm install cni-metrics-helper --namespace kube-system --generate-name
NAME: cni-metrics-helper-1623114961
LAST DEPLOYED: Tue Jun  8 01:16:02 2021
NAMESPACE: kube-system
STATUS: deployed
REVISION: 1
TEST SUITE: None
NOTES:
cni-metrics-helper-1623114961 has been installed or updated. To check the status of pods, run:
kubectl get pods --namespace kube-system -l "app.kubernetes.io/name=cni-metrics-helper,app.kubernetes.io/instance=cni-metrics-helper-1623114961"
 % [charts]
dev-dsk-varavaj-2b-72f02457 % kgpsys
NAME                                  READY   STATUS        RESTARTS   AGE   IP               NODE                                          NOMINATED NODE   READINESS GATES
aws-node-dt8p9                        1/1     Terminating   0          31d   192.168.77.49    ip-192-168-77-49.us-west-2.compute.internal   <none>           <none>
aws-node-fswmv                        1/1     Running       0          31d   192.168.6.73     ip-192-168-6-73.us-west-2.compute.internal    <none>           <none>
cni-metrics-helper-57cbb76f75-cv5sj   1/1     Running       0          9s    192.168.20.242   ip-192-168-6-73.us-west-2.compute.internal    <none>           <none>
kubectl logs cni-metrics-helper-57cbb76f75-cv5sj -n kube-system
{"level":"info","ts":"2021-06-08T01:16:10.869Z","caller":"runtime/proc.go:203","msg":"Starting CNIMetricsHelper. Sending metrics to CloudWatch: true, LogLevel Debug"}
{"level":"info","ts":"2021-06-08T01:16:41.229Z","caller":"runtime/proc.go:203","msg":"Collecting metrics ..."}
{"level":"debug","ts":"2021-06-08T01:16:41.238Z","caller":"metrics/metrics.go:377","msg":"cni-metrics text output: # HELP awscni_add_ip_req_count The number of add IP address requests\n# TYPE awscni_add_ip_req_count counter\nawscni_add_ip_req_count 1803\n# HELP awscni_assigned_ip_addresses The number of IP addresses assigned to pods\n# TYPE awscni_assigned_ip_addresses gauge\nawscni_assigned_ip_addresses 10\n# HELP awscni_aws_api_latency_ms AWS API call latency in ms\n# TYPE awscni_aws_api_latency_ms summary\nawscni_aws_api_latency_ms{api=\"AssignPrivateIpAddresses\",error=\"false\",quantile=\"0.5\"} NaN\nawscni_aws_api_latency_ms{api=\"AssignPrivateIpAddresses\",error=\"false\",quantile=\"0.9\"} NaN\nawscni_aws_api_latency_ms{api=\"AssignPrivateIpAddresses\",error=\"false\",quantile=\"0.99\"} NaN\nawscni_aws_api_latency_ms_sum{api=\"AssignPrivateIpAddresses\",error=\"false\"} 848\nawscni_aws_api_latency_ms_count{api=\"AssignPrivateIpAddresses\",error=\"false\"} 2\nawscni_aws_api_latency_ms{api=\"DescribeNetworkInterfaces\",error=\"false\",quantile=\"0.5\"} NaN\nawscni_aws_api_latency_ms{api=\"DescribeN

Automation added to e2e:

Will this break upgrades or downgrades. Has updating a running cluster been tested?:

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

Does this PR introduce any user-facing change?:


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

@M00nF1sh
Copy link
Contributor

M00nF1sh commented Jun 8, 2021

/lgtm

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.

2 participants