From c7f833c9af51f9d4bac85f7b3fbe866fe042a1d2 Mon Sep 17 00:00:00 2001 From: Kraig Amador Date: Wed, 11 Jul 2018 19:35:18 -0700 Subject: [PATCH] 1.0-beta.3 --- BUILDING.md | 2 +- Makefile | 2 +- README.md | 2 +- alb-ingress-controller-helm/Chart.yaml | 2 +- alb-ingress-controller-helm/README.md | 57 +++++++++++++------------ alb-ingress-controller-helm/values.yaml | 2 +- examples/alb-ingress-controller.yaml | 2 +- 7 files changed, 35 insertions(+), 34 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index 9630c9dbd..b0f410a32 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -18,7 +18,7 @@ $ make clean; make ``` $ docker images | grep -i alb-ingress-controller -quay.io/coreos/alb-ingress-controller 1.0-beta.2 78f356144e33 20 minutes ago 47.4MB +quay.io/coreos/alb-ingress-controller 1.0-beta.3 78f356144e33 20 minutes ago 47.4MB ``` > 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`. diff --git a/Makefile b/Makefile index 625337e64..f871c8f7a 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ all: container -TAG?=1.0-beta.2 +TAG?=1.0-beta.3 BUILD=$(shell git log --pretty=format:'%h' -n 1) PREFIX?=quay.io/coreos/alb-ingress-controller ARCH?=amd64 diff --git a/README.md b/README.md index f8612e2be..4db190410 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ # AWS ALB Ingress Controller -**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. +**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. 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). diff --git a/alb-ingress-controller-helm/Chart.yaml b/alb-ingress-controller-helm/Chart.yaml index 01e008f44..e2c7e24fd 100644 --- a/alb-ingress-controller-helm/Chart.yaml +++ b/alb-ingress-controller-helm/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 0.8 +appVersion: 1.0-beta.3 description: The ALB Ingress Controller satisfies Kubernetes ingress resources by provisioning Application Load Balancers. engine: gotpl home: https://github.com/kubernetes-sigs/aws-alb-ingress-controller diff --git a/alb-ingress-controller-helm/README.md b/alb-ingress-controller-helm/README.md index e4301a546..a80687c16 100644 --- a/alb-ingress-controller-helm/README.md +++ b/alb-ingress-controller-helm/README.md @@ -13,8 +13,9 @@ $ helm registry install quay.io/coreos/alb-ingress-controller-helm This chart bootstraps an alb-ingress-controller deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. ## Prerequisites - - Kubernetes 1.4+ with Beta APIs enabled - - [Helm Registry plugin](https://github.com/app-registry/helm-plugin) + +- Kubernetes 1.4+ with Beta APIs enabled +- [Helm Registry plugin](https://github.com/app-registry/helm-plugin) ## Installing the Chart @@ -42,32 +43,32 @@ The command removes all the Kubernetes components associated with the chart and The following tables lists the configurable parameters of the alb-ingress-controller chart and their default values. -Parameter | Description | Default ---- | --- | --- -`awsRegion` | (REQUIRED) AWS region in which this ingress controller will operate | `us-west-1` -`clusterName` | (REQUIRED) Resources created by the ALB Ingress controller will be prefixed with this string | `k8s` -`controller.image.repository` | controller container image repository | `quay.io/coreos/alb-ingress-controller` -`controller.image.tag` | controller container image tag | `0.8` -`controller.image.pullPolicy` | controller container image pull policy | `IfNotPresent` -`controller.extraEnv` | map of environment variables to be injected into the controller pod | `{}` -`controller.nodeSelector` | node labels for controller pod assignment | `{}` -`controller.tolerations` | controller pod toleration for taints | `{}` -`controller.podAnnotations` | annotations to be added to controller pod | `{}` -`controller.resources` | controller pod resource requests & limits | `{}` -`controller.service.annotations` | annotations to be added to controller service | `{}` -`defaultBackend.image.repository` | default backend container image repository | `gcr.io/google_containers/defaultbackend` -`defaultBackend.image.tag` | default backend container image tag | `1.2` -`defaultBackend.image.pullPolicy` | default backend container image pull policy | `IfNotPresent` -`defaultBackend.nodeSelector` | node labels for default backend pod assignment | `{}` -`defaultBackend.podAnnotations` | annotations to be added to default backend pod | `{}` -`defaultBackend.replicaCount` | desired number of default backend pods | `1` -`defaultBackend.resources` | default backend pod resource requests & limits | `{}` -`defaultBackend.service.annotations` | annotations to be added to default backend service | `{}` -`rbac.create` | If true, create & use RBAC resources | `true` -`rbac.serviceAccountName` | ServiceAccount ALB ingress controller will use (ignored if rbac.create=true) | `default` -`scope.ingressClass` | If provided, the ALB ingress controller will only act on Ingress resources annotated with this class | `alb` -`scope.singleNamespace` | If true, the ALB ingress controller will only act on Ingress resources in a single namespace | `false` (watch all namespaces) -`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) +| Parameter | Description | Default | +| ------------------------------------ | -------------------------------------------------------------------------------------------------------------- | ---------------------------------------------- | +| `awsRegion` | (REQUIRED) AWS region in which this ingress controller will operate | `us-west-1` | +| `clusterName` | (REQUIRED) Resources created by the ALB Ingress controller will be prefixed with this string | `k8s` | +| `controller.image.repository` | controller container image repository | `quay.io/coreos/alb-ingress-controller` | +| `controller.image.tag` | controller container image tag | `1.0-beta.3` | +| `controller.image.pullPolicy` | controller container image pull policy | `IfNotPresent` | +| `controller.extraEnv` | map of environment variables to be injected into the controller pod | `{}` | +| `controller.nodeSelector` | node labels for controller pod assignment | `{}` | +| `controller.tolerations` | controller pod toleration for taints | `{}` | +| `controller.podAnnotations` | annotations to be added to controller pod | `{}` | +| `controller.resources` | controller pod resource requests & limits | `{}` | +| `controller.service.annotations` | annotations to be added to controller service | `{}` | +| `defaultBackend.image.repository` | default backend container image repository | `gcr.io/google_containers/defaultbackend` | +| `defaultBackend.image.tag` | default backend container image tag | `1.2` | +| `defaultBackend.image.pullPolicy` | default backend container image pull policy | `IfNotPresent` | +| `defaultBackend.nodeSelector` | node labels for default backend pod assignment | `{}` | +| `defaultBackend.podAnnotations` | annotations to be added to default backend pod | `{}` | +| `defaultBackend.replicaCount` | desired number of default backend pods | `1` | +| `defaultBackend.resources` | default backend pod resource requests & limits | `{}` | +| `defaultBackend.service.annotations` | annotations to be added to default backend service | `{}` | +| `rbac.create` | If true, create & use RBAC resources | `true` | +| `rbac.serviceAccountName` | ServiceAccount ALB ingress controller will use (ignored if rbac.create=true) | `default` | +| `scope.ingressClass` | If provided, the ALB ingress controller will only act on Ingress resources annotated with this class | `alb` | +| `scope.singleNamespace` | If true, the ALB ingress controller will only act on Ingress resources in a single namespace | `false` (watch all namespaces) | +| `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) | ```console $ helm registry install quay.io/coreos/alb-ingress-controller-helm --name=my-release --set clusterName=mycluster diff --git a/alb-ingress-controller-helm/values.yaml b/alb-ingress-controller-helm/values.yaml index 74c6099ee..e2910d68d 100644 --- a/alb-ingress-controller-helm/values.yaml +++ b/alb-ingress-controller-helm/values.yaml @@ -17,7 +17,7 @@ clusterName: k8s controller: image: repository: quay.io/coreos/alb-ingress-controller - tag: "1.0-beta.2" + tag: "1.0-beta.3" pullPolicy: IfNotPresent extraEnv: {} diff --git a/examples/alb-ingress-controller.yaml b/examples/alb-ingress-controller.yaml index 28b8a9831..ab20fb6f6 100644 --- a/examples/alb-ingress-controller.yaml +++ b/examples/alb-ingress-controller.yaml @@ -85,7 +85,7 @@ spec: apiVersion: v1 fieldPath: metadata.namespace # Repository location of the ALB Ingress Controller. - image: quay.io/coreos/alb-ingress-controller:1.0-beta.2 + image: quay.io/coreos/alb-ingress-controller:1.0-beta.3 imagePullPolicy: Always name: server resources: {}