Skip to content

Commit

Permalink
Merge pull request #11633 from tico88612/feat/remove-in-tree-cloud-pr…
Browse files Browse the repository at this point in the history
…ovider

Cleanup: remove in-tree cloud provider support
  • Loading branch information
k8s-ci-robot authored Nov 5, 2024
2 parents 25ca0ac + a070c72 commit 107c3cc
Show file tree
Hide file tree
Showing 46 changed files with 45 additions and 963 deletions.
7 changes: 2 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,9 @@ vagrant up
- [Fedora CoreOS bootstrap](docs/operating_systems/fcos.md)
- [openSUSE setup](docs/operating_systems/opensuse.md)
- [Downloaded artifacts](docs/advanced/downloads.md)
- [Cloud providers](docs/cloud_providers/cloud.md)
- [OpenStack](docs/cloud_providers/openstack.md)
- [AWS](docs/cloud_providers/aws.md)
- [Azure](docs/cloud_providers/azure.md)
- [vSphere](docs/cloud_providers/vsphere.md)
- [Equinix Metal](docs/cloud_providers/equinix-metal.md)
- [OpenStack](docs/cloud_controllers/openstack.md)
- [vSphere](docs/cloud_controllerss/vsphere.md)
- [Large deployments](docs/operations/large-deployments.md)
- [Adding/replacing a node](docs/operations/nodes.md)
- [Upgrades basics](docs/operations/upgrades.md)
Expand Down
2 changes: 1 addition & 1 deletion contrib/terraform/openstack/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@ Edit `inventory/$CLUSTER/group_vars/k8s_cluster/k8s_cluster.yml`:

- Set variable **kube_network_plugin** to your desired networking plugin.
- **flannel** works out-of-the-box
- **calico** requires [configuring OpenStack Neutron ports](/docs/cloud_providers/openstack.md) to allow service and pod subnets
- **calico** requires [configuring OpenStack Neutron ports](/docs/cloud_controllers/openstack.md) to allow service and pod subnets

```yml
# Choose network plugin (calico, weave or flannel)
Expand Down
5 changes: 3 additions & 2 deletions docs/_sidebar.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions docs/advanced/gcp-lb.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# GCP Load Balancers for type=LoadBalacer of Kubernetes Services

> **Removed**: Since v1.31 (the Kubespray counterpart is v2.27), Kubernetes no longer supports `cloud_provider`. (except external cloud provider)
Google Cloud Platform can be used for creation of Kubernetes Service Load Balancer.

This feature is able to deliver by adding parameters to `kube-controller-manager` and `kubelet`. You need specify:
Expand Down
3 changes: 1 addition & 2 deletions docs/ansible/vars.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@ following default cluster parameters:
* *enable_coredns_k8s_endpoint_pod_names* - If enabled, it configures endpoint_pod_names option for kubernetes plugin.
on the CoreDNS service.

* *cloud_provider* - Enable extra Kubelet option if operating inside GCE or
OpenStack (default is unset)
* *cloud_provider* - The provider for cloud services. (default is unset, Set to `external` for running with an external cloud provider)

* *kube_feature_gates* - A list of key=value pairs that describe feature gates for
alpha/experimental Kubernetes features. (defaults is `[]`).
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 2 additions & 0 deletions docs/cloud_providers/aws.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# AWS

> **Removed**: Since v1.31 (the Kubespray counterpart is v2.27), Kubernetes no longer supports `cloud_provider`. (except external cloud provider)
To deploy kubespray on [AWS](https://aws.amazon.com/) uncomment the `cloud_provider` option in `group_vars/all.yml` and set it to `'aws'`. Refer to the [Kubespray Configuration](#kubespray-configuration) for customizing the provider.

Prior to creating your instances, you **must** ensure that you have created IAM roles and policies for both "kubernetes-master" and "kubernetes-node". You can find the IAM policies [here](https://github.com/kubernetes-sigs/kubespray/tree/master/contrib/aws_iam/). See the [IAM Documentation](https://aws.amazon.com/documentation/iam/) if guidance is needed on how to set these up. When you bring your instances online, associate them with the respective IAM role. Nodes that are only to be used for Etcd do not need a role.
Expand Down
2 changes: 2 additions & 0 deletions docs/cloud_providers/azure.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Azure

> **Removed**: Since v1.31 (the Kubespray counterpart is v2.27), Kubernetes no longer supports `cloud_provider`. (except external cloud provider)
To deploy Kubernetes on [Azure](https://azure.microsoft.com) uncomment the `cloud_provider` option in `group_vars/all/all.yml` and set it to `'azure'`.

All your instances are required to run in a resource group and a routing table has to be attached to the subnet your instances are in.
Expand Down
2 changes: 2 additions & 0 deletions docs/cloud_providers/cloud.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Cloud providers

> **Removed**: Since v1.31 (the Kubespray counterpart is v2.27), Kubernetes no longer supports `cloud_provider`. (except external cloud provider)
## Provisioning

You can deploy instances in your cloud environment in several ways. Examples include Terraform, Ansible (ec2 and gce modules), and manual creation.
Expand Down
4 changes: 1 addition & 3 deletions inventory/sample/group_vars/all/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,7 @@ loadbalancer_apiserver_healthcheck_port: 8081

## There are some changes specific to the cloud providers
## for instance we need to encapsulate packets with some network plugins
## If set the possible values are either 'gce', 'aws', 'azure', 'openstack', 'vsphere', 'oci', or 'external'
## When openstack is used make sure to source in the openstack credentials
## like you would do when using openstack-client before starting the playbook.
## If set the possible values only 'external' after K8s v1.31.
# cloud_provider:

## When cloud_provider is set to 'external', you can set the cloud controller to deploy
Expand Down
6 changes: 1 addition & 5 deletions inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,7 @@ kube_proxy_nodeport_addresses: >-
{%- endif -%}
# If non-empty, will use this string as identification instead of the actual hostname
# kube_override_hostname: >-
# {%- if cloud_provider is defined and cloud_provider in ['aws'] -%}
# {%- else -%}
# {{ inventory_hostname }}
# {%- endif -%}
# kube_override_hostname: {{ inventory_hostname }}

## Encrypting Secret Data at Rest
kube_encrypt_secret_data: false
Expand Down
6 changes: 0 additions & 6 deletions roles/kubernetes-apps/cloud_controller/oci/defaults/main.yml

This file was deleted.

This file was deleted.

35 changes: 0 additions & 35 deletions roles/kubernetes-apps/cloud_controller/oci/tasks/main.yml

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 107c3cc

Please sign in to comment.