-
Notifications
You must be signed in to change notification settings - Fork 431
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
Templates and E2E tests use external cloud-provider-azure by default #1994
Closed
jackfrancis
wants to merge
1
commit into
kubernetes-sigs:main
from
jackfrancis:more-external-cloud-provider-azure
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
210 changes: 210 additions & 0 deletions
210
templates/cloud-provider-azure-ipv6/cloud-controller-manager.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,210 @@ | ||
| apiVersion: v1 | ||
| kind: ServiceAccount | ||
| metadata: | ||
| name: cloud-controller-manager | ||
| namespace: kube-system | ||
| --- | ||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
| kind: ClusterRole | ||
| metadata: | ||
| name: system:cloud-controller-manager | ||
| annotations: | ||
| rbac.authorization.kubernetes.io/autoupdate: "true" | ||
| labels: | ||
| k8s-app: cloud-controller-manager | ||
| rules: | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - events | ||
| verbs: | ||
| - create | ||
| - patch | ||
| - update | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - nodes | ||
| verbs: | ||
| - "*" | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - nodes/status | ||
| verbs: | ||
| - patch | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - services | ||
| verbs: | ||
| - list | ||
| - patch | ||
| - update | ||
| - watch | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - services/status | ||
| verbs: | ||
| - list | ||
| - patch | ||
| - update | ||
| - watch | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - serviceaccounts | ||
| verbs: | ||
| - create | ||
| - get | ||
| - list | ||
| - watch | ||
| - update | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - persistentvolumes | ||
| verbs: | ||
| - get | ||
| - list | ||
| - update | ||
| - watch | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - endpoints | ||
| verbs: | ||
| - create | ||
| - get | ||
| - list | ||
| - watch | ||
| - update | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - secrets | ||
| verbs: | ||
| - get | ||
| - list | ||
| - watch | ||
| - apiGroups: | ||
| - coordination.k8s.io | ||
| resources: | ||
| - leases | ||
| verbs: | ||
| - get | ||
| - create | ||
| - update | ||
| --- | ||
| kind: ClusterRoleBinding | ||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
| metadata: | ||
| name: system:cloud-controller-manager | ||
| roleRef: | ||
| apiGroup: rbac.authorization.k8s.io | ||
| kind: ClusterRole | ||
| name: system:cloud-controller-manager | ||
| subjects: | ||
| - kind: ServiceAccount | ||
| name: cloud-controller-manager | ||
| namespace: kube-system | ||
| - kind: User | ||
| name: cloud-controller-manager | ||
| --- | ||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
| kind: RoleBinding | ||
| metadata: | ||
| name: system:cloud-controller-manager:extension-apiserver-authentication-reader | ||
| namespace: kube-system | ||
| roleRef: | ||
| apiGroup: rbac.authorization.k8s.io | ||
| kind: Role | ||
| name: extension-apiserver-authentication-reader | ||
| subjects: | ||
| - kind: ServiceAccount | ||
| name: cloud-controller-manager | ||
| namespace: kube-system | ||
| - apiGroup: "" | ||
| kind: User | ||
| name: cloud-controller-manager | ||
| --- | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| metadata: | ||
| name: cloud-controller-manager | ||
| namespace: kube-system | ||
| labels: | ||
| component: cloud-controller-manager | ||
| spec: | ||
| selector: | ||
| matchLabels: | ||
| tier: control-plane | ||
| component: cloud-controller-manager | ||
| replicas: 1 | ||
| template: | ||
| metadata: | ||
| labels: | ||
| component: cloud-controller-manager | ||
| tier: control-plane | ||
| spec: | ||
| priorityClassName: system-node-critical | ||
| hostNetwork: true | ||
| nodeSelector: | ||
| node-role.kubernetes.io/master: "" | ||
| serviceAccountName: cloud-controller-manager | ||
| tolerations: | ||
| - key: node-role.kubernetes.io/master | ||
| effect: NoSchedule | ||
| containers: | ||
| - name: cloud-controller-manager | ||
| image: ${AZURE_CLOUD_CONTROLLER_MANAGER_IMG:=mcr.microsoft.com/oss/kubernetes/azure-cloud-controller-manager:v1.1.5} | ||
| imagePullPolicy: IfNotPresent | ||
| command: ["cloud-controller-manager"] | ||
| args: | ||
| - "--allocate-node-cidrs=true" | ||
| - "--cloud-config=/etc/kubernetes/azure.json" | ||
| - "--cloud-provider=azure" | ||
| - "--cluster-cidr=2001:1234:5678:9a40::/58" | ||
| - "--bind-address=::" | ||
| - "--cluster-name=${CLUSTER_NAME}" | ||
| - "--controllers=*,-cloud-node" # disable cloud-node controller | ||
| - "--configure-cloud-routes=true" # "false" for Azure CNI and "true" for other network plugins | ||
| - "--leader-elect=true" | ||
| - "--node-cidr-mask-size=0" | ||
| - "--route-reconciliation-period=10s" | ||
| - "--v=2" | ||
| - "--port=10267" | ||
| resources: | ||
| requests: | ||
| cpu: 100m | ||
| memory: 128Mi | ||
| limits: | ||
| cpu: "4" | ||
| memory: 2Gi | ||
| livenessProbe: | ||
| httpGet: | ||
| path: /healthz | ||
| port: 10267 | ||
| initialDelaySeconds: 20 | ||
| periodSeconds: 10 | ||
| timeoutSeconds: 5 | ||
| volumeMounts: | ||
| - name: etc-kubernetes | ||
| mountPath: /etc/kubernetes | ||
| - name: etc-ssl | ||
| mountPath: /etc/ssl | ||
| readOnly: true | ||
| - name: msi | ||
| mountPath: /var/lib/waagent/ManagedIdentity-Settings | ||
| readOnly: true | ||
| volumes: | ||
| - name: etc-kubernetes | ||
| hostPath: | ||
| path: /etc/kubernetes | ||
| - name: etc-ssl | ||
| hostPath: | ||
| path: /etc/ssl | ||
| - name: msi | ||
| hostPath: | ||
| path: /var/lib/waagent/ManagedIdentity-Settings |
File renamed without changes.
4 changes: 0 additions & 4 deletions
4
...xternal-cloud-provider/kustomization.yaml → ...ud-provider-azure-ipv6/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| apiVersion: addons.cluster.x-k8s.io/v1beta1 | ||
| kind: ClusterResourceSet | ||
| metadata: | ||
| name: crs-ccm | ||
| namespace: default | ||
| spec: | ||
| strategy: "ApplyOnce" | ||
| clusterSelector: | ||
| matchLabels: | ||
| ccm: external | ||
| resources: | ||
| - name: cloud-controller-manager-addon | ||
| kind: ConfigMap | ||
| --- | ||
| apiVersion: addons.cluster.x-k8s.io/v1beta1 | ||
| kind: ClusterResourceSet | ||
| metadata: | ||
| name: crs-node-manager | ||
| namespace: default | ||
| spec: | ||
| strategy: "ApplyOnce" | ||
| clusterSelector: | ||
| matchLabels: | ||
| ccm: external | ||
| resources: | ||
| - name: cloud-node-manager-addon | ||
| kind: ConfigMap |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
in addition to in-tree tests relying on this script, there are also conformance jobs running with in-tree, eg. https://testgrid.k8s.io/provider-azure-1.23-signal#capz-conformance which run
/scripts/ci-conformance.sh, and there are presubmit jobs that rely on the custom builds templates to build and install a custom version on k8s.It might be worth doing a full audit of cloud-provider azure in tree/ out of tree jobs that rely on CAPZ to make sure all template references are covered.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for that call-out. I wonder if something as simple as this would work.
Changes to capz:
Changes to test-infra specs:
(We would also make the same env var addition to the remaining "release-*" test-infra test specs under
config/jobs/kubernetes/sig-cloud-provider/azure/)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
O.K., this change was made. Here's the test-infra equivalent that we'll want to land as part of this effort:
kubernetes/test-infra#25598