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.

Sign up for GitHub

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

fix(template): add CONTROL_PLANE_ENDPOINT_IP to ignoredNodeIPs list in CCM #480

Merged
merged 1 commit into from
Aug 26, 2024
Merged

fix(template): add CONTROL_PLANE_ENDPOINT_IP to ignoredNodeIPs list in CCM #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion templates/ccm/nutanix-ccm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@ data:
"enableCustomLabeling": ${CCM_CUSTOM_LABEL=false},
"topologyDiscovery": {
"type": "Prism"
}
},
"ignoredNodeIPs": [
"${CONTROL_PLANE_ENDPOINT_IP}"
]
}
---
# Source: nutanix-cloud-provider/templates/rbac.yaml
Expand Down
5 changes: 4 additions & 1 deletion templates/cluster-template-csi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,10 @@ data:
"enableCustomLabeling": ${CCM_CUSTOM_LABEL=false},
"topologyDiscovery": {
"type": "Prism"
}
},
"ignoredNodeIPs": [
"${CONTROL_PLANE_ENDPOINT_IP}"
]
}
---
# Source: nutanix-cloud-provider/templates/rbac.yaml
Expand Down
5 changes: 4 additions & 1 deletion templates/cluster-template-csi3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,10 @@ data:
"enableCustomLabeling": ${CCM_CUSTOM_LABEL=false},
"topologyDiscovery": {
"type": "Prism"
}
},
"ignoredNodeIPs": [
"${CONTROL_PLANE_ENDPOINT_IP}"
]
}
---
# Source: nutanix-cloud-provider/templates/rbac.yaml
Expand Down
5 changes: 4 additions & 1 deletion templates/cluster-template-topology.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,10 @@ data:
"enableCustomLabeling": ${CCM_CUSTOM_LABEL=false},
"topologyDiscovery": {
"type": "Prism"
}
},
"ignoredNodeIPs": [
"${CONTROL_PLANE_ENDPOINT_IP}"
]
}
---
# Source: nutanix-cloud-provider/templates/rbac.yaml
Expand Down
5 changes: 4 additions & 1 deletion templates/cluster-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,10 @@ data:
"enableCustomLabeling": ${CCM_CUSTOM_LABEL=false},
"topologyDiscovery": {
"type": "Prism"
}
},
"ignoredNodeIPs": [
"${CONTROL_PLANE_ENDPOINT_IP}"
]
}
---
# Source: nutanix-cloud-provider/templates/rbac.yaml
Expand Down
20 changes: 12 additions & 8 deletions test/e2e/data/infrastructure-nutanix/ccm-update.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,10 @@ data:
"enableCustomLabeling": ${CCM_CUSTOM_LABEL=false},
"topologyDiscovery": {
"type": "Prism"
}
},
"ignoredNodeIPs": [
"${CONTROL_PLANE_ENDPOINT_IP}"
]
}
---
# Source: nutanix-cloud-provider/templates/rbac.yaml
Expand Down Expand Up @@ -223,7 +226,8 @@ metadata:
name: nutanix-ccm-secret
namespace: ${PATCH_NAMESPACE=clusterctl-upgrade}
stringData:
nutanix-ccm-secret.yaml: "apiVersion: v1\nkind: Secret\nmetadata:\n name: nutanix-creds\n
nutanix-ccm-secret.yaml:
"apiVersion: v1\nkind: Secret\nmetadata:\n name: nutanix-creds\n
\ namespace: kube-system\nstringData:\n credentials: |\n [\n {\n \"type\":
\"basic_auth\", \n \"data\": { \n \"prismCentral\":{\n \"username\":
\"${NUTANIX_USER}\",\n \"password\": \"${NUTANIX_PASSWORD}\"\n },\n
Expand All @@ -240,10 +244,10 @@ spec:
matchLabels:
ccm: nutanix
resources:
- kind: ConfigMap
name: nutanix-ccm
- kind: Secret
name: nutanix-ccm-secret
- kind: ConfigMap
name: user-ca-bundle
- kind: ConfigMap
name: nutanix-ccm
- kind: Secret
name: nutanix-ccm-secret
- kind: ConfigMap
name: user-ca-bundle
strategy: ApplyOnce
Loading