Rebase to 086f1f7f0870e110abf30aa6bfe7c141e83cc950

packages/rancher-kube-state-metrics/generated-changes/exclude/LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright The Helm Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

packages/rancher-kube-state-metrics/generated-changes/patch/Chart.yaml.patch

@@ -1,15 +1,27 @@
 --- charts-original/Chart.yaml
 +++ charts/Chart.yaml
-@@ -1,5 +1,11 @@
+@@ -1,13 +1,20 @@
+-apiVersion: v1
+-name: kube-state-metrics
 +annotations:
 +  catalog.rancher.io/certified: rancher
 +  catalog.rancher.io/namespace: cattle-monitoring-system
 +  catalog.rancher.io/release-name: rancher-kube-state-metrics
 +  catalog.cattle.io/hidden: "true"
 +  catalog.cattle.io/os: linux
- apiVersion: v1
++apiVersion: v2
--name: kube-state-metrics
 +name: rancher-kube-state-metrics
  description: Install kube-state-metrics to generate and expose cluster-level metrics
  keywords:
  - metric
+ - monitoring
+ - prometheus
+ - kubernetes
+-version: 2.13.1
+-appVersion: 1.9.8
++type: application
++version: 3.2.0
++appVersion: 2.0.0
+ home: https://github.com/kubernetes/kube-state-metrics/
+ sources:
+ - https://github.com/kubernetes/kube-state-metrics/

packages/rancher-kube-state-metrics/generated-changes/patch/README.md.patch

@@ -0,0 +1,78 @@
+--- charts-original/README.md
++++ charts/README.md
+@@ -5,7 +5,7 @@
+ ## Get Repo Info
+ 
+ ```console
+-helm repo add kube-state-metrics https://kubernetes.github.io/kube-state-metrics
++helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
+ helm repo update
+ ```
+ 
+@@ -14,11 +14,7 @@
+ ## Install Chart
+ 
+ ```console
+-# Helm 3
+-$ helm install [RELEASE_NAME] kube-state-metrics/kube-state-metrics [flags]
+-
+-# Helm 2
+-$ helm install --name [RELEASE_NAME] kube-state-metrics/kube-state-metrics [flags]
++helm install [RELEASE_NAME] prometheus-community/kube-state-metrics [flags]
+ ```
+ 
+ _See [configuration](#configuration) below._
+@@ -28,11 +24,7 @@
+ ## Uninstall Chart
+ 
+ ```console
+-# Helm 3
+-$ helm uninstall [RELEASE_NAME]
+-
+-# Helm 2
+-# helm delete --purge [RELEASE_NAME]
++helm uninstall [RELEASE_NAME]
+ ```
+ 
+ This removes all the Kubernetes components associated with the chart and deletes the release.
+@@ -42,25 +34,35 @@
+ ## Upgrading Chart
+ 
+ ```console
+-# Helm 3 or 2
+-$ helm upgrade [RELEASE_NAME] kube-state-metrics/kube-state-metrics [flags]
++helm upgrade [RELEASE_NAME] prometheus-community/kube-state-metrics [flags]
+ ```
+ 
+ _See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._
+ 
+-### From stable/kube-state-metrics
++### Migrating from stable/kube-state-metrics and kubernetes/kube-state-metrics
+ 
+ You can upgrade in-place:
+ 
+ 1. [get repo info](#get-repo-info)
+ 1. [upgrade](#upgrading-chart) your existing release name using the new chart repo
+ 
++
++## Upgrading to v3.0.0
++
++v3.0.0 includes kube-state-metrics v2.0, see the [changelog](https://github.com/kubernetes/kube-state-metrics/blob/release-2.0/CHANGELOG.md) for major changes on the application-side.
++
++The upgraded chart now the following changes:
++* Dropped support for helm v2 (helm v3 or later is required)
++* collectors key was renamed to resources
++* namespace key was renamed to namespaces
++
++
+ ## Configuration
+ 
+ See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing). To see all configurable options with detailed comments:
+ 
+ ```console
+-helm show values kube-state-metrics/kube-state-metrics
++helm show values prometheus-community/kube-state-metrics
+ ```
+ 
+-You may also `helm show values` on this chart's [dependencies](#dependencies) for additional options.
++You may also run `helm show values` on this chart's [dependencies](#dependencies) for additional options.

packages/rancher-kube-state-metrics/generated-changes/patch/templates/deployment.yaml.patch

@@ -8,7 +8,129 @@
        {{- end }}
      {{- if .Values.priorityClassName }}
        priorityClassName: {{ .Values.priorityClassName }}
-@@ -173,7 +174,7 @@
+@@ -69,91 +70,91 @@
+         {{- end  }}
+ {{  end  }}
+ {{  if .Values.collectors.certificatesigningrequests  }}
+-        - --collectors=certificatesigningrequests
++        - --resources=certificatesigningrequests
+ {{  end  }}
+ {{  if .Values.collectors.configmaps  }}
+-        - --collectors=configmaps
++        - --resources=configmaps
+ {{  end  }}
+ {{  if .Values.collectors.cronjobs  }}
+-        - --collectors=cronjobs
++        - --resources=cronjobs
+ {{  end  }}
+ {{ if .Values.collectors.daemonsets  }}
+-        - --collectors=daemonsets
++        - --resources=daemonsets
+ {{  end  }}
+ {{  if .Values.collectors.deployments  }}
+-        - --collectors=deployments
++        - --resources=deployments
+ {{  end  }}
+ {{  if .Values.collectors.endpoints  }}
+-        - --collectors=endpoints
++        - --resources=endpoints
+ {{  end  }}
+ {{  if .Values.collectors.horizontalpodautoscalers  }}
+-        - --collectors=horizontalpodautoscalers
++        - --resources=horizontalpodautoscalers
+ {{  end  }}
+ {{  if .Values.collectors.ingresses  }}
+-        - --collectors=ingresses
++        - --resources=ingresses
+ {{  end  }}
+ {{  if .Values.collectors.jobs  }}
+-        - --collectors=jobs
++        - --resources=jobs
+ {{  end  }}
+ {{  if .Values.collectors.limitranges  }}
+-        - --collectors=limitranges
++        - --resources=limitranges
+ {{  end  }}
+ {{  if .Values.collectors.mutatingwebhookconfigurations  }}
+-        - --collectors=mutatingwebhookconfigurations
++        - --resources=mutatingwebhookconfigurations
+ {{  end  }}
+ {{  if .Values.collectors.namespaces  }}
+-        - --collectors=namespaces
++        - --resources=namespaces
+ {{  end  }}
+ {{  if .Values.collectors.networkpolicies  }}
+-        - --collectors=networkpolicies
++        - --resources=networkpolicies
+ {{  end  }}
+ {{  if .Values.collectors.nodes  }}
+-        - --collectors=nodes
++        - --resources=nodes
+ {{  end  }}
+ {{  if .Values.collectors.persistentvolumeclaims  }}
+-        - --collectors=persistentvolumeclaims
++        - --resources=persistentvolumeclaims
+ {{  end  }}
+ {{  if .Values.collectors.persistentvolumes  }}
+-        - --collectors=persistentvolumes
++        - --resources=persistentvolumes
+ {{  end  }}
+ {{  if .Values.collectors.poddisruptionbudgets  }}
+-        - --collectors=poddisruptionbudgets
++        - --resources=poddisruptionbudgets
+ {{  end  }}
+ {{  if .Values.collectors.pods  }}
+-        - --collectors=pods
++        - --resources=pods
+ {{  end  }}
+ {{  if .Values.collectors.replicasets  }}
+-        - --collectors=replicasets
++        - --resources=replicasets
+ {{  end  }}
+ {{  if .Values.collectors.replicationcontrollers  }}
+-        - --collectors=replicationcontrollers
++        - --resources=replicationcontrollers
+ {{  end  }}
+ {{  if .Values.collectors.resourcequotas  }}
+-        - --collectors=resourcequotas
++        - --resources=resourcequotas
+ {{  end  }}
+ {{  if .Values.collectors.secrets  }}
+-        - --collectors=secrets
++        - --resources=secrets
+ {{  end  }}
+ {{  if .Values.collectors.services  }}
+-        - --collectors=services
++        - --resources=services
+ {{  end  }}
+ {{  if .Values.collectors.statefulsets  }}
+-        - --collectors=statefulsets
++        - --resources=statefulsets
+ {{  end  }}
+ {{  if .Values.collectors.storageclasses  }}
+-        - --collectors=storageclasses
++        - --resources=storageclasses
+ {{  end  }}
+ {{  if .Values.collectors.validatingwebhookconfigurations  }}
+-        - --collectors=validatingwebhookconfigurations
++        - --resources=validatingwebhookconfigurations
+ {{  end  }}
+ {{  if .Values.collectors.verticalpodautoscalers  }}
+-        - --collectors=verticalpodautoscalers
++        - --resources=verticalpodautoscalers
+ {{  end  }}
+ {{  if .Values.collectors.volumeattachments  }}
+-        - --collectors=volumeattachments
++        - --resources=volumeattachments
+ {{  end  }}
+-{{ if .Values.namespace }}
+-        - --namespace={{ .Values.namespace | join "," }}
++{{ if .Values.namespaces }}
++        - --namespaces={{ tpl .Values.namespaces $ | join "," }}
+ {{ end }}
+ {{ if .Values.autosharding.enabled }}
+         - --pod=$(POD_NAME)
+@@ -173,9 +174,12 @@
            readOnly: true
  {{- end }}
          imagePullPolicy: {{ .Values.image.pullPolicy }}
@@ -16,8 +138,24 @@
 +        image: "{{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag }}"
          ports:
          - containerPort: 8080
++{{- if .Values.selfMonitor.enabled }}
++        - containerPort: 8081
++{{- end }}
          livenessProbe:
-@@ -200,12 +201,12 @@
+           httpGet:
+             path: /healthz
+@@ -192,6 +196,10 @@
+         resources:
+ {{ toYaml .Values.resources | indent 10 }}
+ {{- end }}
++{{- if .Values.containerSecurityContext }}
++        securityContext:
++{{ toYaml .Values.containerSecurityContext | indent 10 }}
++{{- end }}
+ {{- if .Values.imagePullSecrets }}
+       imagePullSecrets:
+ {{ toYaml .Values.imagePullSecrets | indent 8 }}
+@@ -200,12 +208,12 @@
        affinity:
  {{ toYaml .Values.affinity | indent 8 }}
  {{- end }}

packages/rancher-kube-state-metrics/generated-changes/patch/templates/role.yaml.patch

@@ -0,0 +1,31 @@
+--- charts-original/templates/role.yaml
++++ charts/templates/role.yaml
+@@ -1,11 +1,8 @@
+-{{- if and (eq $.Values.rbac.create true) (not .Values.rbac.useExistingRole)  -}}
+-{{- if eq .Values.rbac.useClusterRole false }}
+-{{-   range (split "," $.Values.namespace) }}
+-{{- end }}
+-{{- end -}}
++{{- if and (eq .Values.rbac.create true) (not .Values.rbac.useExistingRole) -}}
++{{- range (split "," .Values.namespaces) }}
+ ---
+ apiVersion: rbac.authorization.k8s.io/v1
+-{{- if eq .Values.rbac.useClusterRole false }}
++{{- if eq $.Values.rbac.useClusterRole false }}
+ kind: Role
+ {{- else }}
+ kind: ClusterRole
+@@ -17,7 +14,7 @@
+     app.kubernetes.io/managed-by: {{ $.Release.Service }}
+     app.kubernetes.io/instance: {{ $.Release.Name }}
+   name: {{ template "kube-state-metrics.fullname" $ }}
+-{{- if eq .Values.rbac.useClusterRole false }}
++{{- if eq $.Values.rbac.useClusterRole false }}
+   namespace: {{ . }}
+ {{- end }}
+ rules:
+@@ -190,3 +187,4 @@
+   verbs: ["list", "watch"]
+ {{ end -}}
+ {{- end -}}
++{{- end -}}

packages/rancher-kube-state-metrics/generated-changes/patch/templates/rolebinding.yaml.patch

@@ -0,0 +1,9 @@
+--- charts-original/templates/rolebinding.yaml
++++ charts/templates/rolebinding.yaml
+@@ -1,5 +1,5 @@
+ {{- if and (eq  .Values.rbac.create true) (eq .Values.rbac.useClusterRole false) -}}
+-{{- range (split "," $.Values.namespace) }}
++{{- range (split "," $.Values.namespaces) }}
+ ---
+ apiVersion: rbac.authorization.k8s.io/v1
+ kind: RoleBinding

packages/rancher-kube-state-metrics/generated-changes/patch/values.yaml.patch

@@ -1,6 +1,6 @@
 --- charts-original/values.yaml
 +++ charts/values.yaml
-@@ -1,7 +1,11 @@
+@@ -1,8 +1,12 @@
 +global:
 +  cattle:
 +    systemDefaultRegistry: ""
@@ -9,11 +9,13 @@
  prometheusScrape: true
  image:
 -  repository: k8s.gcr.io/kube-state-metrics/kube-state-metrics
+-  tag: v1.9.8
 +  repository: rancher/mirrored-kube-state-metrics-kube-state-metrics
-   tag: v1.9.8
++  tag: v2.0.0
    pullPolicy: IfNotPresent
  
-@@ -84,6 +88,7 @@
+ imagePullSecrets: []
+@@ -84,10 +88,16 @@
  
  securityContext:
    enabled: true
@@ -21,3 +23,41 @@
    runAsGroup: 65534
    runAsUser: 65534
    fsGroup: 65534
+ 
++## Specify security settings for a Container
++## Allows overrides and additional options compared to (Pod) securityContext
++## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
++containerSecurityContext: {}
++
+ ## Node labels for pod assignment
+ ## Ref: https://kubernetes.io/docs/user-guide/node-selection/
+ nodeSelector: {}
+@@ -110,7 +120,7 @@
+ podDisruptionBudget: {}
+ 
+ # Available collectors for kube-state-metrics. By default all available
+-# collectors are enabled.
++# resources are enabled.
+ collectors:
+   certificatesigningrequests: true
+   configmaps: true
+@@ -147,8 +157,8 @@
+   # base64 encoded kube-config file
+   secret:
+ 
+-# Namespace to be enabled for collecting resources. By default all namespaces are collected.
+-# namespace: ""
++# Comma-separated list of namespaces to be enabled for collecting resources. By default all namespaces are collected.
++namespaces: ""
+ 
+ ## Override the deployment namespace
+ ##
+@@ -172,7 +182,7 @@
+ kubeTargetVersionOverride: ""
+ 
+ # Enable self metrics configuration for service and Service Monitor
+-# Default values for telemetry configuration can be overriden
++# Default values for telemetry configuration can be overridden
+ selfMonitor:
+   enabled: false
+   # telemetryHost: 0.0.0.0