From d50dd633ae81cd12afe9200835eb59695c7ac95b Mon Sep 17 00:00:00 2001 From: Noah Krause Date: Fri, 12 Jun 2020 07:51:41 -0400 Subject: [PATCH] Add a feature flag to create the project registry Signed-off-by: Noah Krause --- CHANGELOG.md | 4 ++++ Chart.yaml | 2 +- README.md | 1 + templates/projects-rbac.yaml | 2 +- templates/projects.yaml | 3 ++- values.yaml | 6 ++++++ 6 files changed, 15 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2085745b7..affd3324d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ This file documents all notable changes to Ambassador Helm Chart. The release numbering uses [semantic versioning](http://semver.org). +## v6.4.4 + +- Feature flag for enabling or disabling the [`Project` registry](https://www.getambassador.io/docs/latest/topics/using/projects/) + ## v6.4.3 - Upgrade Ambassador to version 1.5.2: [CHANGELOG](https://github.com/datawire/ambassador/blob/master/CHANGELOG.md) diff --git a/Chart.yaml b/Chart.yaml index 05bf85f45..486988f4c 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -3,7 +3,7 @@ appVersion: 1.5.2 ossVersion: 1.5.2 description: A Helm chart for Datawire Ambassador name: ambassador -version: 6.4.3 +version: 6.4.4 icon: https://www.getambassador.io/images/logo.png home: https://www.getambassador.io/ sources: diff --git a/README.md b/README.md index 743cf0575..97e9e49c3 100755 --- a/README.md +++ b/README.md @@ -147,6 +147,7 @@ The following tables lists the configurable parameters of the Ambassador chart a | `authService.create` | Create the `AuthService` CRD for Ambassador Edge Stack | `true` | | `authService.optional_configurations` | Config options for the `AuthService` CRD | `""` | | `rateLimit.create` | Create the `RateLimit` CRD for Ambassador Edge Stack | `true` | +| `registry.create` | Create the `Project` registry. | `false` | | `autoscaling.enabled` | If true, creates Horizontal Pod Autoscaler | `false` | | `autoscaling.minReplicas` | If autoscaling enabled, this field sets minimum replica count | `2` | | `autoscaling.maxReplicas` | If autoscaling enabled, this field sets maximum replica count | `5` | diff --git a/templates/projects-rbac.yaml b/templates/projects-rbac.yaml index 3de0e62e7..58e07835a 100644 --- a/templates/projects-rbac.yaml +++ b/templates/projects-rbac.yaml @@ -1,4 +1,4 @@ -{{- if .Values.rbac.create -}} +{{- if and .Values.rbac.create .Values.registry.create -}} apiVersion: rbac.authorization.k8s.io/v1beta1 {{- if .Values.scope.singleNamespace }} kind: Role diff --git a/templates/projects.yaml b/templates/projects.yaml index e8c0f00ac..992d76d2f 100644 --- a/templates/projects.yaml +++ b/templates/projects.yaml @@ -1,3 +1,4 @@ +{{- if .Values.registry.create }} ###################################################################### # In-cluster Registry for Projects @@ -332,4 +333,4 @@ metadata: {{- end }} projects.getambassador.io/ambassador_id: {{ if hasKey .Values.env "AMBASSADOR_ID" }}{{ .Values.env.AMBASSADOR_ID | quote }}{{ else }}default{{ end }} product: aes - +{{- end }} \ No newline at end of file diff --git a/values.yaml b/values.yaml index 2e101e2d9..b388a72e0 100644 --- a/values.yaml +++ b/values.yaml @@ -358,6 +358,12 @@ authService: rateLimit: create: true +# Projects are a beta feature of Ambassador that allow developers to stage and +# deploy code with nothing more than a Github repository. +# See: https://www.getambassador.io/docs/latest/topics/using/projects/ +registry: + create: false + ################################################################################ ## DEPRECATED configuration objects ## ################################################################################