Update ambassador operator to v1.2.3

kubernetes · May 19, 2020 · f530121 · f530121
1 parent 2f1631a
commit f530121
Showing 1 changed file with 21 additions and 10 deletions.
diff --git a/addons/ambassador/ambassador-operator.yaml b/addons/ambassador/ambassador-operator.yaml
@@ -33,6 +33,10 @@ spec:
       description: Deployed version of Ambassador
       name: DEPLOYED-VERSION
       type: string
+    - JSONPath: .status.deployedRelease.flavor
+      description: Deployed flavor of Ambassador (OSS or AES)
+      name: DEPLOYED-FLAVOR
+      type: string
   group: getambassador.io
   names:
     kind: AmbassadorInstallation
@@ -69,14 +73,18 @@ spec:
             helmRepo:
               description: An (optional) Helm repository.
               type: string
-            helmValues:
-              additionalProperties:
-                type: string
-              description: An optional map of configurable parameters of the Ambassador
-                chart with some overridden values. Take a look at the [current list
-                of values](https://github.com/helm/charts/tree/master/stable/ambassador#configuration)
-                and their default values.
-              type: object
+            installOSS:
+              description: 'Installs [Ambassador OSS](https://www.getambassador.io/docs/latest/topics/install/install-ambassador-oss/)
+                instead of [AES](https://www.getambassador.io/docs/latest/topics/install/).
+                Default is false which means it installs AES by default. TODO: 1.
+                AES/AOSS is not installed and the user installs using `installOSS:
+                true`, then we straightaway install AOSS. 2. AOSS is installed via
+                operator and the user sets `installOSS: false`, then we perform the
+                migration as    detailed here - https://www.getambassador.io/docs/latest/topics/install/upgrade-to-edge-stack/
+                3. AES is installed and the user sets `installOSS: true`, then we
+                point users to the docs which gives them    pointers on how to do
+                that themselves.'
+              type: boolean
             logLevel:
               description: 'An (optional) log level: debug, info...'
               enum:
@@ -154,6 +162,8 @@ spec:
               properties:
                 appVersion:
                   type: string
+                flavor:
+                  type: string
                 manifest:
                   type: string
                 name:
@@ -184,7 +194,6 @@ metadata:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  creationTimestamp: null
   name: ambassador-operator
 rules:
   - apiGroups:
@@ -330,7 +339,7 @@ spec:
       containers:
         - name: ambassador-operator
           # Replace this with the built image name
-          image: quay.io/datawire/ambassador-operator:v1.1.0
+          image: quay.io/datawire/ambassador-operator:v1.2.3
           command:
           - ambassador-operator
           imagePullPolicy: Always
@@ -359,3 +368,5 @@ metadata:
   name: ambassador
 spec:
   installOSS: true
+  helmValues:
+    deploymentTool: amb-oper-kops