kengou · kengou · Feb 18, 2019 · Feb 6, 2019 · Feb 6, 2019 · Feb 6, 2019
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:

diff --git a/incubator/azuremonitor-containers/Chart.yaml b/incubator/azuremonitor-containers/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 2.0.0-3
 description: Helm chart for deploying Azure Monitor container monitoring agent in Kubernetes
 name: azuremonitor-containers
-version: 0.4.0
+version: 0.5.0
 keywords:
   - monitoring
   - azuremonitor

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:[email protected]) email.
+If you need help with this chart, please reach us out through [this](mailto:[email protected]) 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,7 +46,7 @@ spec:
        - containerPort: 25224
          protocol: UDP
        volumeMounts:
-        - mountPath: /var/run/docker.sock
+        - mountPath: /var/run/host
           name: docker-sock
         - mountPath: /var/log 
           name: host-log
@@ -72,7 +74,7 @@ spec:
    volumes:
     - name: docker-sock 
       hostPath:
-       path: /var/run/docker.sock
+       path: /var/run
     - name: container-hostname
       hostPath:
        path: /etc/hostname

diff --git a/incubator/azuremonitor-containers/templates/omsagent-deployment.yaml b/incubator/azuremonitor-containers/templates/omsagent-deployment.yaml
@@ -36,6 +36,8 @@ spec:
          value: {{ .Values.omsagent.env.clusterName | quote }}
        - name: DISABLE_KUBE_SYSTEM_LOG_COLLECTION
          value: {{ .Values.omsagent.env.doNotCollectKubeSystemLogs | quote }}
+       - name: CONTROLLER_TYPE
+         value: "ReplicaSet"
        - name: NODE_IP
          valueFrom:
             fieldRef:
@@ -48,7 +50,7 @@ spec:
        - containerPort: 25224
          protocol: UDP
        volumeMounts:
-        - mountPath: /var/run/docker.sock
+        - mountPath: /var/run/host
           name: docker-sock
         - mountPath: /var/log 
           name: host-log
@@ -73,7 +75,7 @@ spec:
    volumes:
     - name: docker-sock 
       hostPath:
-       path: /var/run/docker.sock
+       path: /var/run
     - name: container-hostname
       hostPath:
        path: /etc/hostname

diff --git a/incubator/azuremonitor-containers/templates/omsagent-rs-configmap.yaml b/incubator/azuremonitor-containers/templates/omsagent-rs-configmap.yaml
@@ -5,54 +5,54 @@ data:
   kube.conf: |
     # Fluentd config file for OMS Docker - cluster components (kubeAPI)
 
-    #Kubernetes pod inventory
-    <source>
+     #Kubernetes pod inventory
+     <source>
       type kubepodinventory
       tag oms.containerinsights.KubePodInventory
       run_interval 60s
       log_level debug
-    </source>
+     </source>
 
-    #Kubernetes events
-    <source>
+     #Kubernetes events
+     <source>
       type kubeevents
-      tag oms.api.KubeEvents.CollectionTime
+      tag oms.containerinsights.KubeEvents
       run_interval 60s
       log_level debug
-    </source>
+      </source>
 
-    #Kubernetes logs
-    <source>
+     #Kubernetes logs
+     <source>
       type kubelogs
       tag oms.api.KubeLogs
       run_interval 60s
-    </source>
+     </source>
 
-    #Kubernetes services
-    <source>
+     #Kubernetes services
+     <source>
       type kubeservices
-      tag oms.api.KubeServices.CollectionTime
+      tag oms.containerinsights.KubeServices
       run_interval 60s
       log_level debug
-    </source>
+     </source>
 
-    #Kubernetes Nodes
-    <source>
+     #Kubernetes Nodes
+     <source>
       type kubenodeinventory
       tag oms.containerinsights.KubeNodeInventory
       run_interval 60s
       log_level debug
-    </source>
+     </source>
 
-    #Kubernetes perf
-    <source>
+     #Kubernetes perf
+     <source>
       type kubeperf
       tag oms.api.KubePerf
       run_interval 60s
       log_level debug
-    </source>
+     </source>
 
-    <match oms.containerinsights.KubePodInventory**>
+     <match oms.containerinsights.KubePodInventory**>
       type out_oms
       log_level debug
       num_threads 5
@@ -65,23 +65,24 @@ data:
       retry_limit 10
       retry_wait 30s
       max_retry_wait 9m
-    </match>
+     </match>
 
-    <match oms.api.KubeEvents**>
-      type out_oms_api
+     <match oms.containerinsights.KubeEvents**>
+      type out_oms
       log_level debug
       num_threads 5
       buffer_chunk_limit 5m
       buffer_type file
-      buffer_path %STATE_DIR_WS%/out_oms_api_kubeevents*.buffer
+      buffer_path %STATE_DIR_WS%/out_oms_kubeevents*.buffer
       buffer_queue_limit 10
       buffer_queue_full_action drop_oldest_chunk
       flush_interval 20s
       retry_limit 10
       retry_wait 30s
-    </match>
+      max_retry_wait 9m
+     </match>
 
-    <match oms.api.KubeLogs**>
+     <match oms.api.KubeLogs**>
       type out_oms_api
       log_level debug
       buffer_chunk_limit 10m
@@ -91,10 +92,10 @@ data:
       flush_interval 20s
       retry_limit 10
       retry_wait 30s
-    </match>
+     </match>
 
-    <match oms.api.KubeServices**>	  
-      type out_oms_api
+     <match oms.containerinsights.KubeServices**>
+      type out_oms
       log_level debug
       num_threads 5
       buffer_chunk_limit 20m
@@ -106,9 +107,9 @@ data:
       retry_limit 10
       retry_wait 30s
       max_retry_wait 9m
-    </match>
+     </match>
 
-    <match oms.containerinsights.KubeNodeInventory**>
+     <match oms.containerinsights.KubeNodeInventory**>
       type out_oms
       log_level debug
       num_threads 5
@@ -121,9 +122,22 @@ data:
       retry_limit 10
       retry_wait 30s
       max_retry_wait 9m
-    </match>
+     </match>
+
+     <match oms.api.ContainerNodeInventory**>
+      type out_oms_api
+      log_level debug
+      buffer_chunk_limit 20m
+      buffer_type file
+      buffer_path %STATE_DIR_WS%/out_oms_containernodeinventory*.buffer
+      buffer_queue_limit 20
+      flush_interval 20s
+      retry_limit 10
+      retry_wait 15s
+      max_retry_wait 9m
+     </match>
 
-    <match oms.api.KubePerf**>	
+     <match oms.api.KubePerf**>	
       type out_oms
       log_level debug
       num_threads 5
@@ -136,7 +150,7 @@ data:
       retry_limit 10
       retry_wait 30s
       max_retry_wait 9m
-    </match>
+     </match>
 metadata:
   name: omsagent-rs-config
   namespace: kube-system

diff --git a/incubator/azuremonitor-containers/values.yaml b/incubator/azuremonitor-containers/values.yaml
@@ -6,10 +6,10 @@
 ## ref: https://github.com/Microsoft/OMS-docker/tree/ci_feature_prod
 omsagent:
   image:
-    tag: "ciprod11292018"
+    tag: "ciprod01092019"
     pullPolicy: IfNotPresent
-    dockerProviderVersion: "3.0.0-2"
-    agentVersion: "1.6.0-163"
+    dockerProviderVersion: "3.0.0-3"
+    agentVersion: "1.8.1.256"
 ## To get your workspace id and key do the following
 ## You can create a Azure Loganalytics workspace from portal.azure.com and get its ID & PRIMARY KEY from 'Advanced Settings' tab in the Ux.
 

diff --git a/incubator/jaeger/Chart.yaml b/incubator/jaeger/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: 1.8.2
+appVersion: 1.9.0
 description: A Jaeger Helm chart for Kubernetes
 name: jaeger
-version: 0.8.2
+version: 0.8.3
 keywords:
   - jaeger
   - opentracing

diff --git a/incubator/jaeger/README.md b/incubator/jaeger/README.md
@@ -214,7 +214,7 @@ The following table lists the configurable parameters of the Jaeger chart and th
 | `storage.elasticsearch.user`             | Provisioned elasticsearch user      |  elastic                               |
 | `storage.elasticsearch.nodesWanOnly`     | Only access specified es host       |  false                                 |
 | `storage.type`                           | Storage type (ES or Cassandra)      |  cassandra                             |
-| `tag`                                    | Image tag/version                   |  1.8.2                                 |
+| `tag`                                    | Image tag/version                   |  1.9.0                                 |
 
 For more information about some of the tunable parameters that Cassandra provides, please visit the helm chart for [cassandra](https://github.com/kubernetes/charts/tree/master/incubator/cassandra) and the official [website](http://cassandra.apache.org/) at apache.org.
 

diff --git a/incubator/jaeger/values.yaml b/incubator/jaeger/values.yaml
@@ -6,7 +6,7 @@ provisionDataStore:
   cassandra: true
   elasticsearch: false
 
-tag: 1.8.2
+tag: 1.9.0
 
 storage:
   # allowed values (cassandra, elasticsearch)

diff --git a/incubator/kafka/Chart.yaml b/incubator/kafka/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 description: Apache Kafka is publish-subscribe messaging rethought as a distributed
   commit log.
 name: kafka
-version: 0.13.7
+version: 0.13.8
 appVersion: 5.0.1
 keywords:
 - kafka

diff --git a/incubator/kafka/templates/deployment-kafka-exporter.yaml b/incubator/kafka/templates/deployment-kafka-exporter.yaml
@@ -35,4 +35,16 @@ spec:
           - containerPort: {{ .Values.prometheus.kafka.port }}
         resources:
 {{ toYaml .Values.prometheus.kafka.resources | indent 10 }}
+{{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
+{{- end }}
+{{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}
+{{- end }}
+{{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+{{- end }}
 {{- end }}
diff --git a/incubator/sparkoperator/Chart.yaml b/incubator/sparkoperator/Chart.yaml
@@ -1,6 +1,6 @@
 name: sparkoperator
 description: A Helm chart for Spark on Kubernetes operator
-version: 0.1.7
+version: 0.1.9
 appVersion: v1beta1-0.7-2.4.0
 kubeVersion: ">=1.8.0-0"
 keywords:

diff --git a/incubator/sparkoperator/README.md b/incubator/sparkoperator/README.md
@@ -30,12 +30,13 @@ The following table lists the configurable parameters of the Spark operator char
 | `enableWebhook`           | Whether to enable mutating admission webhook                 | false                                   |
 | `enableMetrics`           | Whether to expose metrics to be scraped by Premetheus        | true                                   |
 | `controllerThreads`       | Number of worker threads used by the SparkApplication controller | 10                                     |
+| `ingressUrlFormat` | Ingress URL format | "" |
 | `installCrds`             | Whether to install CRDs                                      | true                                   |
 | `metricsPort`             | Port for the metrics endpoint                                | 10254                                  |
 | `metricsEndpoint`         | Metrics endpoint                                             | "/metrics"                             |
 | `metricsPrefix`           | Prefix for the metrics                                       | ""                                     |
 | `resyncInterval`          | Informer resync interval in seconds                          | 30                                     |
-| `webhookPort`             | Service port of the webhook server                           | 8080                                   |                                    |
+| `webhookPort`             | Service port of the webhook server                           | 8080                                   |
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. 
 
diff --git a/incubator/sparkoperator/templates/spark-operator-deployment.yaml b/incubator/sparkoperator/templates/spark-operator-deployment.yaml
@@ -58,6 +58,7 @@ spec:
         args:
         - -v=2
         - -namespace={{ .Values.sparkJobNamespace }}
+        - -ingress-url-format={{ .Values.ingressUrlFormat }}
         - -install-crds={{ .Values.installCrds }}
         - -controller-threads={{ .Values.controllerThreads }}
         - -resync-interval={{ .Values.resyncInterval }}

diff --git a/incubator/sparkoperator/templates/spark-operator-rbac.yaml b/incubator/sparkoperator/templates/spark-operator-rbac.yaml
@@ -15,6 +15,9 @@ rules:
 - apiGroups: [""]
   resources: ["services", "configmaps", "secrets"]
   verbs: ["create", "get", "delete"]
+- apiGroups: ["extensions"]
+  resources: ["ingresses"]
+  verbs: ["create", "get", "delete"]
 - apiGroups: [""]
   resources: ["nodes"]
   verbs: ["get"]