RocketChat · LuluGO · May 15, 2019 · May 15, 2019 · May 15, 2019 · May 15, 2019
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -14,7 +14,7 @@ jobs:
             shellcheck -x test/repo-sync.sh
   lint-charts:
     docker:
-      - image: gcr.io/kubernetes-charts-ci/test-image:v3.2.0
+      - image: gcr.io/kubernetes-charts-ci/test-image:v3.3.2
     steps:
       - checkout
       - run:

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,36 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: '[name of the chart e.g. stable/chart] issue title'
+labels: ''
+assignees: ''
+
+---
+
+<!-- Thanks for filing an issue! Before hitting the button, please answer these questions. It's helpful to search the existing GitHub issues first. It's likely that another user has already reported the issue you're facing, or it's a known issue that we're already aware of 
+
+Fill in as much of the template below as you can.  If you leave out information, we can't help you as well.
+
+Be ready for followup questions, and please respond in a timely manner. If we can't reproduce a bug or think a feature already exists, we might close your issue.  If we're wrong, PLEASE feel free to reopen it and explain why.
+-->
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Version of Helm and Kubernetes**:
+
+
+**Which chart**:
+
+
+**What happened**:
+
+
+**What you expected to happen**:
+
+
+**How to reproduce it** (as minimally and precisely as possible):
+
+
+**Anything else we need to know**:
+
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,27 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: '[name of the chart e.g. stable/chart] issue title'
+labels: ''
+assignees: ''
+
+---
+
+<!-- Thanks for filing an issue! Before hitting the button, please answer these questions. It's helpful to search the existing GitHub issues first. It's likely that another user has already reported the issue you're facing, or it's a known issue that we're already aware of.
+
+Describe *in detail* the feature/behavior/change you'd like to see.
+
+Be ready for followup questions, and please respond in a timely manner. If we can't reproduce a bug or think a feature already exists, we might close your issue.  If we're wrong, PLEASE feel free to reopen it and explain why.
+-->
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -35,6 +35,7 @@ even continue reviewing your changes.
 
 #### Checklist
 [Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.]
-- [ ] [DCO](https://www.helm.sh/blog/helm-dco/index.html) signed
+- [ ] [DCO](https://github.com/helm/charts/blob/master/CONTRIBUTING.md#sign-your-work) signed
 - [ ] Chart Version bumped
 - [ ] Variables are documented in the README.md
+- [ ] Title of the PR starts with chart name (e.g. `[stable/chart]`)
diff --git a/OWNERS b/OWNERS
@@ -3,14 +3,17 @@ approvers:
   - prydonius
   - sameersbn
   - viglesiasce
-  - foxish
   - unguiculus
   - scottrigby
   - mattfarina
   - davidkarlsen
   - paulczar
   - cpanato
+  - jlegrone
+  - maorfr
 emeritus:
+  - foxish
   - linki
   - mgoodness
-  - seanknox
+  - seanknox
+
diff --git a/REVIEW_GUIDELINES.md b/REVIEW_GUIDELINES.md
@@ -16,6 +16,17 @@ Note, if a reviewer who is not an approver in an OWNERS file leaves a comment of
 
 Chart releases must be immutable. Any change to a chart warrants a chart version bump even if it is only changes to the documentation.
 
+## Versioning
+
+The chart `version` should follow [semver](https://semver.org/).
+
+Stable charts should start at `1.0.0` (for maintainability don't create new PRs for stable charts only to meet this criteria, but when reviewing PRs take the opportunity to ensure that this is met).
+
+Any breaking (backwards incompatible) changes to a chart should:
+
+1. Bump the MAJOR version
+2. In the README, under a section called "Upgrading", describe the manual steps necessary to upgrade to the new (specified) MAJOR version
+
 ## Chart Metadata
 
 The `Chart.yaml` should be as complete as possible. The following fields are mandatory:
@@ -338,3 +349,13 @@ While reviewing Charts that contain workloads such as [Deployments](https://kube
 10. As much as possible complex pre-app setups are configured using [init containers](https://kubernetes.io/docs/concepts/workloads/pods/init-containers/).
 
 More [configuration](https://kubernetes.io/docs/concepts/configuration/overview/) best practices.
+
+
+## Tests
+
+This repository follows a [test procedure](https://github.com/helm/charts/blob/master/test/README.md). This allows the charts of this repository to be tested according to several rules (linting, semver checking, deployment testing, etc) for every Pull Request.
+
+The `ci` directory of a given Chart allows testing different use cases, by allowing you to define different sets of values overriding `values.yaml`, one file per set. See the [documentation](https://github.com/helm/charts/blob/master/test/README.md#providing-custom-test-values) for more information.
+
+This directory MUST exist with at least one test file in it.
+
diff --git a/incubator/aws-alb-ingress-controller/Chart.yaml b/incubator/aws-alb-ingress-controller/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 name: aws-alb-ingress-controller
 description: A Helm chart for AWS ALB Ingress Controller
-version: 0.1.4
-appVersion: "v1.0.1"
+version: 0.1.8
+appVersion: "v1.1.2"
 engine: gotpl
 home: https://github.com/kubernetes-sigs/aws-alb-ingress-controller
 sources:

diff --git a/incubator/aws-alb-ingress-controller/OWNERS b/incubator/aws-alb-ingress-controller/OWNERS
@@ -0,0 +1,6 @@
+approvers:
+- bigkraig
+- M00nF1sh
+reviewers:
+- bigkraig
+- M00nF1sh
diff --git a/incubator/aws-alb-ingress-controller/README.md b/incubator/aws-alb-ingress-controller/README.md
@@ -56,9 +56,11 @@ The following tables lists the configurable parameters of the alb-ingress-contro
 | `image.repository`        | controller container image repository                                                                          | `894847497797.dkr.ecr.us-west-2.amazonaws.com/aws-alb-ingress-controller` |
 | `image.tag`               | controller container image tag                                                                                 | `v1.0.1`                                                                  |
 | `image.pullPolicy`        | controller container image pull policy                                                                         | `IfNotPresent`                                                            |
-| `enableReadinessProbe`    | enable readinessProbe on controller pod                                                                        |`false`                                                                    |
+| `enableReadinessProbe`    | enable readinessProbe on controller pod                                                                      | `false`                                                                    |
 | `enableLivenessProbe`     | enable livenessProbe on controller pod                                                                         | `false`                                                                   |
 | `extraEnv`                | map of environment variables to be injected into the controller pod                                            | `{}`                                                                      |
+| `volumesMounts`           | volumeMounts into the controller pod                                                                           | `[]`                                                                      |
+| `volumes`                 | volumes the controller pod                                                                                     | `[]`                                                                      |
 | `nodeSelector`            | node labels for controller pod assignment                                                                      | `{}`                                                                      |
 | `tolerations`             | controller pod toleration for taints                                                                           | `{}`                                                                      |
 | `podAnnotations`          | annotations to be added to controller pod                                                                      | `{}`                                                                      |
@@ -71,7 +73,7 @@ The following tables lists the configurable parameters of the alb-ingress-contro
 | `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)                            |
 
 ```bash
-helm install incubator/aws-alb-ingress-controller --set clusterName=MyClusterName --set autoDiscoverAwsRegion=true --set autoDiscoverAwsVpcID=true --name my-release --namespace kube-system 
+helm install incubator/aws-alb-ingress-controller --set clusterName=MyClusterName --set autoDiscoverAwsRegion=true --set autoDiscoverAwsVpcID=true --name my-release --namespace kube-system
 ```
 
 Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example,
@@ -82,4 +84,4 @@ helm install incubator/aws-alb-ingress-controller --name my-release -f values.ya
 
 > **Tip**: You can use the default [values.yaml](values.yaml)
 
-> **Tip**: If you use `aws-alb-ingress-controller` as releaseName, the generated pod name will be shorter.(e.g. `aws-alb-ingress-controller-66cc9fb67c-7mg4w` instead of `my-release-aws-alb-ingress-controller-66cc9fb67c-7mg4w`)
+> **Tip**: If you use `aws-alb-ingress-controller` as releaseName, the generated pod name will be shorter.(e.g. `aws-alb-ingress-controller-66cc9fb67c-7mg4w` instead of `my-release-aws-alb-ingress-controller-66cc9fb67c-7mg4w`)
diff --git a/incubator/aws-alb-ingress-controller/templates/deployment.yaml b/incubator/aws-alb-ingress-controller/templates/deployment.yaml
@@ -77,6 +77,10 @@ spec:
           {{- end }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
+          {{- with .Values.volumeMounts }}
+          volumeMounts:
+{{ toYaml . | indent 12 }}
+          {{- end }}
     {{- with .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml . | indent 8 }}
@@ -87,6 +91,10 @@ spec:
     {{- end }}
     {{- with .Values.tolerations }}
       tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.volumes }}
+      volumes:
 {{ toYaml . | indent 8 }}
     {{- end }}
       serviceAccountName: {{ if .Values.rbac.create }}{{ include "aws-alb-ingress-controller.fullname" . }}{{ else }}"{{ .Values.rbac.serviceAccountName }}"{{ end }}

diff --git a/incubator/aws-alb-ingress-controller/values.yaml b/incubator/aws-alb-ingress-controller/values.yaml
@@ -22,15 +22,15 @@ autoDiscoverAwsVpcID: false
 
 scope:
   ## If provided, the ALB ingress controller will only act on Ingress resources annotated with this class
-  ## Ref: https://github.com/kubernetes-sigs/aws-alb-ingress-controller/blob/master/docs/configuration.md#limiting-ingress-class
+  ## Ref: https://github.com/kubernetes-sigs/aws-alb-ingress-controller/blob/master/docs/guide/controller/config.md#limiting-ingress-class
   ingressClass: alb
 
   ## If true, the ALB ingress controller will only act on Ingress resources in a single namespace
   ## Default: false; watch all namespaces
   singleNamespace: false
 
   ## If scope.singleNamespace=true, the ALB ingress controller will only act on Ingress resources in this namespace
-  ## Ref: https://github.com/kubernetes-sigs/aws-alb-ingress-controller/blob/master/docs/configuration.md#limiting-namespaces
+  ## Ref: https://github.com/kubernetes-sigs/aws-alb-ingress-controller/blob/master/docs/guide/controller/config.md#limiting-namespaces
   ## Default: namespace of the ALB ingress controller
   watchNamespace: ""
 
@@ -71,7 +71,7 @@ rbac:
 
 image:
   repository: docker.io/amazon/aws-alb-ingress-controller
-  tag: "v1.0.1"
+  tag: "v1.1.2"
   pullPolicy: IfNotPresent
 
 replicaCount: 1
@@ -99,3 +99,13 @@ tolerations: []
   #    effect: NoSchedule
 
 affinity: {}
+
+volumeMounts: []
+  # - name: aws-iam-credentials
+  #   mountPath: /meta/aws-iam
+  #   readOnly: true
+
+volumes: []
+  # - name: aws-iam-credentials
+  #   secret:
+  #     secretName: alb-ingress-controller-role
diff --git a/incubator/azuremonitor-containers/Chart.yaml b/incubator/azuremonitor-containers/Chart.yaml
@@ -1,11 +1,14 @@
 apiVersion: v1
-appVersion: 2.0.0-3
+appVersion: 4.0.0-0
 description: Helm chart for deploying Azure Monitor container monitoring agent in Kubernetes
 name: azuremonitor-containers
-version: 0.4.0
+version: 0.6.0
 keywords:
   - monitoring
   - azuremonitor
+  - azure
+  - oms
+  - containerinsights
   - metric
   - event
   - logs

diff --git a/incubator/azuremonitor-containers/README.md b/incubator/azuremonitor-containers/README.md
@@ -20,7 +20,7 @@ This article describes how to set up and use [Azure Monitor - Containers](https:
 
 2. [Add the 'AzureMonitor-Containers' Solution to your Log Analytics workspace.](http://aka.ms/coinhelmdoc)
 
-3. [For ACS-engine K8S cluster, add Log Analytics workspace tag to cluster resources, to be able to use Azure Container monitoring User experience (aka.ms/azmon-containers)](http://aka.ms/coin-acs-tag-doc)
+3. [For AKS-Engine or ACS-Engine K8S cluster, add required tags on cluster resources, to be able to use Azure Container monitoring User experience (aka.ms/azmon-containers)](http://aka.ms/coin-acs-tag-doc)
 
 ---
 
@@ -58,7 +58,7 @@ The following table lists the configurable parameters of the MSOMS chart and the
 | `omsagent.secret.wsid`     | Azure Log analytics workspace id                   | Does not have a default value, needs to be provided                              |
 | `omsagent.secret.key`      | Azure Log analytics workspace key                  | Does not have a default value, needs to be provided                              |
 | `omsagent.domain`          | Azure Log analytics cloud domain (public / govt)   | opinsights.azure.com (Public cloud as default), opinsights.azure.us (Govt Cloud) |
-| `omsagent.env.clusterName` | Name of your cluster      | Does not have a default value, needs to be provided. If ACS-engine cluster, it is recommended to provide either one of the below as cluster name, to be able to use Azure Container monitoring User experience (aka.ms/azmon-containers)  <br/> <br/> - Azure Resource group resource ID of ACS-Engine cluster  <br/> - Provide a friendly name here and ensure this name is used to 'tag' the cluster master node(s) - see step-3 in pre-requisites above |
+| `omsagent.env.clusterName` | Name of your cluster      | Does not have a default value, needs to be provided. If AKS-Engine or ACS-Engine K8S cluster, it is recommended to provide either one of the below as cluster name, to be able to use Azure Container monitoring User experience (aka.ms/azmon-containers)  <br/> <br/> - Azure Resource group resource ID of ACS-Engine cluster  <br/> - Provide a friendly name here and ensure this name is used to 'tag' the cluster master node(s) - see step-3 in pre-requisites above |
 |`omsagent.env.doNotCollectKubeSystemLogs`| Disable collecting logs from containers in 'kube-system' namespace | true|
 | `omsagent.rbac`             | rbac enabled/disabled      | true  (i.e enabled)     |
 
@@ -70,7 +70,7 @@ Specify each parameter using the `--set key=value[,key=value]` argument to `helm
 ```bash
 
 $ helm install --name myrelease-1 \
---set omsagent.secret.wsid=<your_workspace_id>,omsagent.secret.key=<your_workspace_key>,omsagent.env.clusterName=<my_Acs-engine_k8s_cluster_RG_ResourceID>  incubator/azuremonitor-containers
+--set omsagent.secret.wsid=<your_workspace_id>,omsagent.secret.key=<your_workspace_key>,omsagent.env.clusterName=<my_AKS-Engine_k8s_cluster_RG_ResourceID>  incubator/azuremonitor-containers
 ```
 
 Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example,
@@ -83,4 +83,4 @@ $ helm install --name myrelease-1 -f values.yaml incubator/azuremonitor-containe
 
 After you successfully deploy the chart, you will be able to see your data in the [azure portal](aka.ms/azmon-containers)
 
-If you need help with this chart, please reach us out thru [this](mailto:askcoin@microsoft.com) email.
+If you need help with this chart, please reach us out through [this](mailto:askcoin@microsoft.com) email.
diff --git a/incubator/azuremonitor-containers/templates/omsagent-daemonset.yaml b/incubator/azuremonitor-containers/templates/omsagent-daemonset.yaml
@@ -32,6 +32,8 @@ spec:
          value: {{ .Values.omsagent.env.clusterName | quote }}
        - name: DISABLE_KUBE_SYSTEM_LOG_COLLECTION
          value: {{ .Values.omsagent.env.doNotCollectKubeSystemLogs | quote }}
+       - name: CONTROLLER_TYPE
+         value: "DaemonSet"
        - name: NODE_IP
          valueFrom:
             fieldRef:
@@ -44,12 +46,17 @@ spec:
        - containerPort: 25224
          protocol: UDP
        volumeMounts:
-        - mountPath: /var/run/docker.sock
+        - mountPath: /hostfs
+          name: host-root
+          readOnly: true
+        - mountPath: /var/run/host
           name: docker-sock
         - mountPath: /var/log 
           name: host-log
         - mountPath: /var/lib/docker/containers 
           name: containerlog-path
+        - mountPath: /etc/kubernetes/host
+          name: azure-json-path
         - mountPath: /etc/omsagent-secret
           name: omsagent-secret
           readOnly: true
@@ -58,7 +65,7 @@ spec:
          command:
          - /bin/bash
          - -c
-         - ps -ef | grep omsagent | grep -v "grep"
+         - (ps -ef | grep omsagent | grep -v "grep") && (ps -ef | grep td-agent-bit | grep -v "grep")
         initialDelaySeconds: 60
         periodSeconds: 60
    nodeSelector:
@@ -70,9 +77,12 @@ spec:
       value: "true"
       effect: "NoSchedule"     
    volumes:
+    - name: host-root
+      hostPath:
+       path: /
     - name: docker-sock 
       hostPath:
-       path: /var/run/docker.sock
+       path: /var/run
     - name: container-hostname
       hostPath:
        path: /etc/hostname
@@ -82,6 +92,9 @@ spec:
     - name: containerlog-path
       hostPath:
        path: /var/lib/docker/containers
+    - name: azure-json-path
+      hostPath:
+       path: /etc/kubernetes
     - name: omsagent-secret
       secret:
        secretName: omsagent-secret