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

Add Nutanix CCM ignore node IPs list #9068

Merged
merged 3 commits into from
Dec 19, 2024

Conversation

adiantum
Copy link
Contributor

Description of changes:
Add kube-vip and optional list of ip addresses to CCM node ip addresses ignore list.
Required to fix bug with LB ip pool ranges and kube vip interception with node ip addresses.

Testing (if applicable):

2024-12-12T00:04:09.662Z        V6      Executing command       {"cmd": "/usr/bin/docker version --format {{.Client.Version}}"}
2024-12-12T00:04:09.684Z        V6      Executing command       {"cmd": "/usr/bin/docker info --format '{{json .MemTotal}}'"}
2024-12-12T00:04:09.733Z        V4      Reading bundles manifest        {"url": "bin/local-bundle-release.yaml"}
2024-12-12T00:04:09.752Z        V4      Using CAPI provider versions    {"Core Cluster API": "v1.8.5+92cdac0", "Kubeadm Bootstrap": "v1.8.5+c43b35f", "Kubeadm Control Plane": "v1.8.5+b86ee32", "External etcd Bootstrap": "v1.0.15+b010405", "External etcd Controller": "v1.0.24+061d671", "Cluster API Provider Nutanix": "v1.4.0+e4aafc0"}
2024-12-12T00:04:10.090Z        V5      Retrier:        {"timeout": "2562047h47m16.854775807s", "backoffFactor": null}
2024-12-12T00:04:10.090Z        V2      Pulling docker image    {"image": "public.ecr.aws/l0g8r8j6/eks-anywhere-cli-tools:v0.21.2-eks-a-v0.22.0-dev-build.75"}
2024-12-12T00:04:10.090Z        V6      Executing command       {"cmd": "/usr/bin/docker pull public.ecr.aws/l0g8r8j6/eks-anywhere-cli-tools:v0.21.2-eks-a-v0.22.0-dev-build.75"}
2024-12-12T00:04:15.477Z        V5      Retry execution successful      {"retries": 1, "duration": "5.38687098s"}
2024-12-12T00:04:15.477Z        V3      Initializing long running container     {"name": "eksa_1733961850090287433", "image": "public.ecr.aws/l0g8r8j6/eks-anywhere-cli-tools:v0.21.2-eks-a-v0.22.0-dev-build.75"}
2024-12-12T00:04:15.477Z        V6      Executing command       {"cmd": "/usr/bin/docker run -d --name eksa_1733961850090287433 --network host -w /home/ubuntu/eksa-tests/ccm-ips -v /var/run/docker.sock:/var/run/docker.sock -v /home/ubuntu/eksa-tests/ccm-ips:/home/ubuntu/eksa-tests/ccm-ips -v /home/ubuntu/eksa-tests/ccm-ips:/home/ubuntu/eksa-tests/ccm-ips --entrypoint sleep public.ecr.aws/l0g8r8j6/eks-anywhere-cli-tools:v0.21.2-eks-a-v0.22.0-dev-build.75 infinity"}
2024-12-12T00:04:16.733Z        V1      Using the eksa controller to create the management cluster
2024-12-12T00:04:16.733Z        V4      Task start      {"task_name": "setup-validate"}
2024-12-12T00:04:16.733Z        V0      Performing setup and validations
2024-12-12T00:04:16.733Z        V0      ValidateClusterSpec for Nutanix datacenter      {"NutanixDatacenter": "eksa-ntnx-fiql-fix"}
2024-12-12T00:06:12.858Z        V0      ✅ Nutanix Provider setup is valid
2024-12-12T00:06:12.858Z        V0      ✅ Validate OS is compatible with registry mirror configuration
2024-12-12T00:06:12.858Z        V0      ✅ Validate certificate for registry mirror
2024-12-12T00:06:12.858Z        V0      ✅ Validate authentication for git provider
2024-12-12T00:06:12.858Z        V0      ✅ Validate cluster's eksaVersion matches EKS-A version
2024-12-12T00:06:12.858Z        V4      Task finished   {"task_name": "setup-validate", "duration": "1m56.125420155s"}
2024-12-12T00:06:12.858Z        V4      ----------------------------------
2024-12-12T00:06:12.858Z        V4      Task start      {"task_name": "bootstrap-cluster-init"}
2024-12-12T00:06:12.858Z        V0      Creating new bootstrap cluster
2024-12-12T00:06:12.859Z        V4      Creating kind cluster   {"name": "eksa-ntnx-fiql-fix-eks-a-cluster", "kubeconfig": "eksa-ntnx-fiql-fix/generated/eksa-ntnx-fiql-fix.kind.kubeconfig"}
....
2024-12-12T00:23:06.965Z        V4      Deleting kind cluster   {"name": "eksa-ntnx-fiql-fix-eks-a-cluster"}
2024-12-12T00:23:06.965Z        V6      Executing command       {"cmd": "/usr/bin/docker exec -i eksa_1733961850090287433 kind delete cluster --nam
e eksa-ntnx-fiql-fix-eks-a-cluster"}
2024-12-12T00:23:08.008Z        V5      Retry execution successful      {"retries": 1, "duration": "1.043033717s"}
2024-12-12T00:23:08.008Z        V0      🎉 Cluster created!
2024-12-12T00:23:08.008Z        V4      Task finished   {"task_name": "delete-kind-cluster", "duration": "1.406509365s"}
2024-12-12T00:23:08.008Z        V4      ----------------------------------
...

CCM config generated as expected:
Screenshot 2024-12-12 at 01 34 08

Documentation added/planned (if applicable):
Description of 'ccmExcludeNodeIPs' field of NutanixDatacenterConfig spec will be added

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@eks-distro-bot
Copy link
Collaborator

Hi @adiantum. Thanks for your PR.

I'm waiting for a aws member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@eks-distro-bot eks-distro-bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Dec 12, 2024
 - fix kube-vip validation
 - fix kube-vip add to ignore node list
 - add unit-test
@abhinavmpandey08
Copy link
Member

/ok-to-test

Copy link

codecov bot commented Dec 18, 2024

Codecov Report

Attention: Patch coverage is 83.47107% with 20 lines in your changes missing coverage. Please review.

Project coverage is 72.41%. Comparing base (2d5791a) to head (71426fb).
Report is 8 commits behind head on main.

Files with missing lines Patch % Lines
pkg/providers/nutanix/validator.go 78.57% 8 Missing and 4 partials ⚠️
pkg/providers/nutanix/template.go 87.69% 6 Missing and 2 partials ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #9068      +/-   ##
==========================================
+ Coverage   72.37%   72.41%   +0.04%     
==========================================
  Files         578      578              
  Lines       45451    45590     +139     
==========================================
+ Hits        32897    33016     +119     
- Misses      10824    10838      +14     
- Partials     1730     1736       +6     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Member

@abhinavmpandey08 abhinavmpandey08 left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm
/woof

@eks-distro-bot
Copy link
Collaborator

@abhinavmpandey08: dog image

In response to this:

/approve
/lgtm
/woof

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@eks-distro-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abhinavmpandey08

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

@eks-distro-bot eks-distro-bot merged commit 586f904 into aws:main Dec 19, 2024
13 checks passed
@eks-distro-pr-bot
Copy link
Contributor

@panktishah26: #9068 failed to apply on top of branch "release-0.21":

Applying: BUGFIX Add Add Nutanix CCM ignore node IPs list
Using index info to reconstruct a base tree...
M	config/crd/bases/anywhere.eks.amazonaws.com_nutanixdatacenterconfigs.yaml
M	pkg/api/v1alpha1/nutanixdatacenterconfig_types.go
M	pkg/api/v1alpha1/zz_generated.deepcopy.go
M	pkg/providers/nutanix/config/cp-template.yaml
M	pkg/providers/nutanix/template.go
M	pkg/providers/nutanix/template_test.go
M	pkg/providers/nutanix/testdata/cluster_api_server_cert_san_domain_name.yaml
M	pkg/providers/nutanix/testdata/cluster_api_server_cert_san_ip.yaml
M	pkg/providers/nutanix/testdata/cluster_nutanix_etcd_encryption.yaml
M	pkg/providers/nutanix/testdata/cluster_nutanix_etcd_encryption_1_29.yaml
M	pkg/providers/nutanix/testdata/cluster_nutanix_failure_domains.yaml
M	pkg/providers/nutanix/testdata/cluster_nutanix_with_invalid_trust_bundle.yaml
M	pkg/providers/nutanix/testdata/cluster_nutanix_with_trust_bundle.yaml
M	pkg/providers/nutanix/testdata/cluster_nutanix_with_upgrade_strategy_cp.yaml
M	pkg/providers/nutanix/testdata/cluster_nutanix_with_upgrade_strategy_md.yaml
M	pkg/providers/nutanix/testdata/eksa-cluster-additional-categories.yaml
M	pkg/providers/nutanix/testdata/eksa-cluster-autoscaler.yaml
M	pkg/providers/nutanix/testdata/eksa-cluster-external-etcd-k8s-1-20.yaml
M	pkg/providers/nutanix/testdata/eksa-cluster-external-etcd-with-optional.yaml
M	pkg/providers/nutanix/testdata/eksa-cluster-external-etcd.yaml
M	pkg/providers/nutanix/testdata/eksa-cluster-gpus.yaml
M	pkg/providers/nutanix/testdata/eksa-cluster-iamauth.yaml
M	pkg/providers/nutanix/testdata/eksa-cluster-invalid-kc.yaml
M	pkg/providers/nutanix/testdata/eksa-cluster-invalid-pe-cluster-pc.yaml
M	pkg/providers/nutanix/testdata/eksa-cluster-invalid-pe-cluster-random-name.yaml
M	pkg/providers/nutanix/testdata/eksa-cluster-irsa.yaml
M	pkg/providers/nutanix/testdata/eksa-cluster-multi-worker-fds.yaml
M	pkg/providers/nutanix/testdata/eksa-cluster-multiple-machineconfigs.yaml
M	pkg/providers/nutanix/testdata/eksa-cluster-multiple-worker-md.yaml
M	pkg/providers/nutanix/testdata/eksa-cluster-no-credentialref.yaml
M	pkg/providers/nutanix/testdata/eksa-cluster-node-taints-labels.yaml
M	pkg/providers/nutanix/testdata/eksa-cluster-oidc.yaml
M	pkg/providers/nutanix/testdata/eksa-cluster-project.yaml
M	pkg/providers/nutanix/testdata/eksa-cluster-proxy.yaml
M	pkg/providers/nutanix/testdata/eksa-cluster-registry-mirror.yaml
M	pkg/providers/nutanix/testdata/eksa-cluster-worker-fds.yaml
M	pkg/providers/nutanix/testdata/eksa-cluster-worker-version.yaml
M	pkg/providers/nutanix/testdata/eksa-cluster.json
M	pkg/providers/nutanix/testdata/eksa-cluster.yaml
M	pkg/providers/nutanix/testdata/expected_cluster_api_additional_trust_bundle.yaml
M	pkg/providers/nutanix/testdata/expected_cluster_api_server_cert_san_domain_name.yaml
M	pkg/providers/nutanix/testdata/expected_cluster_api_server_cert_san_ip.yaml
M	pkg/providers/nutanix/testdata/expected_cp.yaml
M	pkg/providers/nutanix/testdata/expected_results_additional_categories.yaml
M	pkg/providers/nutanix/testdata/expected_results_etcd_encryption.yaml
M	pkg/providers/nutanix/testdata/expected_results_etcd_encryption_1_29.yaml
M	pkg/providers/nutanix/testdata/expected_results_external_etcd.yaml
M	pkg/providers/nutanix/testdata/expected_results_external_etcd_with_optional.yaml.git/rebase-apply/patch:653: trailing whitespace.
    
.git/rebase-apply/patch:1249: trailing whitespace.
              image: 
.git/rebase-apply/patch:1747: trailing whitespace.
          {        
.git/rebase-apply/patch:653: new blank line at EOF.
+
warning: 4 lines add whitespace errors.

M	pkg/providers/nutanix/testdata/expected_results_failure_domains.yaml
M	pkg/providers/nutanix/testdata/expected_results_gpus.yaml
M	pkg/providers/nutanix/testdata/expected_results_iamauth.yaml
M	pkg/providers/nutanix/testdata/expected_results_irsa.yaml
M	pkg/providers/nutanix/testdata/expected_results_multi_worker_fds.yaml
M	pkg/providers/nutanix/testdata/expected_results_node_taints_labels.yaml
M	pkg/providers/nutanix/testdata/expected_results_oidc.yaml
M	pkg/providers/nutanix/testdata/expected_results_project.yaml
M	pkg/providers/nutanix/testdata/expected_results_proxy.yaml
M	pkg/providers/nutanix/testdata/expected_results_proxy_md.yaml
M	pkg/providers/nutanix/testdata/expected_results_registry_mirror.yaml
M	pkg/providers/nutanix/testdata/expected_results_worker_fds.yaml
M	pkg/providers/nutanix/validator.go
M	pkg/providers/nutanix/validator_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/providers/nutanix/validator_test.go
Auto-merging pkg/providers/nutanix/validator.go
Auto-merging pkg/providers/nutanix/template_test.go
CONFLICT (content): Merge conflict in pkg/providers/nutanix/template_test.go
Auto-merging pkg/providers/nutanix/template.go
CONFLICT (content): Merge conflict in pkg/providers/nutanix/template.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 BUGFIX Add Add Nutanix CCM ignore node IPs list
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-0.21

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm ok-to-test size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants