Merge branch 'solr_plugin_volume' of github.com:MarcusSorealheis/char…

…ts into solr_plugin_volume * 'solr_plugin_volume' of github.com:MarcusSorealheis/charts: (611 commits) bump version to be compatible with plugins. bump version to be compatible with plugins. [stable/kube-state-metrics] Version bump to 1.9.4 (helm#20543) [stable/nginx-ingress] allow clusterIP values to be set empty (helm#20518) update grafana sidecar to 0.1.75 (helm#20538) [stable/mongodb] Release 7.8.2 updating components versions (helm#20537) [stable/testlink] add service annotations (helm#20531) Rr/strategy (helm#20533) [stable/superset] Update Maintainers List (helm#20493) [stable/nfs-server-provisioner] New nfs-provisioner with NFSv3 support (helm#19260) [stable/pgadmin] removed abundance curly bracket (helm#20530) Seq: use deployment strategy (helm#20526) [stable/moodle] Set MOODLE_SKIP_INSTALL environment variable via values.yaml config. (helm#20523) [stable/prometheus-redis-exporter] Update image for exporter (helm#19317) update alantis version (helm#20507) [stable/spring-cloud-data-flow] Update to new SCDF version 2.4.0 (helm#20517) [stable/prometheus-blackbox-exporter] add "allowIcmp" setting (helm#20409) Allow DNS egress to resolve hostnames (helm#20437) [stable/rabbitmq] Add PrometheusRule. (helm#20478) [stable/drupal] Release 6.2.4 updating components versions (helm#20491) ...
MarcusSorealheis · Feb 4, 2020 · b4833a0 · b4833a0
2 parents 1b46700 + b6d0bae
commit b4833a0
Show file tree

Hide file tree

Showing 1,060 changed files with 21,920 additions and 8,715 deletions.
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ Note that this project has been under active development for some time, so you m
 
 ## Where to Find Us
 
-For general Helm Chart discussions join the Helm Charts (#charts) room in the [Kubernetes](http://slack.kubernetes.io/).
+For general Helm Chart discussions join the Helm Charts (#charts) room in the [Kubernetes Slack instance](http://slack.kubernetes.io/).
 
 For issues and support for Helm and Charts see [Support Channels](CONTRIBUTING.md#support-channels).
 
@@ -35,6 +35,15 @@ Just `helm install stable/<chart>`. This is the default repository for Helm whic
 
 For more information on using Helm, refer to the [Helm documentation](https://github.com/kubernetes/helm#docs).
 
+## How Do I Enable the Stable Repository for Helm 3?
+
+To add the Helm Stable Charts for your local client, run `helm repo add`:
+
+```
+$ helm repo add stable https://kubernetes-charts.storage.googleapis.com
+"stable" has been added to your repositories
+```
+
 ## How Do I Enable the Incubator Repository?
 
 To add the Incubator charts for your local client, run `helm repo add`:

diff --git a/REVIEW_GUIDELINES.md b/REVIEW_GUIDELINES.md
@@ -279,7 +279,11 @@ ingress:
 
 ```yaml
 {{- if .Values.ingress.enabled -}}
+{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
+apiVersion: networking.k8s.io/v1beta1
+{{ else }}
 apiVersion: extensions/v1beta1
+{{ end -}}
 kind: Ingress
 metadata:
   name: {{ include "myapp.fullname" }}

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.11
-appVersion: "v1.1.3"
+version: 0.1.13
+appVersion: "v1.1.5"
 engine: gotpl
 home: https://github.com/kubernetes-sigs/aws-alb-ingress-controller
 sources:

diff --git a/incubator/aws-alb-ingress-controller/README.md b/incubator/aws-alb-ingress-controller/README.md
@@ -54,7 +54,7 @@ The following tables lists the configurable parameters of the alb-ingress-contro
 | `awsVpcID`                | AWS VPC ID of k8s cluster, required if ec2metadata is unavailable from controller pod                          | `vpc-xxx`                                                                 |
 | `autoDiscoverAwsVpcID`    | auto discover awsVpcID from ec2metadata, omit awsRegion when this set to true                                  | false                                                                     |
 | `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.tag`               | controller container image tag                                                                                 | `v1.1.5`                                                                  |
 | `image.pullPolicy`        | controller container image pull policy                                                                         | `IfNotPresent`                                                            |
 | `enableReadinessProbe`    | enable readinessProbe on controller pod                                                                      | `false`                                                                    |
 | `enableLivenessProbe`     | enable livenessProbe on controller pod                                                                         | `false`                                                                   |

diff --git a/incubator/aws-alb-ingress-controller/values.yaml b/incubator/aws-alb-ingress-controller/values.yaml
@@ -76,7 +76,7 @@ rbac:
 
 image:
   repository: docker.io/amazon/aws-alb-ingress-controller
-  tag: "v1.1.3"
+  tag: "v1.1.5"
   pullPolicy: IfNotPresent
 
 replicaCount: 1

diff --git a/incubator/azuremonitor-containers/Chart.yaml b/incubator/azuremonitor-containers/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 7.0.0-1
 description: Helm chart for deploying Azure Monitor container monitoring agent in Kubernetes
 name: azuremonitor-containers
-version: 2.4.0
+version: 2.6.0
 kubeVersion: "^1.10.0-0"
 keywords:
   - monitoring

diff --git a/incubator/azuremonitor-containers/README.md b/incubator/azuremonitor-containers/README.md
@@ -4,7 +4,9 @@
 
 ## Introduction
 
-This article describes how to set up and use [Azure Monitor - Containers](https://docs.microsoft.com/en-us/azure/monitoring/monitoring-container-health) to monitor the health and performance of your workloads deployed to Kubernetes environments. Monitoring your Kubernetes cluster and containers is critical, especially when running a production cluster, at scale, with multiple applications.
+This article describes how to set up and use [Azure Monitor - Containers](https://docs.microsoft.com/en-us/azure/monitoring/monitoring-container-health) to monitor the health and performance of your workloads deployed to Kubernetes environments.
+
+Monitoring your Kubernetes cluster and containers is critical, especially when running a production cluster, at scale, with multiple applications.
 
 ---
 
@@ -27,13 +29,13 @@ This article describes how to set up and use [Azure Monitor - Containers](https:
 
 ## Installing the Chart
 
+> Note: `--name` flag not required in Helm3 since this flag is deprecated
 ### To Use Azure Log Analytics Workspace in Public Cloud
 
 ```bash
 $ helm repo add incubator https://kubernetes-charts-incubator.storage.googleapis.com/
 $ helm install --name myrelease-1 \
 --set omsagent.secret.wsid=<your_workspace_id>,omsagent.secret.key=<your_workspace_key>,omsagent.env.clusterName=<my_prod_cluster>  incubator/azuremonitor-containers
-
 ```
 
 ### To Use Azure Log Analytics Workspace in Azure China Cloud
@@ -52,17 +54,20 @@ $ helm install --name myrelease-1 \
 --set omsagent.domain=opinsights.azure.us,omsagent.secret.wsid=<your_workspace_id>,omsagent.secret.key=<your_workspace_key>,omsagent.env.clusterName=<your_cluster_name>  incubator/azuremonitor-containers
 ```
 
+## Upgrading an existing Release to a new version
+
+If the previous version of the chart installed with Helm2, it can be upgraded successfully to current version using Helm2.
+But, if the previous version of chart installed  with the Helm3 or release migrated to Helm3,then chart can’t be upgraded to latest version due to issues in Helm3 with regards to upgrading the existing release to new version, as described in [Helm issue #6850](https://github.com/helm/helm/issues/6850)
 
 ## Uninstalling the Chart
 
 To uninstall/delete the `myrelease-1` release:
-
+> Note: `--purge` flag not required in Helm3 since this flag deprecated
 ```bash
 
 $ helm del --purge myrelease-1
 
 ```
-
 The command removes all the Kubernetes components associated with the chart and deletes the release.
 
 ## Configuration
@@ -77,7 +82,7 @@ The following table lists the configurable parameters of the MSOMS chart and the
 | `omsagent.image.pullPolicy`| `msoms` image pull policy.                              | IfNotPresent                                                                     |
 | `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,china, us govt)   | opinsights.azure.com (Public cloud as default), opinsights.azure.cn (China Cloud), opinsights.azure.us (US Govt Cloud) |
+| `omsagent.domain`          | Azure Log analytics cloud domain (public,china, us govt)| opinsights.azure.com (Public cloud as default), opinsights.azure.cn (China Cloud), opinsights.azure.us (US Govt Cloud) |
 | `omsagent.env.clusterName` | Name of your cluster                                    | Does not have a default value, needs to be provided                                                                 |
 | `omsagent.rbac`            | rbac enabled/disabled                                   | true  (i.e enabled)                                                                                                 |
 
@@ -86,7 +91,6 @@ The following table lists the configurable parameters of the MSOMS chart and the
 - Parameter `omsagent.env.doNotCollectKubeSystemLogs` has been removed starting chart version 1.0.0. Refer to 'Agent data collection settings' section below to configure it using configmap.
 - onboarding of multiple clusters with the same cluster name to same log analytics workspace not supported. If need this configuration, use the cluster FQDN name rather than cluster dns prefix to avoid collision with clusterName
 
-
 ## Agent data collection settings
 
 Staring with chart version 1.0.0, agent data collection settings are controlled thru a config map. Refer to documentation about agent data collection settings [here](https://docs.microsoft.com/en-us/azure/azure-monitor/insights/container-insights-agent-config)
@@ -95,6 +99,7 @@ You can create a Azure Loganalytics workspace from portal.azure.com and get its
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
 
+
 ```bash
 
 $ helm install --name myrelease-1 \

diff --git a/incubator/azuremonitor-containers/templates/NOTES.txt b/incubator/azuremonitor-containers/templates/NOTES.txt
@@ -14,15 +14,15 @@
 
 {{- end }}
 
-{{- if eq .Values.omsagent.env.clusterName "<your_cluster_name>" }}
+{{- if and (ne .Values.omsagent.env.clusterName "<your_cluster_name>") (ne .Values.omsagent.env.clusterId "<your_cluster_id>") }}
 
 ##############################################################################
 ####   ERROR: You did not provide cluster name                            ####
 ##############################################################################
 
 {{- end }}
 
-{{- if or (eq .Values.omsagent.secret.key "<your_workspace_key>") (eq .Values.omsagent.secret.wsid "<your_workspace_id>") (eq .Values.omsagent.env.clusterName "<your_cluster_name>")}}
+{{- if or (eq .Values.omsagent.secret.key "<your_workspace_key>") (eq .Values.omsagent.secret.wsid "<your_workspace_id>") (and (eq .Values.omsagent.env.clusterName "<your_cluster_name>") (eq .Values.omsagent.env.clusterId "<your_cluster_id>"))}}
 
 This deployment will not complete. To proceed, run
  helm upgrade {{ .Release.Name }} \

diff --git a/incubator/azuremonitor-containers/templates/omsagent-daemonset.yaml b/incubator/azuremonitor-containers/templates/omsagent-daemonset.yaml
@@ -1,5 +1,5 @@
-{{- if and (ne .Values.omsagent.secret.key "<your_workspace_key>") (ne .Values.omsagent.secret.wsid "<your_workspace_id>") (ne .Values.omsagent.env.clusterName "<your_cluster_name>")}}
-apiVersion: extensions/v1beta1
+{{- if and (ne .Values.omsagent.secret.key "<your_workspace_key>") (ne .Values.omsagent.secret.wsid "<your_workspace_id>") (or (ne .Values.omsagent.env.clusterName "<your_cluster_name>") (ne .Values.omsagent.env.clusterId "<your_cluster_id>"))}}
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
  name: omsagent
@@ -8,9 +8,14 @@ metadata:
    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
    release: {{ .Release.Name }}
    heritage: {{ .Release.Service }}
+   component: oms-agent
+   tier: node
 spec:
  updateStrategy:
   type: RollingUpdate
+ selector:
+   matchLabels:
+     dsName: "omsagent-ds"
  template:
   metadata:
    labels:
@@ -34,8 +39,17 @@ spec:
        resources:
 {{ toYaml .Values.omsagent.resources.daemonset | indent 9 }}
        env:
+       {{- if ne .Values.omsagent.env.clusterId "<your_cluster_id>" }}
+       - name: AKS_RESOURCE_ID
+         value: {{ .Values.omsagent.env.clusterId | quote }}
+       {{- if ne .Values.omsagent.env.clusterRegion "<your_cluster_region>" }}
+       - name: AKS_REGION
+         value: {{ .Values.omsagent.env.clusterRegion | quote }}
+       {{- end }}
+       {{- else }}
        - name: ACS_RESOURCE_NAME
          value: {{ .Values.omsagent.env.clusterName | quote }}
+       {{- end }}
        - name: CONTROLLER_TYPE
          value: "DaemonSet"
        - name: NODE_IP
@@ -89,14 +103,12 @@ spec:
         periodSeconds: 60
    nodeSelector:
     beta.kubernetes.io/os: linux
-   # Tolerate below taints on nodes of k8s clusters to schedule ds pod.
-   tolerations:
-     - operator: "Exists"
-       effect: "NoSchedule"
-     - operator: "Exists"
-       effect: "NoExecute"
-     - operator: "Exists"
-       effect: "PreferNoSchedule"
+   {{- with .Values.omsagent.affinity }}
+   affinity: {{- toYaml . | nindent 8 }}
+   {{- end }}
+   {{- with .Values.omsagent.tolerations }}
+   tolerations: {{- toYaml . | nindent 8 }}
+   {{- end }}
    volumes:
     - name: host-root
       hostPath:

diff --git a/incubator/azuremonitor-containers/templates/omsagent-deployment.yaml b/incubator/azuremonitor-containers/templates/omsagent-deployment.yaml
@@ -1,5 +1,5 @@
-{{- if and (ne .Values.omsagent.secret.key "<your_workspace_key>") (ne .Values.omsagent.secret.wsid "<your_workspace_id>") (ne .Values.omsagent.env.clusterName "<your_cluster_name>")}}
-apiVersion: extensions/v1beta1
+{{- if and (ne .Values.omsagent.secret.key "<your_workspace_key>") (ne .Values.omsagent.secret.wsid "<your_workspace_id>") (or (ne .Values.omsagent.env.clusterName "<your_cluster_name>") (ne .Values.omsagent.env.clusterId "<your_cluster_id>"))}}
+apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: omsagent-rs
@@ -8,6 +8,8 @@ metadata:
    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
    release: {{ .Release.Name }}
    heritage: {{ .Release.Service }}
+   component: oms-agent
+   tier: node
 spec:
  replicas: 1
  selector:
@@ -38,8 +40,17 @@ spec:
        resources:
 {{ toYaml .Values.omsagent.resources.deployment | indent 9 }}
        env:
+       {{- if ne .Values.omsagent.env.clusterId "<your_cluster_id>" }}
+       - name: AKS_RESOURCE_ID
+         value: {{ .Values.omsagent.env.clusterId | quote }}
+       {{- if ne .Values.omsagent.env.clusterRegion "<your_cluster_region>" }}
+       - name: AKS_REGION
+         value: {{ .Values.omsagent.env.clusterRegion | quote }}
+       {{- end }}
+       {{- else }}
        - name: ACS_RESOURCE_NAME
          value: {{ .Values.omsagent.env.clusterName | quote }}
+       {{- end }}
        - name: CONTROLLER_TYPE
          value: "ReplicaSet"
        - name: NODE_IP
@@ -83,6 +94,12 @@ spec:
         periodSeconds: 60
    nodeSelector:
     beta.kubernetes.io/os: linux
+   {{- with .Values.omsagent.affinity }}
+   affinity: {{- toYaml . | nindent 8 }}
+   {{- end }}
+   {{- with .Values.omsagent.tolerations }}
+   tolerations: {{- toYaml . | nindent 8 }}
+   {{- end }}         
    volumes:
     - name: docker-sock
       hostPath:

diff --git a/incubator/azuremonitor-containers/templates/omsagent-rbac.yaml b/incubator/azuremonitor-containers/templates/omsagent-rbac.yaml
@@ -19,9 +19,9 @@ metadata:
     heritage: {{ .Release.Service }}
 rules:
 - apiGroups: [""]
-  resources: ["pods", "events", "nodes", "namespaces", "services"]
+  resources: ["pods", "events", "nodes", "nodes/stats", "nodes/metrics", "namespaces", "services"]
   verbs: ["list", "get", "watch"]
-- apiGroups: ["extensions"]
+- apiGroups: ["apps", "extensions"]
   resources: ["replicasets"]
   verbs: ["list"]
 - apiGroups: ["azmon.container.insights"]