Skip to content

Commit 60a952f

Browse files
resolvign conflict?
1 parent 025d0fb commit 60a952f

File tree

2 files changed

+54
-52
lines changed

2 files changed

+54
-52
lines changed

README.md

Lines changed: 53 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,54 @@
1-
[![Coverage Status](https://coveralls.io/repos/github/kubernetes-sigs/aws-alb-ingress-controller/badge.svg?branch=master)](https://coveralls.io/github/kubernetes-sigs/aws-alb-ingress-controller?branch=master)
2-
[![Go Report Card](https://goreportcard.com/badge/github.com/kubernetes-sigs/aws-alb-ingress-controller)](https://goreportcard.com/report/github.com/kubernetes-sigs/aws-alb-ingress-controller)
3-
[![Build Status](https://travis-ci.org/kubernetes-sigs/aws-alb-ingress-controller.svg?branch=master)](https://travis-ci.org/kubernetes-sigs/aws-alb-ingress-controller)
4-
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bi.8713187.xyz%2Fcoreos%2Falb-ingress-controller.svg?type=shield)](https://app.fossa.io/projects/git%2Bi.8713187.xyz%2Fcoreos%2Falb-ingress-controller?ref=badge_shield)
1+
<p align="center">
2+
<img src="assets/images/kubernetes_icon.svg" alt="Kubernetes logo" width="200" />
3+
<img src="assets/images/aws_load_balancer_icon.svg" alt="AWS Load Balancer logo" width="200" />
4+
</p>
5+
<p align="center">
6+
<strong>
7+
A
8+
<a href="https://kubernetes.io/">Kubernetes </a>
9+
controller for
10+
<a href="https://aws.amazon.com/elasticloadbalancing/">Elastic Load Balancers</a>
11+
</strong>
12+
</p>
13+
<p align="center">
14+
<a href="https://github.com/kubernetes-sigs/aws-load-balancer-controller/issues">
15+
<img src="https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat" alt="contributions welcome"/>
16+
</a>
17+
<a href="https://github.com/kubernetes-sigs/aws-load-balancer-controller/issues">
18+
<img src="https://img.shields.io/github/issues-raw/kubernetes-sigs/aws-load-balancer-controller?style=flat" alt="github issues"/>
19+
</a>
20+
<img src="https://img.shields.io/badge/status-ga-brightgreen?style=flat" alt="status is ga"/>
21+
<img src="https://img.shields.io/github/license/kubernetes-sigs/aws-load-balancer-controller?style=flat" alt="apache license"/>
22+
</p>
23+
<p align="center">
24+
<a href="https://goreportcard.com/report/github.com/kubernetes-sigs/aws-load-balancer-controller">
25+
<img src="https://goreportcard.com/badge/github.com/kubernetes-sigs/aws-load-balancer-controller" alt="go report card"/>
26+
</a>
27+
<img src="https://img.shields.io/github/watchers/kubernetes-sigs/aws-load-balancer-controller?style=social" alt="github watchers"/>
28+
<img src="https://img.shields.io/github/stars/kubernetes-sigs/aws-load-balancer-controller?style=social" alt="github stars"/>
29+
<img src="https://img.shields.io/github/forks/kubernetes-sigs/aws-load-balancer-controller?style=social" alt="github forks"/>
30+
<a href="https://hub.docker.com/r/amazon/aws-alb-ingress-controller/">
31+
<img src="https://img.shields.io/docker/pulls/amazon/aws-alb-ingress-controller" alt="docker pulls"/>
32+
</a>
33+
</p>
34+
35+
36+
## AWS Load Balancer Controller
37+
38+
AWS Load Balancer Controller is a controller to help manage Elastic Load Balancers for a Kubernetes cluster.
39+
40+
- It satisfies Kubernetes [Ingress resources](https://kubernetes.io/docs/concepts/services-networking/ingress/) by provisioning [Application Load Balancers](https://docs.aws.amazon.com/elasticloadbalancing/latest/application/introduction.html).
41+
- It satisfies Kubernetes [Service resources](https://kubernetes.io/docs/concepts/services-networking/service/) by provisioning
42+
[Network Load Balancers](https://docs.aws.amazon.com/elasticloadbalancing/latest/network/introduction.html).
43+
44+
This project was formerly known as "AWS ALB Ingress Controller", we rebranded it to be "AWS Load Balancer Controller".
45+
46+
- AWS ALB Ingress Controller was originated by [Ticketmaster](https://github.com/ticketmaster) and [CoreOS](https://github.com/coreos) as part of Ticketmaster's move to AWS and CoreOS Tectonic. Learn more about Ticketmaster's Kubernetes initiative from Justin Dean's video at [Tectonic Summit](https://www.youtube.com/watch?v=wqXVKneP0Hg).
47+
48+
- AWS ALB Ingress Controller was donated to Kubernetes SIG-AWS to allow AWS, CoreOS, Ticketmaster and other SIG-AWS contributors to officially maintain the project. SIG-AWS reached this consensus on June 1, 2018.
49+
50+
51+
## Security disclosures
52+
53+
If you think you’ve found a potential security issue, please do not post it in the Issues. Instead, please follow the instructions [here](https://aws.amazon.com/security/vulnerability-reporting/) or [email AWS security directly](mailto:[email protected]).
554

6-
# AWS Load Balancer Controller
7-
We have rebranded "AWS ALB Ingress Controller" to be "AWS Load Balancer Controller" along with our v2.0.0 release.
8-
9-
"AWS ALB Ingress Controller" is now deprecated, we encourage users to migrate to "AWS Load Balancer Controller" by follow our [migration guide](https://kubernetes-sigs.github.io/aws-load-balancer-controller/v2.2/deploy/upgrade/migrate_v1_v2/).
10-
11-
# AWS ALB Ingress Controller
12-
13-
**NOTE:** The current image version is `v1.1.9`. Please file any issues you find and note the version used.
14-
15-
The AWS ALB Ingress Controller satisfies Kubernetes [ingress resources](https://kubernetes.io/docs/user-guide/ingress) by provisioning [Application Load Balancers](https://docs.aws.amazon.com/elasticloadbalancing/latest/application/introduction.html).
16-
17-
This project was originated by [Ticketmaster](https://github.com/ticketmaster) and [CoreOS](https://github.com/coreos) as part of Ticketmaster's move to AWS and CoreOS Tectonic. Learn more about Ticketmaster's Kubernetes initiative from Justin Dean's video at [Tectonic Summit](https://www.youtube.com/watch?v=wqXVKneP0Hg).
18-
19-
This project was donated to Kubernetes SIG-AWS to allow AWS, CoreOS, Ticketmaster and other SIG-AWS contributors to officially maintain the project. SIG-AWS reached this consensus on June 1, 2018.
20-
21-
## Documentation
22-
23-
Checkout our [Live Docs](https://kubernetes-sigs.github.io/aws-load-balancer-controller/v1.1/)!
24-
25-
## Getting started
26-
27-
To get started with the controller, see our [walkthrough](https://kubernetes-sigs.github.io/aws-load-balancer-controller/v1.1/guide/walkthrough/echoserver/).
28-
29-
## Setup
30-
- See [controller setup](https://kubernetes-sigs.github.io/aws-load-balancer-controller/v1.1/guide/controller/setup/) on how to install ALB ingress controller
31-
- See [external-dns setup](https://kubernetes-sigs.github.io/aws-load-balancer-controller/v1.1/guide/external-dns/setup/) for how to setup the external-dns to manage route 53 records.
32-
33-
## Building
34-
35-
For details on building this project, see our [building guide](https://kubernetes-sigs.github.io/aws-load-balancer-controller/v1.1/BUILDING/).
36-
37-
## Community, discussion, contribution, and support
38-
39-
Learn how to engage with the Kubernetes community on the [community page](http://kubernetes.io/community/).
40-
41-
You can reach the maintainers of this project at:
42-
43-
- [Slack channel](https://kubernetes.slack.com/messages/sig-aws)
44-
- [Mailing list](https://groups.google.com/forum/#!forum/kubernetes-sig-aws)
45-
46-
### Code of conduct
47-
48-
Participation in the Kubernetes community is governed by the [Kubernetes Code of Conduct](code-of-conduct.md).
49-
50-
## License
51-
52-
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bi.8713187.xyz%2Fcoreos%2Falb-ingress-controller.svg?type=large)](https://app.fossa.io/projects/git%2Bi.8713187.xyz%2Fcoreos%2Falb-ingress-controller?ref=badge_large)

mkdocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ repo_url: https://github.com/kubernetes-sigs/aws-alb-ingress-controller
44
strict: true
55

66
nav:
7-
- Home: README.md
7+
- Home: index.md
88
- Guide:
99
- Controller:
1010
- Installation: guide/controller/installation.md

0 commit comments

Comments
 (0)