forked from kubernetes/cloud-provider-gcp
-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6 from openshift-cloud-team/rebase-bot-master
Merge https://github.com/kubernetes/cloud-provider-gcp:master into master
- Loading branch information
Showing
2,727 changed files
with
395,891 additions
and
238,705 deletions.
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
125 changes: 121 additions & 4 deletions
125
cluster/addons/calico-policy-controller/bgpconfigurations-crd.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 |
|---|---|---|
| @@ -1,14 +1,131 @@ | ||
| apiVersion: apiextensions.k8s.io/v1beta1 | ||
| apiVersion: apiextensions.k8s.io/v1 | ||
| kind: CustomResourceDefinition | ||
| metadata: | ||
| name: bgpconfigurations.crd.projectcalico.org | ||
| labels: | ||
| addonmanager.kubernetes.io/mode: Reconcile | ||
| name: bgpconfigurations.crd.projectcalico.org | ||
| spec: | ||
| scope: Cluster | ||
| group: crd.projectcalico.org | ||
| version: v1 | ||
| names: | ||
| kind: BGPConfiguration | ||
| listKind: BGPConfigurationList | ||
| plural: bgpconfigurations | ||
| singular: bgpconfiguration | ||
| scope: Cluster | ||
| versions: | ||
| - name: v1 | ||
| schema: | ||
| openAPIV3Schema: | ||
| description: BGPConfiguration contains the configuration for any BGP routing. | ||
| properties: | ||
| apiVersion: | ||
| description: 'APIVersion defines the versioned schema of this representation | ||
| of an object. Servers should convert recognized schemas to the latest | ||
| internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' | ||
| type: string | ||
| kind: | ||
| description: 'Kind is a string value representing the REST resource this | ||
| object represents. Servers may infer this from the endpoint the client | ||
| submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' | ||
| type: string | ||
| metadata: | ||
| type: object | ||
| spec: | ||
| description: BGPConfigurationSpec contains the values of the BGP configuration. | ||
| properties: | ||
| asNumber: | ||
| description: 'ASNumber is the default AS number used by a node. [Default: | ||
| 64512]' | ||
| format: int32 | ||
| type: integer | ||
| communities: | ||
| description: Communities is a list of BGP community values and their | ||
| arbitrary names for tagging routes. | ||
| items: | ||
| description: Community contains standard or large community value | ||
| and its name. | ||
| properties: | ||
| name: | ||
| description: Name given to community value. | ||
| type: string | ||
| value: | ||
| description: Value must be of format `aa:nn` or `aa:nn:mm`. | ||
| For standard community use `aa:nn` format, where `aa` and | ||
| `nn` are 16 bit number. For large community use `aa:nn:mm` | ||
| format, where `aa`, `nn` and `mm` are 32 bit number. Where, | ||
| `aa` is an AS Number, `nn` and `mm` are per-AS identifier. | ||
| pattern: ^(\d+):(\d+)$|^(\d+):(\d+):(\d+)$ | ||
| type: string | ||
| type: object | ||
| type: array | ||
| listenPort: | ||
| description: ListenPort is the port where BGP protocol should listen. | ||
| Defaults to 179 | ||
| maximum: 65535 | ||
| minimum: 1 | ||
| type: integer | ||
| logSeverityScreen: | ||
| description: 'LogSeverityScreen is the log severity above which logs | ||
| are sent to the stdout. [Default: INFO]' | ||
| type: string | ||
| nodeToNodeMeshEnabled: | ||
| description: 'NodeToNodeMeshEnabled sets whether full node to node | ||
| BGP mesh is enabled. [Default: true]' | ||
| type: boolean | ||
| prefixAdvertisements: | ||
| description: PrefixAdvertisements contains per-prefix advertisement | ||
| configuration. | ||
| items: | ||
| description: PrefixAdvertisement configures advertisement properties | ||
| for the specified CIDR. | ||
| properties: | ||
| cidr: | ||
| description: CIDR for which properties should be advertised. | ||
| type: string | ||
| communities: | ||
| description: Communities can be list of either community names | ||
| already defined in `Specs.Communities` or community value | ||
| of format `aa:nn` or `aa:nn:mm`. For standard community use | ||
| `aa:nn` format, where `aa` and `nn` are 16 bit number. For | ||
| large community use `aa:nn:mm` format, where `aa`, `nn` and | ||
| `mm` are 32 bit number. Where,`aa` is an AS Number, `nn` and | ||
| `mm` are per-AS identifier. | ||
| items: | ||
| type: string | ||
| type: array | ||
| type: object | ||
| type: array | ||
| serviceClusterIPs: | ||
| description: ServiceClusterIPs are the CIDR blocks from which service | ||
| cluster IPs are allocated. If specified, Calico will advertise these | ||
| blocks, as well as any cluster IPs within them. | ||
| items: | ||
| description: ServiceClusterIPBlock represents a single allowed ClusterIP | ||
| CIDR block. | ||
| properties: | ||
| cidr: | ||
| type: string | ||
| type: object | ||
| type: array | ||
| serviceExternalIPs: | ||
| description: ServiceExternalIPs are the CIDR blocks for Kubernetes | ||
| Service External IPs. Kubernetes Service ExternalIPs will only be | ||
| advertised if they are within one of these blocks. | ||
| items: | ||
| description: ServiceExternalIPBlock represents a single allowed | ||
| External IP CIDR block. | ||
| properties: | ||
| cidr: | ||
| type: string | ||
| type: object | ||
| type: array | ||
| type: object | ||
| type: object | ||
| served: true | ||
| storage: true | ||
| status: | ||
| acceptedNames: | ||
| kind: "" | ||
| plural: "" | ||
| conditions: [] | ||
| storedVersions: [] |
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 |
|---|---|---|
| @@ -1,14 +1,105 @@ | ||
| apiVersion: apiextensions.k8s.io/v1beta1 | ||
| apiVersion: apiextensions.k8s.io/v1 | ||
| kind: CustomResourceDefinition | ||
| metadata: | ||
| name: bgppeers.crd.projectcalico.org | ||
| labels: | ||
| addonmanager.kubernetes.io/mode: Reconcile | ||
| name: bgppeers.crd.projectcalico.org | ||
| spec: | ||
| scope: Cluster | ||
| group: crd.projectcalico.org | ||
| version: v1 | ||
| names: | ||
| kind: BGPPeer | ||
| listKind: BGPPeerList | ||
| plural: bgppeers | ||
| singular: bgppeer | ||
| scope: Cluster | ||
| versions: | ||
| - name: v1 | ||
| schema: | ||
| openAPIV3Schema: | ||
| properties: | ||
| apiVersion: | ||
| description: 'APIVersion defines the versioned schema of this representation | ||
| of an object. Servers should convert recognized schemas to the latest | ||
| internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' | ||
| type: string | ||
| kind: | ||
| description: 'Kind is a string value representing the REST resource this | ||
| object represents. Servers may infer this from the endpoint the client | ||
| submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' | ||
| type: string | ||
| metadata: | ||
| type: object | ||
| spec: | ||
| description: BGPPeerSpec contains the specification for a BGPPeer resource. | ||
| properties: | ||
| asNumber: | ||
| description: The AS Number of the peer. | ||
| format: int32 | ||
| type: integer | ||
| keepOriginalNextHop: | ||
| description: Option to keep the original nexthop field when routes | ||
| are sent to a BGP Peer. Setting "true" configures the selected BGP | ||
| Peers node to use the "next hop keep;" instead of "next hop self;"(default) | ||
| in the specific branch of the Node on "bird.cfg". | ||
| type: boolean | ||
| node: | ||
| description: The node name identifying the Calico node instance that | ||
| is peering with this peer. If this is not set, this represents a | ||
| global peer, i.e. a peer that peers with every node in the deployment. | ||
| type: string | ||
| nodeSelector: | ||
| description: Selector for the nodes that should have this peering. When | ||
| this is set, the Node field must be empty. | ||
| type: string | ||
| password: | ||
| description: Optional BGP password for the peerings generated by this | ||
| BGPPeer resource. | ||
| properties: | ||
| secretKeyRef: | ||
| description: Selects a key of a secret in the node pod's namespace. | ||
| properties: | ||
| key: | ||
| description: The key of the secret to select from. Must be | ||
| a valid secret key. | ||
| type: string | ||
| name: | ||
| description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names | ||
| TODO: Add other useful fields. apiVersion, kind, uid?' | ||
| type: string | ||
| optional: | ||
| description: Specify whether the Secret or its key must be | ||
| defined | ||
| type: boolean | ||
| required: | ||
| - key | ||
| type: object | ||
| type: object | ||
| peerIP: | ||
| description: The IP address of the peer followed by an optional port | ||
| number to peer with. If port number is given, format should be `[<IPv6>]:port` | ||
| or `<IPv4>:<port>` for IPv4. If optional port number is not set, | ||
| and this peer IP and ASNumber belongs to a calico/node with ListenPort | ||
| set in BGPConfiguration, then we use that port to peer. | ||
| type: string | ||
| peerSelector: | ||
| description: Selector for the remote nodes to peer with. When this | ||
| is set, the PeerIP and ASNumber fields must be empty. For each | ||
| peering between the local node and selected remote nodes, we configure | ||
| an IPv4 peering if both ends have NodeBGPSpec.IPv4Address specified, | ||
| and an IPv6 peering if both ends have NodeBGPSpec.IPv6Address specified. The | ||
| remote AS number comes from the remote node’s NodeBGPSpec.ASNumber, | ||
| or the global default if that is not set. | ||
| type: string | ||
| required: | ||
| - asNumber | ||
| - peerIP | ||
| type: object | ||
| type: object | ||
| served: true | ||
| storage: true | ||
| status: | ||
| acceptedNames: | ||
| kind: "" | ||
| plural: "" | ||
| conditions: [] | ||
| storedVersions: [] |
54 changes: 50 additions & 4 deletions
54
cluster/addons/calico-policy-controller/blockaffinity-crd.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 |
|---|---|---|
| @@ -1,14 +1,60 @@ | ||
| apiVersion: apiextensions.k8s.io/v1beta1 | ||
| apiVersion: apiextensions.k8s.io/v1 | ||
| kind: CustomResourceDefinition | ||
| metadata: | ||
| name: blockaffinities.crd.projectcalico.org | ||
| labels: | ||
| addonmanager.kubernetes.io/mode: Reconcile | ||
| name: blockaffinities.crd.projectcalico.org | ||
| spec: | ||
| scope: Cluster | ||
| group: crd.projectcalico.org | ||
| version: v1 | ||
| names: | ||
| kind: BlockAffinity | ||
| listKind: BlockAffinityList | ||
| plural: blockaffinities | ||
| singular: blockaffinity | ||
| scope: Cluster | ||
| versions: | ||
| - name: v1 | ||
| schema: | ||
| openAPIV3Schema: | ||
| properties: | ||
| apiVersion: | ||
| description: 'APIVersion defines the versioned schema of this representation | ||
| of an object. Servers should convert recognized schemas to the latest | ||
| internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' | ||
| type: string | ||
| kind: | ||
| description: 'Kind is a string value representing the REST resource this | ||
| object represents. Servers may infer this from the endpoint the client | ||
| submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' | ||
| type: string | ||
| metadata: | ||
| type: object | ||
| spec: | ||
| description: BlockAffinitySpec contains the specification for a BlockAffinity | ||
| resource. | ||
| properties: | ||
| cidr: | ||
| type: string | ||
| deleted: | ||
| description: Deleted indicates that this block affinity is being deleted. | ||
| This field is a string for compatibility with older releases that | ||
| mistakenly treat this field as a string. | ||
| type: string | ||
| node: | ||
| type: string | ||
| state: | ||
| type: string | ||
| required: | ||
| - cidr | ||
| - node | ||
| - state | ||
| type: object | ||
| type: object | ||
| served: true | ||
| storage: true | ||
| status: | ||
| acceptedNames: | ||
| kind: "" | ||
| plural: "" | ||
| conditions: [] | ||
| storedVersions: [] |
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
Oops, something went wrong.