Add gateway CRDs to appmesh-controller (#190)

aws · Jul 10, 2020 · be8f3fa · be8f3fa
1 parent c2cc3bf
commit be8f3fa
Show file tree

Hide file tree

Showing 8 changed files with 780 additions and 12 deletions.
diff --git a/stable/appmesh-controller/Chart.yaml b/stable/appmesh-controller/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 name: appmesh-controller
 description: App Mesh controller Helm chart for Kubernetes
-version: 1.0.2
-appVersion: 1.0.0
+version: 1.1.0
+appVersion: 1.1.0
 home: https://github.com/aws/eks-charts
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
 sources:

diff --git a/stable/appmesh-controller/crds/crds.yaml b/stable/appmesh-controller/crds/crds.yaml
diff --git a/stable/appmesh-controller/templates/rbac.yaml b/stable/appmesh-controller/templates/rbac.yaml
@@ -50,10 +50,10 @@ rules:
   resources: [pods/status]
   verbs: [get, patch, update]
 - apiGroups: [appmesh.k8s.aws]
-  resources: [meshes, virtualnodes, virtualrouters, virtualservices]
+  resources: [gatewayroutes, meshes, virtualgateways, virtualnodes, virtualrouters, virtualservices]
   verbs: [create, delete, get, list, patch, update, watch]
 - apiGroups: [appmesh.k8s.aws]
-  resources: [meshes/status, virtualnodes/status, virtualrouters/status, virtualservices/status]
+  resources: [gatewayroutes/status, meshes/status, virtualgateways/status, virtualnodes/status, virtualrouters/status, virtualservices/status]
   verbs: [get, patch, update]
 ---
 apiVersion: rbac.authorization.k8s.io/v1

diff --git a/stable/appmesh-controller/values.yaml b/stable/appmesh-controller/values.yaml
@@ -7,7 +7,7 @@ region: ""
 
 image:
   repository: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/appmesh-controller
-  tag: v1.0.0
+  tag: v1.1.0
   pullPolicy: IfNotPresent
 
 sidecar:

diff --git a/stable/appmesh-controller/webhookconfig.yaml b/stable/appmesh-controller/webhookconfig.yaml
@@ -4,6 +4,8 @@
 # controller. This file is referenced in the templates for
 # generating the admission webhooks for the resources
 customResources:
+  - name: gatewayroute
+    resource: gatewayroutes
   - name: mesh
     resource: meshes
   - name: virtualnode
@@ -12,3 +14,5 @@ customResources:
     resource: virtualrouters
   - name: virtualservice
     resource: virtualservices
+  - name: virtualgateway
+    resource: virtualgateways
diff --git a/stable/appmesh-gateway/Chart.yaml b/stable/appmesh-gateway/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: appmesh-gateway
 description: App Mesh Gateway Helm chart for Kubernetes
-version: 0.1.1
+version: 0.1.2
 appVersion: 1.0.0
 home: https://github.com/aws/eks-charts
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png

diff --git a/stable/appmesh-gateway/templates/gateway.yaml b/stable/appmesh-gateway/templates/gateway.yaml
@@ -17,8 +17,8 @@ spec:
     - portMapping:
         port: 8088
         protocol: http
-      logging:
-        accessLog:
-          file:
-            path: "/dev/stdout"
+  logging:
+    accessLog:
+      file:
+        path: "/dev/stdout"
 {{- end }}
diff --git a/stable/aws-calico/Chart.yaml b/stable/aws-calico/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v1
 description: A Helm chart for installing Calico on AWS
 website: https://docs.aws.amazon.com/eks/latest/userguide/calico.html
 name: aws-calico
-version: 0.2.3
+version: 0.2.4
 appVersion: 3.8.1
 icon: https://www.projectcalico.org/wp-content/uploads/2019/09/Calico_Logo_Large_Calico.png