Skip to content

Commit 47faafa

Browse files
bigkraigbigkraig
authored
Merge pull request #452 from kubernetes-sigs/1.0-beta.3
1.0-beta.3
2 parents 7f5b01d + 1196c14 commit 47faafa

File tree

7 files changed

+35
-34
lines changed

7 files changed

+35
-34
lines changed

‎BUILDING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ $ make clean; make
1818
```
1919
$ docker images | grep -i alb-ingress-controller
2020
21-
quay.io/coreos/alb-ingress-controller 1.0-beta.2 78f356144e33 20 minutes ago 47.4MB
21+
quay.io/coreos/alb-ingress-controller 1.0-beta.3 78f356144e33 20 minutes ago 47.4MB
2222
```
2323

2424
> Version can vary based on what's in the Makefile. If you wish to push to your own repo for testing, you can change the version and repo details in the Makefile then do a `docker push`.

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
all: container
2121

22-
TAG?=1.0-beta.2
22+
TAG?=1.0-beta.3
2323
BUILD=$(shell git log --pretty=format:'%h' -n 1)
2424
PREFIX?=quay.io/coreos/alb-ingress-controller
2525
ARCH?=amd64

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
# AWS ALB Ingress Controller
77

8-
**NOTE:** This controller is in beta state as we attempt to move to our first 1.0 release. The current image version is `1.0-beta.2`. Please file any issues you find and note the version used.
8+
**NOTE:** This controller is in beta state as we attempt to move to our first 1.0 release. The current image version is `1.0-beta.3`. Please file any issues you find and note the version used.
99

1010
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).
1111

‎alb-ingress-controller-helm/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: v1
2-
appVersion: 0.8
2+
appVersion: 1.0-beta.3
33
description: The ALB Ingress Controller satisfies Kubernetes ingress resources by provisioning Application Load Balancers.
44
engine: gotpl
55
home: https://github.com/kubernetes-sigs/aws-alb-ingress-controller

‎alb-ingress-controller-helm/README.md

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ $ helm registry install quay.io/coreos/alb-ingress-controller-helm
1313
This chart bootstraps an alb-ingress-controller deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
1414

1515
## Prerequisites
16-
- Kubernetes 1.4+ with Beta APIs enabled
17-
- [Helm Registry plugin](https://github.com/app-registry/helm-plugin)
16+
17+
- Kubernetes 1.4+ with Beta APIs enabled
18+
- [Helm Registry plugin](https://github.com/app-registry/helm-plugin)
1819

1920
## Installing the Chart
2021

@@ -42,32 +43,32 @@ The command removes all the Kubernetes components associated with the chart and
4243

4344
The following tables lists the configurable parameters of the alb-ingress-controller chart and their default values.
4445

45-
Parameter | Description | Default
46-
--- | --- | ---
47-
`awsRegion` | (REQUIRED) AWS region in which this ingress controller will operate | `us-west-1`
48-
`clusterName` | (REQUIRED) Resources created by the ALB Ingress controller will be prefixed with this string | `k8s`
49-
`controller.image.repository` | controller container image repository | `quay.io/coreos/alb-ingress-controller`
50-
`controller.image.tag` | controller container image tag | `0.8`
51-
`controller.image.pullPolicy` | controller container image pull policy | `IfNotPresent`
52-
`controller.extraEnv` | map of environment variables to be injected into the controller pod | `{}`
53-
`controller.nodeSelector` | node labels for controller pod assignment | `{}`
54-
`controller.tolerations` | controller pod toleration for taints | `{}`
55-
`controller.podAnnotations` | annotations to be added to controller pod | `{}`
56-
`controller.resources` | controller pod resource requests & limits | `{}`
57-
`controller.service.annotations` | annotations to be added to controller service | `{}`
58-
`defaultBackend.image.repository` | default backend container image repository | `gcr.io/google_containers/defaultbackend`
59-
`defaultBackend.image.tag` | default backend container image tag | `1.2`
60-
`defaultBackend.image.pullPolicy` | default backend container image pull policy | `IfNotPresent`
61-
`defaultBackend.nodeSelector` | node labels for default backend pod assignment | `{}`
62-
`defaultBackend.podAnnotations` | annotations to be added to default backend pod | `{}`
63-
`defaultBackend.replicaCount` | desired number of default backend pods | `1`
64-
`defaultBackend.resources` | default backend pod resource requests & limits | `{}`
65-
`defaultBackend.service.annotations` | annotations to be added to default backend service | `{}`
66-
`rbac.create` | If true, create & use RBAC resources | `true`
67-
`rbac.serviceAccountName` | ServiceAccount ALB ingress controller will use (ignored if rbac.create=true) | `default`
68-
`scope.ingressClass` | If provided, the ALB ingress controller will only act on Ingress resources annotated with this class | `alb`
69-
`scope.singleNamespace` | If true, the ALB ingress controller will only act on Ingress resources in a single namespace | `false` (watch all namespaces)
70-
`scope.watchNamespace` | If scope.singleNamespace=true, the ALB ingress controller will only act on Ingress resources in this namespace | `""` (namespace of the ALB ingress controller)
46+
| Parameter | Description | Default |
47+
| ------------------------------------ | -------------------------------------------------------------------------------------------------------------- | ---------------------------------------------- |
48+
| `awsRegion` | (REQUIRED) AWS region in which this ingress controller will operate | `us-west-1` |
49+
| `clusterName` | (REQUIRED) Resources created by the ALB Ingress controller will be prefixed with this string | `k8s` |
50+
| `controller.image.repository` | controller container image repository | `quay.io/coreos/alb-ingress-controller` |
51+
| `controller.image.tag` | controller container image tag | `1.0-beta.3` |
52+
| `controller.image.pullPolicy` | controller container image pull policy | `IfNotPresent` |
53+
| `controller.extraEnv` | map of environment variables to be injected into the controller pod | `{}` |
54+
| `controller.nodeSelector` | node labels for controller pod assignment | `{}` |
55+
| `controller.tolerations` | controller pod toleration for taints | `{}` |
56+
| `controller.podAnnotations` | annotations to be added to controller pod | `{}` |
57+
| `controller.resources` | controller pod resource requests & limits | `{}` |
58+
| `controller.service.annotations` | annotations to be added to controller service | `{}` |
59+
| `defaultBackend.image.repository` | default backend container image repository | `gcr.io/google_containers/defaultbackend` |
60+
| `defaultBackend.image.tag` | default backend container image tag | `1.2` |
61+
| `defaultBackend.image.pullPolicy` | default backend container image pull policy | `IfNotPresent` |
62+
| `defaultBackend.nodeSelector` | node labels for default backend pod assignment | `{}` |
63+
| `defaultBackend.podAnnotations` | annotations to be added to default backend pod | `{}` |
64+
| `defaultBackend.replicaCount` | desired number of default backend pods | `1` |
65+
| `defaultBackend.resources` | default backend pod resource requests & limits | `{}` |
66+
| `defaultBackend.service.annotations` | annotations to be added to default backend service | `{}` |
67+
| `rbac.create` | If true, create & use RBAC resources | `true` |
68+
| `rbac.serviceAccountName` | ServiceAccount ALB ingress controller will use (ignored if rbac.create=true) | `default` |
69+
| `scope.ingressClass` | If provided, the ALB ingress controller will only act on Ingress resources annotated with this class | `alb` |
70+
| `scope.singleNamespace` | If true, the ALB ingress controller will only act on Ingress resources in a single namespace | `false` (watch all namespaces) |
71+
| `scope.watchNamespace` | If scope.singleNamespace=true, the ALB ingress controller will only act on Ingress resources in this namespace | `""` (namespace of the ALB ingress controller) |
7172

7273
```console
7374
$ helm registry install quay.io/coreos/alb-ingress-controller-helm --name=my-release --set clusterName=mycluster

‎alb-ingress-controller-helm/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ clusterName: k8s
1717
controller:
1818
image:
1919
repository: quay.io/coreos/alb-ingress-controller
20-
tag: "1.0-beta.2"
20+
tag: "1.0-beta.3"
2121
pullPolicy: IfNotPresent
2222

2323
extraEnv: {}

‎examples/alb-ingress-controller.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ spec:
8585
apiVersion: v1
8686
fieldPath: metadata.namespace
8787
# Repository location of the ALB Ingress Controller.
88-
image: quay.io/coreos/alb-ingress-controller:1.0-beta.2
88+
image: quay.io/coreos/alb-ingress-controller:1.0-beta.3
8989
imagePullPolicy: Always
9090
name: server
9191
resources: {}

0 commit comments

Comments
 (0)