Move Deployment API group from extensions/v1beta1 to apps/v1 (#1331)

In 1.9, kubernetes prompted Deployment to apps/v1 and finally deprecated extensions/v1beta1 support in 1.16. Users will see the following error message in log when fission components try to submit Deployment to the k8s API server and specify extensions/v1beta1 as API group. error: unable to recognize "deployment": no matches for kind "Deployment" in version "extensions/v1beta1" This PR updates call to k8s API server and apiKind in chart files to avoid fission failure in 1.16.
2019-09-29 22:16:33 +08:00
parent e734fa3554
commit 7cdc146515
46 changed files with 143 additions and 3099 deletions
@@ -112,7 +112,7 @@ data:
  "config.yaml": {{ include "config" . | b64enc }}

 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: controller
@@ -122,6 +122,10 @@ metadata:
    application: fission-api
 spec:
  replicas: 1
+  selector:
+    matchLabels:
+      svc: controller
+      application: fission-api
  template:
    metadata:
      labels:
@@ -174,7 +178,7 @@ spec:
 {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
 {{- end }}
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: router
@@ -184,6 +188,10 @@ metadata:
    application: fission-router
 spec:
  replicas: 1
+  selector:
+    matchLabels:
+      svc: router
+      application: fission-router
  template:
    metadata:
      labels:
@@ -270,7 +278,7 @@ spec:
    svc: executor

 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: executor
@@ -279,6 +287,9 @@ metadata:
    svc: executor
 spec:
  replicas: 1
+  selector:
+    matchLabels:
+      svc: executor
  template:
    metadata:
      labels:
@@ -341,7 +352,7 @@ spec:
 {{- end }}

 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: buildermgr
@@ -350,6 +361,9 @@ metadata:
    svc: buildermgr
 spec:
  replicas: 1
+  selector:
+    matchLabels:
+      svc: buildermgr
  template:
    metadata:
      labels:
@@ -390,7 +404,7 @@ spec:
 {{- end }}

 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: kubewatcher
@@ -399,6 +413,9 @@ metadata:
    svc: kubewatcher
 spec:
  replicas: 1
+  selector:
+    matchLabels:
+      svc: kubewatcher
  template:
    metadata:
      labels:
@@ -437,7 +454,7 @@ spec:
    svc: influxdb

 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: influxdb
@@ -446,6 +463,9 @@ metadata:
    svc: influxdb
 spec:
  replicas: 1
+  selector:
+    matchLabels:
+      svc: influxdb
  template:
    metadata:
      labels:
@@ -492,7 +512,7 @@ spec:
  selector:
    svc: heapster
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: heapster
@@ -502,6 +522,9 @@ metadata:
    svc: heapster
 spec:
  replicas: 1
+  selector:
+    matchLabels:
+      svc: heapster
  template:
    metadata:
      labels:
@@ -517,7 +540,7 @@ spec:
      serviceAccount: {{ .Release.Namespace }}/fission-svc
 {{- end }}
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: timer
@@ -526,6 +549,9 @@ metadata:
    svc: timer
 spec:
  replicas: 1
+  selector:
+    matchLabels:
+      svc: timer
  template:
    metadata:
      labels:
@@ -551,7 +577,7 @@ spec:
 # "fission".
 #
 #---
-#apiVersion: extensions/v1beta1
+#apiVersion: apps/v1
 #kind: Deployment
 #metadata:
 #  name: fission-ui
@@ -575,7 +601,7 @@ spec:

 {{- if .Values.nats.enabled }}
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
  labels:
@@ -583,6 +609,9 @@ metadata:
  name: nats-streaming
 spec:
  replicas: 1
+  selector:
+    matchLabels:
+      svc: nats-streaming
  template:
    metadata:
      labels:
@@ -622,7 +651,7 @@ spec:
 {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
 {{- end }}
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: mqtrigger-nats-streaming
@@ -632,6 +661,10 @@ metadata:
    messagequeue: nats-streaming
 spec:
  replicas: 1
+  selector:
+    matchLabels:
+      svc: mqtrigger
+      messagequeue: nats-streaming
  template:
    metadata:
      labels:
@@ -661,7 +694,7 @@ spec:

 {{- if .Values.kafka.enabled }}
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: mqtrigger-kafka
@@ -671,6 +704,10 @@ metadata:
    messagequeue: kafka
 spec:
  replicas: 1
+  selector:
+    matchLabels:
+      svc: mqtrigger
+      messagequeue: kafka
  template:
    metadata:
      labels:
@@ -702,7 +739,7 @@ spec:

 {{- if .Values.azureStorageQueue.enabled }}
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: mqtrigger-azure-storage-queue
@@ -712,6 +749,10 @@ metadata:
    messagequeue: azure-storage-queue
 spec:
  replicas: 1
+  selector:
+    matchLabels:
+      svc: mqtrigger
+      messagequeue: azure-storage-queue
  template:
    metadata:
      labels:
@@ -744,7 +785,7 @@ spec:
 {{- end }}
 {{- end }}
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: storagesvc
@@ -754,6 +795,10 @@ metadata:
    application: fission-storage
 spec:
  replicas: 1
+  selector:
+    matchLabels:
+      svc: storagesvc
+      application: fission-storage
  template:
    metadata:
      labels:
@@ -20,7 +20,7 @@ data:
 {{ fail "invalid chart" }}
 {{- end }}
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
  name: logger
@@ -28,6 +28,9 @@ metadata:
    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
    svc: logger
 spec:
+  selector:
+    matchLabels:
+      svc: logger
  template:
    metadata:
      labels:
@@ -113,7 +113,7 @@ data:
  "config.yaml": {{ include "config" . | b64enc }}

 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: controller
@@ -123,6 +123,10 @@ metadata:
    application: fission-api
 spec:
  replicas: 1
+  selector:
+    matchLabels:
+      svc: controller
+      application: fission-api
  template:
    metadata:
      labels:
@@ -174,7 +178,7 @@ spec:
 {{- end }}

 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: router
@@ -184,6 +188,10 @@ metadata:
    application: fission-router
 spec:
  replicas: 1
+  selector:
+    matchLabels:
+      application: fission-router
+      svc: router
  template:
    metadata:
      labels:
@@ -270,7 +278,7 @@ spec:
    svc: executor

 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: executor
@@ -279,6 +287,9 @@ metadata:
    svc: executor
 spec:
  replicas: 1
+  selector:
+    matchLabels:
+      svc: executor
  template:
    metadata:
      labels:
@@ -337,7 +348,7 @@ spec:
 {{- end }}

 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: buildermgr
@@ -346,6 +357,9 @@ metadata:
    svc: buildermgr
 spec:
  replicas: 1
+  selector:
+    matchLabels:
+      svc: buildermgr
  template:
    metadata:
      labels:
@@ -384,7 +398,7 @@ spec:
 {{- end }}

 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: kubewatcher
@@ -393,6 +407,9 @@ metadata:
    svc: kubewatcher
 spec:
  replicas: 1
+  selector:
+    matchLabels:
+      svc: kubewatcher
  template:
    metadata:
      labels:
@@ -413,7 +430,7 @@ spec:
 {{- end }}

 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: timer
@@ -422,6 +439,9 @@ metadata:
    svc: timer
 spec:
  replicas: 1
+  selector:
+    matchLabels:
+      svc: timer
  template:
    metadata:
      labels:
@@ -442,7 +462,7 @@ spec:
 {{- end }}

 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: storagesvc
@@ -452,6 +472,10 @@ metadata:
    application: fission-storage
 spec:
  replicas: 1
+  selector:
+    matchLabels:
+      svc: storagesvc
+      application: fission-storage
  template:
    metadata:
      labels:
@@ -6,7 +6,7 @@ metadata:
    name: guestbook

 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
  labels:
@@ -6,7 +6,7 @@ metadata:
    name: guestbook

 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
  labels:
@@ -24,8 +24,8 @@ import (

 	"github.com/pkg/errors"
 	"go.uber.org/zap"
+	appsv1 "k8s.io/api/apps/v1"
 	apiv1 "k8s.io/api/core/v1"
-	"k8s.io/api/extensions/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/util/intstr"
@@ -61,7 +61,7 @@ var (
 type (
 	builderInfo struct {
 		envMetadata *metav1.ObjectMeta
-		deployment  *v1beta1.Deployment
+		deployment  *appsv1.Deployment
 		service     *apiv1.Service
 	}

@@ -319,7 +319,7 @@ func (envw *environmentWatcher) cleanupEnvBuilders(envs []fv1.Environment) {

 func (envw *environmentWatcher) createBuilder(env *fv1.Environment, ns string) (*builderInfo, error) {
 	var svc *apiv1.Service
-	var deploy *v1beta1.Deployment
+	var deploy *appsv1.Deployment

 	sel := envw.getLabels(env.Metadata.Name, ns, env.Metadata.ResourceVersion)

@@ -379,7 +379,7 @@ func (envw *environmentWatcher) deleteBuilderServiceByName(name, namespace strin
 }

 func (envw *environmentWatcher) deleteBuilderDeploymentByName(name, namespace string) error {
-	err := envw.kubernetesClient.ExtensionsV1beta1().
+	err := envw.kubernetesClient.AppsV1().
 		Deployments(namespace).
 		Delete(name, &delOpt)
 	if err != nil {
@@ -441,8 +441,8 @@ func (envw *environmentWatcher) createBuilderService(env *fv1.Environment, ns st
 	return &service, nil
 }

-func (envw *environmentWatcher) getBuilderDeploymentList(sel map[string]string, ns string) ([]v1beta1.Deployment, error) {
-	deployList, err := envw.kubernetesClient.ExtensionsV1beta1().Deployments(ns).List(
+func (envw *environmentWatcher) getBuilderDeploymentList(sel map[string]string, ns string) ([]appsv1.Deployment, error) {
+	deployList, err := envw.kubernetesClient.AppsV1().Deployments(ns).List(
 		metav1.ListOptions{
 			LabelSelector: labels.Set(sel).AsSelector().String(),
 		})
@@ -452,7 +452,7 @@ func (envw *environmentWatcher) getBuilderDeploymentList(sel map[string]string,
 	return deployList.Items, nil
 }

-func (envw *environmentWatcher) createBuilderDeployment(env *fv1.Environment, ns string) (*v1beta1.Deployment, error) {
+func (envw *environmentWatcher) createBuilderDeployment(env *fv1.Environment, ns string) (*appsv1.Deployment, error) {
 	name := fmt.Sprintf("%v-%v", env.Metadata.Name, env.Metadata.ResourceVersion)
 	sel := envw.getLabels(env.Metadata.Name, ns, env.Metadata.ResourceVersion)
 	var replicas int32 = 1
@@ -465,13 +465,13 @@ func (envw *environmentWatcher) createBuilderDeployment(env *fv1.Environment, ns
 		podAnnotations["sidecar.istio.io/inject"] = "false"
 	}

-	deployment := &v1beta1.Deployment{
+	deployment := &appsv1.Deployment{
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace: ns,
 			Name:      name,
 			Labels:    sel,
 		},
-		Spec: v1beta1.DeploymentSpec{
+		Spec: appsv1.DeploymentSpec{
 			Replicas: &replicas,
 			Selector: &metav1.LabelSelector{
 				MatchLabels: sel,
@@ -516,7 +516,7 @@ func (envw *environmentWatcher) createBuilderDeployment(env *fv1.Environment, ns
 	}

 	envw.logger.Info("creating builder deployment", zap.String("deployment", name))
-	_, err = envw.kubernetesClient.ExtensionsV1beta1().Deployments(ns).Create(deployment)
+	_, err = envw.kubernetesClient.AppsV1().Deployments(ns).Create(deployment)
 	if err != nil {
 		return nil, err
 	}
@@ -23,9 +23,9 @@ import (

 	multierror "github.com/hashicorp/go-multierror"
 	"go.uber.org/zap"
+	appsv1 "k8s.io/api/apps/v1"
 	asv1 "k8s.io/api/autoscaling/v1"
 	apiv1 "k8s.io/api/core/v1"
-	"k8s.io/api/extensions/v1beta1"
 	k8s_err "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -39,11 +39,11 @@ import (

 const (
 	DeploymentKind    = "Deployment"
-	DeploymentVersion = "extensions/v1beta1"
+	DeploymentVersion = "apps/v1"
 )

 func (deploy *NewDeploy) createOrGetDeployment(fn *fv1.Function, env *fv1.Environment,
-	deployName string, deployLabels map[string]string, deployNamespace string, firstcreate bool) (*v1beta1.Deployment, error) {
+	deployName string, deployLabels map[string]string, deployNamespace string, firstcreate bool) (*appsv1.Deployment, error) {

 	minScale := int32(fn.Spec.InvokeStrategy.ExecutionStrategy.MinScale)
 	specializationTimeout := int(fn.Spec.InvokeStrategy.ExecutionStrategy.SpecializationTimeout)
@@ -56,7 +56,7 @@ func (deploy *NewDeploy) createOrGetDeployment(fn *fv1.Function, env *fv1.Enviro

 	waitForDeploy := minScale > 0

-	existingDepl, err := deploy.kubernetesClient.ExtensionsV1beta1().Deployments(deployNamespace).Get(deployName, metav1.GetOptions{})
+	existingDepl, err := deploy.kubernetesClient.AppsV1().Deployments(deployNamespace).Get(deployName, metav1.GetOptions{})
 	if err == nil {
 		if waitForDeploy {
 			err = deploy.scaleDeployment(existingDepl.Namespace, existingDepl.Name, minScale)
@@ -81,7 +81,7 @@ func (deploy *NewDeploy) createOrGetDeployment(fn *fv1.Function, env *fv1.Enviro
 			return nil, err
 		}

-		depl, err := deploy.kubernetesClient.ExtensionsV1beta1().Deployments(deployNamespace).Create(deployment)
+		depl, err := deploy.kubernetesClient.AppsV1().Deployments(deployNamespace).Create(deployment)
 		if err != nil {
 			deploy.logger.Error("error while creating function deployment",
 				zap.Error(err),
@@ -143,12 +143,12 @@ func (deploy *NewDeploy) setupRBACObjs(deployNamespace string, fn *fv1.Function)
 	return nil
 }

-func (deploy *NewDeploy) getDeployment(ns, name string) (*v1beta1.Deployment, error) {
-	return deploy.kubernetesClient.ExtensionsV1beta1().Deployments(ns).Get(name, metav1.GetOptions{})
+func (deploy *NewDeploy) getDeployment(ns, name string) (*appsv1.Deployment, error) {
+	return deploy.kubernetesClient.AppsV1().Deployments(ns).Get(name, metav1.GetOptions{})
 }

-func (deploy *NewDeploy) updateDeployment(deployment *v1beta1.Deployment, ns string) error {
-	_, err := deploy.kubernetesClient.ExtensionsV1beta1().Deployments(ns).Update(deployment)
+func (deploy *NewDeploy) updateDeployment(deployment *appsv1.Deployment, ns string) error {
+	_, err := deploy.kubernetesClient.AppsV1().Deployments(ns).Update(deployment)
 	return err
 }

@@ -156,13 +156,13 @@ func (deploy *NewDeploy) deleteDeployment(ns string, name string) error {
 	// DeletePropagationBackground deletes the object immediately and dependent are deleted later
 	// DeletePropagationForeground not advisable; it markes for deleteion and API can still serve those objects
 	deletePropagation := metav1.DeletePropagationBackground
-	return deploy.kubernetesClient.ExtensionsV1beta1().Deployments(ns).Delete(name, &metav1.DeleteOptions{
+	return deploy.kubernetesClient.AppsV1().Deployments(ns).Delete(name, &metav1.DeleteOptions{
 		PropagationPolicy: &deletePropagation,
 	})
 }

 func (deploy *NewDeploy) getDeploymentSpec(fn *fv1.Function, env *fv1.Environment,
-	deployName string, deployLabels map[string]string) (*v1beta1.Deployment, error) {
+	deployName string, deployLabels map[string]string) (*appsv1.Deployment, error) {

 	replicas := int32(fn.Spec.InvokeStrategy.ExecutionStrategy.MinScale)

@@ -197,12 +197,12 @@ func (deploy *NewDeploy) getDeploymentSpec(fn *fv1.Function, env *fv1.Environmen
 	// rollback, set RevisionHistoryLimit to 0 to disable this feature.
 	revisionHistoryLimit := int32(0)

-	deployment := &v1beta1.Deployment{
+	deployment := &appsv1.Deployment{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:   deployName,
 			Labels: deployLabels,
 		},
-		Spec: v1beta1.DeploymentSpec{
+		Spec: appsv1.DeploymentSpec{
 			Replicas: &replicas,
 			Selector: &metav1.LabelSelector{
 				MatchLabels: deployLabels,
@@ -249,9 +249,9 @@ func (deploy *NewDeploy) getDeploymentSpec(fn *fv1.Function, env *fv1.Environmen
 					TerminationGracePeriodSeconds: &gracePeriodSeconds,
 				},
 			},
-			Strategy: v1beta1.DeploymentStrategy{
-				Type: v1beta1.RollingUpdateDeploymentStrategyType,
-				RollingUpdate: &v1beta1.RollingUpdateDeployment{
+			Strategy: appsv1.DeploymentStrategy{
+				Type: appsv1.RollingUpdateDeploymentStrategyType,
+				RollingUpdate: &appsv1.RollingUpdateDeployment{
 					MaxUnavailable: &maxUnavailable,
 					MaxSurge:       &maxSurge,
 				},
@@ -315,7 +315,7 @@ func (deploy *NewDeploy) getResources(env *fv1.Environment, fn *fv1.Function) ap
 	return resources
 }

-func (deploy *NewDeploy) createOrGetHpa(hpaName string, execStrategy *fv1.ExecutionStrategy, depl *v1beta1.Deployment) (*asv1.HorizontalPodAutoscaler, error) {
+func (deploy *NewDeploy) createOrGetHpa(hpaName string, execStrategy *fv1.ExecutionStrategy, depl *appsv1.Deployment) (*asv1.HorizontalPodAutoscaler, error) {

 	minRepl := int32(execStrategy.MinScale)
 	if minRepl == 0 {
@@ -414,14 +414,14 @@ func (deploy *NewDeploy) deleteSvc(ns string, name string) error {
 	return deploy.kubernetesClient.CoreV1().Services(ns).Delete(name, &metav1.DeleteOptions{})
 }

-func (deploy *NewDeploy) waitForDeploy(depl *v1beta1.Deployment, replicas int32, specializationTimeout int) (*v1beta1.Deployment, error) {
+func (deploy *NewDeploy) waitForDeploy(depl *appsv1.Deployment, replicas int32, specializationTimeout int) (*appsv1.Deployment, error) {
 	// if no specializationTimeout is set, use default value
 	if specializationTimeout < fv1.DefaultSpecializationTimeOut {
 		specializationTimeout = fv1.DefaultSpecializationTimeOut
 	}

 	for i := 0; i < specializationTimeout; i++ {
-		latestDepl, err := deploy.kubernetesClient.ExtensionsV1beta1().Deployments(depl.ObjectMeta.Namespace).Get(depl.Name, metav1.GetOptions{})
+		latestDepl, err := deploy.kubernetesClient.AppsV1().Deployments(depl.ObjectMeta.Namespace).Get(depl.Name, metav1.GetOptions{})
 		if err != nil {
 			return nil, err
 		}
@@ -30,8 +30,8 @@ import (
 	multierror "github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
 	"go.uber.org/zap"
+	autoscalingv1 "k8s.io/api/autoscaling/v1"
 	apiv1 "k8s.io/api/core/v1"
-	"k8s.io/api/extensions/v1beta1"
 	k8sErrs "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
@@ -237,7 +237,7 @@ func (deploy *NewDeploy) RefreshFuncPods(logger *zap.Logger, f fv1.Function) err
 		UID:       env.Metadata.UID,
 	})

-	dep, err := deploy.kubernetesClient.ExtensionsV1beta1().Deployments(metav1.NamespaceAll).List(metav1.ListOptions{
+	dep, err := deploy.kubernetesClient.AppsV1().Deployments(metav1.NamespaceAll).List(metav1.ListOptions{
 		LabelSelector: labels.Set(funcLabels).AsSelector().String(),
 	})

@@ -252,7 +252,7 @@ func (deploy *NewDeploy) RefreshFuncPods(logger *zap.Logger, f fv1.Function) err

 	// Ideally there should be only one deployment but for now we rely on label/selector to ensure that condition
 	for _, deployment := range dep.Items {
-		_, err := deploy.kubernetesClient.ExtensionsV1beta1().Deployments(deployment.ObjectMeta.Namespace).Patch(deployment.ObjectMeta.Name,
+		_, err := deploy.kubernetesClient.AppsV1().Deployments(deployment.ObjectMeta.Namespace).Patch(deployment.ObjectMeta.Name,
 			k8sTypes.StrategicMergePatchType,
 			[]byte(patch))
 		if err != nil {
@@ -655,7 +655,7 @@ func (deploy *NewDeploy) IsValid(fsvc *fscache.FuncSvc) bool {
 		return false
 	}

-	currentDeploy, err := deploy.kubernetesClient.ExtensionsV1beta1().
+	currentDeploy, err := deploy.kubernetesClient.AppsV1().
 		Deployments(deployObj.Namespace).Get(deployObj.Name, metav1.GetOptions{})
 	if err != nil {
 		deploy.logger.Error("error validating function deployment", zap.Error(err), zap.String("function", fsvc.Function.Name))
@@ -723,7 +723,7 @@ func (deploy *NewDeploy) idleObjectReaper() {
 				continue
 			}

-			currentDeploy, err := deploy.kubernetesClient.ExtensionsV1beta1().
+			currentDeploy, err := deploy.kubernetesClient.AppsV1().
 				Deployments(deployObj.Namespace).Get(deployObj.Name, metav1.GetOptions{})
 			if err != nil {
 				deploy.logger.Error("error validating function deployment", zap.Error(err), zap.String("function", fsvc.Function.Name))
@@ -760,12 +760,12 @@ func (deploy *NewDeploy) scaleDeployment(deplNS string, deplName string, replica
 		zap.String("deployment", deplName),
 		zap.String("namespace", deplNS),
 		zap.Int32("replicas", replicas))
-	_, err := deploy.kubernetesClient.ExtensionsV1beta1().Deployments(deplNS).UpdateScale(deplName, &v1beta1.Scale{
+	_, err := deploy.kubernetesClient.AppsV1().Deployments(deplNS).UpdateScale(deplName, &autoscalingv1.Scale{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      deplName,
 			Namespace: deplNS,
 		},
-		Spec: v1beta1.ScaleSpec{
+		Spec: autoscalingv1.ScaleSpec{
 			Replicas: replicas,
 		},
 	})
@@ -31,8 +31,8 @@ import (
 	multierror "github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
 	"go.uber.org/zap"
+	appsv1 "k8s.io/api/apps/v1"
 	apiv1 "k8s.io/api/core/v1"
-	"k8s.io/api/extensions/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/util/intstr"
@@ -51,7 +51,7 @@ type (
 		logger                 *zap.Logger
 		env                    *fv1.Environment
 		replicas               int32                         // num idle pods
-		deployment             *v1beta1.Deployment           // kubernetes deployment
+		deployment             *appsv1.Deployment            // kubernetes deployment
 		namespace              string                        // namespace to keep our resources
 		functionNamespace      string                        // fallback namespace for fission functions
 		podReadyTimeout        time.Duration                 // timeout for generic pods to become ready
@@ -359,12 +359,12 @@ func (gp *GenericPool) createPool() error {
 		podAnnotations["sidecar.istio.io/inject"] = "false"
 	}

-	deployment := &v1beta1.Deployment{
+	deployment := &appsv1.Deployment{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:   gp.getPoolName(),
 			Labels: gp.labelsForPool,
 		},
-		Spec: v1beta1.DeploymentSpec{
+		Spec: appsv1.DeploymentSpec{
 			Replicas: &gp.replicas,
 			Selector: &metav1.LabelSelector{
 				MatchLabels: gp.labelsForPool,
@@ -434,7 +434,7 @@ func (gp *GenericPool) createPool() error {
 		}
 	}

-	depl, err := gp.kubernetesClient.ExtensionsV1beta1().Deployments(gp.namespace).Create(deployment)
+	depl, err := gp.kubernetesClient.AppsV1().Deployments(gp.namespace).Create(deployment)
 	if err != nil {
 		gp.logger.Error("error creating deployment in kubernetes", zap.Error(err), zap.String("deployment", deployment.Name))
 		return err
@@ -447,7 +447,7 @@ func (gp *GenericPool) waitForReadyPod() error {
 	startTime := time.Now()
 	for {
 		// TODO: for now we just poll; use a watch instead
-		depl, err := gp.kubernetesClient.ExtensionsV1beta1().Deployments(gp.namespace).Get(
+		depl, err := gp.kubernetesClient.AppsV1().Deployments(gp.namespace).Get(
 			gp.deployment.ObjectMeta.Name, metav1.GetOptions{})
 		if err != nil {
 			e := "error waiting for ready pod for deployment"
@@ -632,7 +632,7 @@ func (gp *GenericPool) destroy() error {
 	delOpt := metav1.DeleteOptions{
 		PropagationPolicy: &deletePropagation,
 	}
-	err := gp.kubernetesClient.ExtensionsV1beta1().
+	err := gp.kubernetesClient.AppsV1().
 		Deployments(gp.namespace).Delete(gp.deployment.ObjectMeta.Name, &delOpt)
 	if err != nil {
 		gp.logger.Error("error destroying deployment",
@@ -97,7 +97,7 @@ func CleanupKubeObject(logger *zap.Logger, kubeClient *kubernetes.Clientset, kub
 		}

 	case "deployment":
-		err := kubeClient.ExtensionsV1beta1().Deployments(kubeobj.Namespace).Delete(kubeobj.Name, &delOpt)
+		err := kubeClient.AppsV1().Deployments(kubeobj.Namespace).Delete(kubeobj.Name, &delOpt)
 		if err != nil {
 			logger.Error("error cleaning up deployment", zap.Error(err), zap.String("deployment", kubeobj.Name))
 		}
@@ -115,7 +115,7 @@ func CleanupKubeObject(logger *zap.Logger, kubeClient *kubernetes.Clientset, kub
 }

 func cleanupDeployments(logger *zap.Logger, client *kubernetes.Clientset, instanceId string) error {
-	deploymentList, err := client.ExtensionsV1beta1().Deployments(meta_v1.NamespaceAll).List(meta_v1.ListOptions{})
+	deploymentList, err := client.AppsV1().Deployments(meta_v1.NamespaceAll).List(meta_v1.ListOptions{})
 	if err != nil {
 		return err
 	}
@@ -123,7 +123,7 @@ func cleanupDeployments(logger *zap.Logger, client *kubernetes.Clientset, instan
 		id, ok := dep.ObjectMeta.Labels[types.EXECUTOR_INSTANCEID_LABEL]
 		if ok && id != instanceId {
 			logger.Debug("cleaning up deployment", zap.String("deployment", dep.ObjectMeta.Name))
-			err := client.ExtensionsV1beta1().Deployments(dep.ObjectMeta.Namespace).Delete(dep.ObjectMeta.Name, &delOpt)
+			err := client.AppsV1().Deployments(dep.ObjectMeta.Namespace).Delete(dep.ObjectMeta.Name, &delOpt)
 			if err != nil {
 				logger.Error("error cleaning up deployment",
 					zap.Error(err),
@@ -136,7 +136,7 @@ func cleanupDeployments(logger *zap.Logger, client *kubernetes.Clientset, instan
 		pid, pok := dep.ObjectMeta.Labels[types.POOLMGR_INSTANCEID_LABEL]
 		if pok && pid != instanceId {
 			logger.Debug("cleaning up deployment", zap.String("deployment", dep.ObjectMeta.Name))
-			err := client.ExtensionsV1beta1().Deployments(dep.ObjectMeta.Namespace).Delete(dep.ObjectMeta.Name, &delOpt)
+			err := client.AppsV1().Deployments(dep.ObjectMeta.Namespace).Delete(dep.ObjectMeta.Name, &delOpt)
 			if err != nil {
 				logger.Error("error cleaning up deployment",
 					zap.Error(err),
@@ -1,21 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
@@ -1,19 +0,0 @@
-appVersion: 2.3.2
-description: Prometheus is a monitoring system and time series database.
-engine: gotpl
-home: https://prometheus.io/
-icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png
-maintainers:
- email: mgoodness@gmail.com
-  name: mgoodness
- email: gianrubio@gmail.com
-  name: gianrubio
-name: prometheus
-sources:
- https://github.com/prometheus/alertmanager
- https://github.com/prometheus/prometheus
- https://github.com/prometheus/pushgateway
- https://github.com/prometheus/node_exporter
- https://github.com/kubernetes/kube-state-metrics
-tillerVersion: '>=2.8.0'
-version: 7.0.3
@@ -1,6 +0,0 @@
-approvers:
- mgoodness
- gianrubio
-reviewers:
- mgoodness
- gianrubio
@@ -1,347 +0,0 @@
-# Prometheus
-
-[Prometheus](https://prometheus.io/), a [Cloud Native Computing Foundation](https://cncf.io/) project, is a systems and service monitoring system. It collects metrics from configured targets at given intervals, evaluates rule expressions, displays the results, and can trigger alerts if some condition is observed to be true.
-
-## TL;DR;
-
-```console
-$ helm install stable/prometheus
-```
-
-## Introduction
-
-This chart bootstraps a [Prometheus](https://prometheus.io/) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
-
-## Prerequisites
-
- Kubernetes 1.3+ with Beta APIs enabled
-
-## Installing the Chart
-
-To install the chart with the release name `my-release`:
-
-```console
-$ helm install --name my-release stable/prometheus
-```
-
-The command deploys Prometheus on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
-
-> **Tip**: List all releases using `helm list`
-
-## Uninstalling the Chart
-
-To uninstall/delete the `my-release` deployment:
-
-```console
-$ helm delete my-release
-```
-
-The command removes all the Kubernetes components associated with the chart and deletes the release.
-
-## Prometheus 2.x
-
-Prometheus version 2.x has made changes to alertmanager, storage and recording rules. Check out the migration guide [here](https://prometheus.io/docs/prometheus/2.0/migration/)
-
-Users of this chart will need to update their alerting rules to the new format before they can upgrade.
-
-## Upgrading from previous chart versions.
-
-As of version 5.0, this chart uses Prometheus 2.1. This version of prometheus introduces a new data format and is not compatible with prometheus 1.x. It is recommended to install this as a new release, as updating existing releases will not work. See the [prometheus docs](https://prometheus.io/docs/prometheus/latest/migration/#storage) for instructions on retaining your old data.
-
-### Example migration
-
-Assuming you have an existing release of the prometheus chart, named `prometheus-old`. In order to update to prometheus 2.1 while keeping your old data do the following:
-
-1. Update the `prometheus-old` release. Disable scraping on every component besides the prometheus server, similar to the configuration below:
-
-	```
-	alertmanager:
-	  enabled: false
-	alertmanagerFiles:
-	  alertmanager.yml: ""
-	kubeStateMetrics:
-	  enabled: false
-	nodeExporter:
-	  enabled: false
-	pushgateway:
-	  enabled: false
-	server:
-	  extraArgs:
-	    storage.local.retention: 720h
-	serverFiles:
-	  alerts: ""
-	  prometheus.yml: ""
-	  rules: ""
-	```
-
-1. Deploy a new release of the chart with version 5.0+ using prometheus 2.x. In the values.yaml set the scrape config as usual, and also add the `prometheus-old` instance as a remote-read target.
-
-   ```
-	  prometheus.yml:
-	    ...
-	    remote_read:
-	    - url: http://prometheus-old/api/v1/read
-	    ...
-   ```
-
-   Old data will be available when you query the new prometheus instance.
-
-## Configuration
-
-The following table lists the configurable parameters of the Prometheus chart and their default values.
-
-Parameter | Description | Default
--------- | ----------- | -------
-`alertmanager.enabled` | If true, create alertmanager | `true`
-`alertmanager.name` | alertmanager container name | `alertmanager`
-`alertmanager.image.repository` | alertmanager container image repository | `prom/alertmanager`
-`alertmanager.image.tag` | alertmanager container image tag | `v0.15.2`
-`alertmanager.image.pullPolicy` | alertmanager container image pull policy | `IfNotPresent`
-`alertmanager.prefixURL` | The prefix slug at which the server can be accessed | ``
-`alertmanager.baseURL` | The external url at which the server can be accessed | `/`
-`alertmanager.extraArgs` | Additional alertmanager container arguments | `{}`
-`alertmanager.configMapOverrideName` | Prometheus alertmanager ConfigMap override where full-name is `{{.Release.Name}}-{{.Values.alertmanager.configMapOverrideName}}` and setting this value will prevent the default alertmanager ConfigMap from being generated | `""`
-`alertmanager.ingress.enabled` | If true, alertmanager Ingress will be created | `false`
-`alertmanager.ingress.annotations` | alertmanager Ingress annotations | `{}`
-`alertmanager.ingress.extraLabels` | alertmanager Ingress additional labels | `{}`
-`alertmanager.ingress.hosts` | alertmanager Ingress hostnames | `[]`
-`alertmanager.ingress.tls` | alertmanager Ingress TLS configuration (YAML) | `[]`
-`alertmanager.nodeSelector` | node labels for alertmanager pod assignment | `{}`
-`alertmanager.tolerations` | node taints to tolerate (requires Kubernetes >=1.6) | `[]`
-`alertmanager.affinity` | pod affinity | `{}`
-`alertmanager.schedulerName` | alertmanager alternate scheduler name | `nil`
-`alertmanager.persistentVolume.enabled` | If true, alertmanager will create a Persistent Volume Claim | `true`
-`alertmanager.persistentVolume.accessModes` | alertmanager data Persistent Volume access modes | `[ReadWriteOnce]`
-`alertmanager.persistentVolume.annotations` | Annotations for alertmanager Persistent Volume Claim | `{}`
-`alertmanager.persistentVolume.existingClaim` | alertmanager data Persistent Volume existing claim name | `""`
-`alertmanager.persistentVolume.mountPath` | alertmanager data Persistent Volume mount root path | `/data`
-`alertmanager.persistentVolume.size` | alertmanager data Persistent Volume size | `2Gi`
-`alertmanager.persistentVolume.storageClass` | alertmanager data Persistent Volume Storage Class | `unset`
-`alertmanager.persistentVolume.subPath` | Subdirectory of alertmanager data Persistent Volume to mount | `""`
-`alertmanager.podAnnotations` | annotations to be added to alertmanager pods | `{}`
-`alertmanager.replicaCount` | desired number of alertmanager pods | `1`
-`alertmanager.priorityClassName` | alertmanager priorityClassName | `nil`
-`alertmanager.resources` | alertmanager pod resource requests & limits | `{}`
-`alertmanager.securityContext` | Custom [security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) for Alert Manager containers | `{}`
-`alertmanager.service.annotations` | annotations for alertmanager service | `{}`
-`alertmanager.service.clusterIP` | internal alertmanager cluster service IP | `""`
-`alertmanager.service.externalIPs` | alertmanager service external IP addresses | `[]`
-`alertmanager.service.loadBalancerIP` | IP address to assign to load balancer (if supported) | `""`
-`alertmanager.service.loadBalancerSourceRanges` | list of IP CIDRs allowed access to load balancer (if supported) | `[]`
-`alertmanager.service.servicePort` | alertmanager service port | `80`
-`alertmanager.service.type` | type of alertmanager service to create | `ClusterIP`
-`alertmanagerFiles.alertmanager.yml` | Prometheus alertmanager configuration | example configuration
-`configmapReload.name` | configmap-reload container name | `configmap-reload`
-`configmapReload.image.repository` | configmap-reload container image repository | `jimmidyson/configmap-reload`
-`configmapReload.image.tag` | configmap-reload container image tag | `v0.2.2`
-`configmapReload.image.pullPolicy` | configmap-reload container image pull policy | `IfNotPresent`
-`configmapReload.extraArgs` | Additional configmap-reload container arguments | `{}`
-`configmapReload.extraConfigmapMounts` | Additional configmap-reload configMap mounts | `[]`
-`configmapReload.resources` | configmap-reload pod resource requests & limits | `{}`
-`initChownData.enabled`  | If false, don't reset data ownership at startup | true
-`initChownData.name` | init-chown-data container name | `init-chown-data`
-`initChownData.image.repository` | init-chown-data container image repository | `busybox`
-`initChownData.image.tag` | init-chown-data container image tag | `latest`
-`initChownData.image.pullPolicy` | init-chown-data container image pull policy | `IfNotPresent`
-`initChownData.resources` | init-chown-data pod resource requests & limits | `{}`
-`kubeStateMetrics.enabled` | If true, create kube-state-metrics | `true`
-`kubeStateMetrics.name` | kube-state-metrics container name | `kube-state-metrics`
-`kubeStateMetrics.image.repository` | kube-state-metrics container image repository| `quay.io/coreos/kube-state-metrics`
-`kubeStateMetrics.image.tag` | kube-state-metrics container image tag | `v1.4.0`
-`kubeStateMetrics.image.pullPolicy` | kube-state-metrics container image pull policy | `IfNotPresent`
-`kubeStateMetrics.args` | kube-state-metrics container arguments | `{}`
-`kubeStateMetrics.nodeSelector` | node labels for kube-state-metrics pod assignment | `{}`
-`kubeStateMetrics.podAnnotations` | annotations to be added to kube-state-metrics pods | `{}`
-`kubeStateMetrics.deploymentAnnotations` | annotations to be added to kube-state-metrics deployment | `{}`
-`kubeStateMetrics.tolerations` | node taints to tolerate (requires Kubernetes >=1.6) | `[]`
-`kubeStateMetrics.replicaCount` | desired number of kube-state-metrics pods | `1`
-`kubeStateMetrics.priorityClassName` | kube-state-metrics priorityClassName | `nil`
-`kubeStateMetrics.resources` | kube-state-metrics resource requests and limits (YAML) | `{}`
-`kubeStateMetrics.securityContext` | Custom [security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) for kube-state-metrics containers | `{}`
-`kubeStateMetrics.service.annotations` | annotations for kube-state-metrics service | `{prometheus.io/scrape: "true"}`
-`kubeStateMetrics.service.clusterIP` | internal kube-state-metrics cluster service IP | `None`
-`kubeStateMetrics.service.externalIPs` | kube-state-metrics service external IP addresses | `[]`
-`kubeStateMetrics.service.loadBalancerIP` | IP address to assign to load balancer (if supported) | `""`
-`kubeStateMetrics.service.loadBalancerSourceRanges` | list of IP CIDRs allowed access to load balancer (if supported) | `[]`
-`kubeStateMetrics.service.servicePort` | kube-state-metrics service port | `80`
-`kubeStateMetrics.service.type` | type of kube-state-metrics service to create | `ClusterIP`
-`nodeExporter.enabled` | If true, create node-exporter | `true`
-`nodeExporter.name` | node-exporter container name | `node-exporter`
-`nodeExporter.image.repository` | node-exporter container image repository| `prom/node-exporter`
-`nodeExporter.image.tag` | node-exporter container image tag | `v0.16.0`
-`nodeExporter.image.pullPolicy` | node-exporter container image pull policy | `IfNotPresent`
-`nodeExporter.extraArgs` | Additional node-exporter container arguments | `{}`
-`nodeExporter.extraHostPathMounts` | Additional node-exporter hostPath mounts | `[]`
-`nodeExporter.extraConfigmapMounts` | Additional node-exporter configMap mounts | `[]`
-`nodeExporter.nodeSelector` | node labels for node-exporter pod assignment | `{}`
-`nodeExporter.podAnnotations` | annotations to be added to node-exporter pods | `{}`
-`nodeExporter.pod.labels` | labels to be added to node-exporter pods | `{}`
-`nodeExporter.tolerations` | node taints to tolerate (requires Kubernetes >=1.6) | `[]`
-`nodeExporter.priorityClassName` | node-exporter priorityClassName | `nil`
-`nodeExporter.resources` | node-exporter resource requests and limits (YAML) | `{}`
-`nodeExporter.securityContext` | securityContext for containers in pod | `{}`
-`nodeExporter.service.annotations` | annotations for node-exporter service | `{prometheus.io/scrape: "true"}`
-`nodeExporter.service.clusterIP` | internal node-exporter cluster service IP | `None`
-`nodeExporter.service.externalIPs` | node-exporter service external IP addresses | `[]`
-`nodeExporter.service.loadBalancerIP` | IP address to assign to load balancer (if supported) | `""`
-`nodeExporter.service.loadBalancerSourceRanges` | list of IP CIDRs allowed access to load balancer (if supported) | `[]`
-`nodeExporter.service.servicePort` | node-exporter service port | `9100`
-`nodeExporter.service.type` | type of node-exporter service to create | `ClusterIP`
-`pushgateway.enabled` | If true, create pushgateway | `true`
-`pushgateway.name` | pushgateway container name | `pushgateway`
-`pushgateway.image.repository` | pushgateway container image repository | `prom/pushgateway`
-`pushgateway.image.tag` | pushgateway container image tag | `v0.5.2`
-`pushgateway.image.pullPolicy` | pushgateway container image pull policy | `IfNotPresent`
-`pushgateway.extraArgs` | Additional pushgateway container arguments | `{}`
-`pushgateway.ingress.enabled` | If true, pushgateway Ingress will be created | `false`
-`pushgateway.ingress.annotations` | pushgateway Ingress annotations | `{}`
-`pushgateway.ingress.hosts` | pushgateway Ingress hostnames | `[]`
-`pushgateway.ingress.tls` | pushgateway Ingress TLS configuration (YAML) | `[]`
-`pushgateway.nodeSelector` | node labels for pushgateway pod assignment | `{}`
-`pushgateway.podAnnotations` | annotations to be added to pushgateway pods | `{}`
-`pushgateway.tolerations` | node taints to tolerate (requires Kubernetes >=1.6) | `[]`
-`pushgateway.replicaCount` | desired number of pushgateway pods | `1`
-`pushgateway.priorityClassName` | pushgateway priorityClassName | `nil`
-`pushgateway.resources` | pushgateway pod resource requests & limits | `{}`
-`pushgateway.service.annotations` | annotations for pushgateway service | `{}`
-`pushgateway.service.clusterIP` | internal pushgateway cluster service IP | `""`
-`pushgateway.service.externalIPs` | pushgateway service external IP addresses | `[]`
-`pushgateway.service.loadBalancerIP` | IP address to assign to load balancer (if supported) | `""`
-`pushgateway.service.loadBalancerSourceRanges` | list of IP CIDRs allowed access to load balancer (if supported) | `[]`
-`pushgateway.service.servicePort` | pushgateway service port | `9091`
-`pushgateway.service.type` | type of pushgateway service to create | `ClusterIP`
-`rbac.create` | If true, create & use RBAC resources | `true`
-`server.name` | Prometheus server container name | `server`
-`server.image.repository` | Prometheus server container image repository | `prom/prometheus`
-`server.image.tag` | Prometheus server container image tag | `v2.3.2`
-`server.image.pullPolicy` | Prometheus server container image pull policy | `IfNotPresent`
-`server.enableAdminApi` |  If true, Prometheus administrative HTTP API will be enabled. Please note, that you should take care of administrative API access protection (ingress or some frontend Nginx with auth) before enabling it. | `false`
-`server.global.scrape_interval` | How frequently to scrape targets by default | `1m`
-`server.global.scrape_timeout` | How long until a scrape request times out | `10s`
-`server.global.evaluation_interval` | How frequently to evaluate rules | `1m`
-`server.extraArgs` | Additional Prometheus server container arguments | `{}`
-`server.prefixURL` | The prefix slug at which the server can be accessed | ``
-`server.baseURL` | The external url at which the server can be accessed | ``
-`server.extraHostPathMounts` | Additional Prometheus server hostPath mounts | `[]`
-`server.extraConfigmapMounts` | Additional Prometheus server configMap mounts | `[]`
-`server.extraSecretMounts` | Additional Prometheus server Secret mounts | `[]`
-`server.configMapOverrideName` | Prometheus server ConfigMap override where full-name is `{{.Release.Name}}-{{.Values.server.configMapOverrideName}}` and setting this value will prevent the default server ConfigMap from being generated | `""`
-`server.ingress.enabled` | If true, Prometheus server Ingress will be created | `false`
-`server.ingress.annotations` | Prometheus server Ingress annotations | `[]`
-`server.ingress.extraLabels` | Prometheus server Ingress additional labels | `{}`
-`server.ingress.hosts` | Prometheus server Ingress hostnames | `[]`
-`server.ingress.tls` | Prometheus server Ingress TLS configuration (YAML) | `[]`
-`server.nodeSelector` | node labels for Prometheus server pod assignment | `{}`
-`server.tolerations` | node taints to tolerate (requires Kubernetes >=1.6) | `[]`
-`server.affinity` | pod affinity | `{}`
-`server.priorityClassName` | Prometheus server priorityClassName | `nil`
-`server.schedulerName` | Prometheus server alternate scheduler name | `nil`
-`server.persistentVolume.enabled` | If true, Prometheus server will create a Persistent Volume Claim | `true`
-`server.persistentVolume.accessModes` | Prometheus server data Persistent Volume access modes | `[ReadWriteOnce]`
-`server.persistentVolume.annotations` | Prometheus server data Persistent Volume annotations | `{}`
-`server.persistentVolume.existingClaim` | Prometheus server data Persistent Volume existing claim name | `""`
-`server.persistentVolume.mountPath` | Prometheus server data Persistent Volume mount root path | `/data`
-`server.persistentVolume.size` | Prometheus server data Persistent Volume size | `8Gi`
-`server.persistentVolume.storageClass` | Prometheus server data Persistent Volume Storage Class |  `unset`
-`server.persistentVolume.subPath` | Subdirectory of Prometheus server data Persistent Volume to mount | `""`
-`server.podAnnotations` | annotations to be added to Prometheus server pods | `{}`
-`server.deploymentAnnotations` | annotations to be added to Prometheus server deployment | `{}'
-`server.replicaCount` | desired number of Prometheus server pods | `1`
-`server.resources` | Prometheus server resource requests and limits | `{}`
-`server.securityContext` | Custom [security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) for server containers | `{}`
-`server.service.annotations` | annotations for Prometheus server service | `{}`
-`server.service.clusterIP` | internal Prometheus server cluster service IP | `""`
-`server.service.externalIPs` | Prometheus server service external IP addresses | `[]`
-`server.service.loadBalancerIP` | IP address to assign to load balancer (if supported) | `""`
-`server.service.loadBalancerSourceRanges` | list of IP CIDRs allowed access to load balancer (if supported) | `[]`
-`server.service.nodePort` | Port to be used as the service NodePort (ignored if `server.service.type` is not `NodePort`) | `0`
-`server.service.servicePort` | Prometheus server service port | `80`
-`server.service.type` | type of Prometheus server service to create | `ClusterIP`
-`serviceAccounts.alertmanager.create` | If true, create the alertmanager service account | `true`
-`serviceAccounts.alertmanager.name` | name of the alertmanager service account to use or create | `{{ prometheus.alertmanager.fullname }}`
-`serviceAccounts.kubeStateMetrics.create` | If true, create the kubeStateMetrics service account | `true`
-`serviceAccounts.kubeStateMetrics.name` | name of the kubeStateMetrics service account to use or create | `{{ prometheus.kubeStateMetrics.fullname }}`
-`serviceAccounts.nodeExporter.create` | If true, create the nodeExporter service account | `true`
-`serviceAccounts.nodeExporter.name` | name of the nodeExporter service account to use or create | `{{ prometheus.nodeExporter.fullname }}`
-`serviceAccounts.pushgateway.create` | If true, create the pushgateway service account | `true`
-`serviceAccounts.pushgateway.name` | name of the pushgateway service account to use or create | `{{ prometheus.pushgateway.fullname }}`
-`serviceAccounts.server.create` | If true, create the server service account | `true`
-`serviceAccounts.server.name` | name of the server service account to use or create | `{{ prometheus.server.fullname }}`
-`server.terminationGracePeriodSeconds` | Prometheus server Pod termination grace period | `300`
-`server.retention` | (optional) Prometheus data retention | `""`
-`serverFiles.alerts` | Prometheus server alerts configuration | `{}`
-`serverFiles.rules` | Prometheus server rules configuration | `{}`
-`serverFiles.prometheus.yml` | Prometheus server scrape configuration | example configuration
-`networkPolicy.enabled` | Enable NetworkPolicy | `false` |
-
-Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
-
-```console
-$ helm install stable/prometheus --name my-release \
-    --set server.terminationGracePeriodSeconds=360
-```
-
-Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
-
-```console
-$ helm install stable/prometheus --name my-release -f values.yaml
-```
-
-> **Tip**: You can use the default [values.yaml](values.yaml)
-
-### RBAC Configuration
-Roles and RoleBindings resources will be created automatically for `server` and `kubeStateMetrics` services.
-
-To manually setup RBAC you need to set the parameter `rbac.create=false` and specify the service account to be used for each service by setting the parameters: `serviceAccounts.{{ component }}.create` to `false` and `serviceAccounts.{{ component }}.name` to the name of a pre-existing service account.
-
-> **Tip**: You can refer to the default `*-clusterrole.yaml` and `*-clusterrolebinding.yaml` files in [templates](templates/) to customize your own.
-
-### ConfigMap Files
-AlertManager is configured through [alertmanager.yml](https://prometheus.io/docs/alerting/configuration/). This file (and any others listed in `alertmanagerFiles`) will be mounted into the `alertmanager` pod.
-
-Prometheus is configured through [prometheus.yml](https://prometheus.io/docs/operating/configuration/). This file (and any others listed in `serverFiles`) will be mounted into the `server` pod.
-
-### Ingress TLS
-If your cluster allows automatic creation/retrieval of TLS certificates (e.g. [kube-lego](https://github.com/jetstack/kube-lego)), please refer to the documentation for that mechanism.
-
-To manually configure TLS, first create/retrieve a key & certificate pair for the address(es) you wish to protect. Then create a TLS secret in the namespace:
-
-```console
-kubectl create secret tls prometheus-server-tls --cert=path/to/tls.cert --key=path/to/tls.key
-```
-
-Include the secret's name, along with the desired hostnames, in the alertmanager/server Ingress TLS section of your custom `values.yaml` file:
-
-```yaml
-server:
-  ingress:
-    ## If true, Prometheus server Ingress will be created
-    ##
-    enabled: true
-
-    ## Prometheus server Ingress hostnames
-    ## Must be provided if Ingress is enabled
-    ##
-    hosts:
-      - prometheus.domain.com
-
-    ## Prometheus server Ingress TLS configuration
-    ## Secrets must be manually created in the namespace
-    ##
-    tls:
-      - secretName: prometheus-server-tls
-        hosts:
-          - prometheus.domain.com
-```
-
-### NetworkPolicy
-
-Enabling Network Policy for Prometheus will secure connections to Alert Manager
-and Kube State Metrics by only accepting connections from Prometheus Server.
-All inbound connections to Prometheus Server are still allowed.
-
-To enable network policy for Prometheus, install a networking plugin that
-implements the Kubernetes NetworkPolicy spec, and set `networkPolicy.enabled` to true.
-
-If NetworkPolicy is enabled for Prometheus' scrape targets, you may also need
-to manually create a networkpolicy which allows it.
@@ -1,100 +0,0 @@
-The Prometheus server can be accessed via port {{ .Values.server.service.servicePort }} on the following DNS name from within your cluster:
-{{ template "prometheus.server.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local
-
-{{ if .Values.server.ingress.enabled -}}
-From outside the cluster, the server URL(s) are:
-{{- range .Values.server.ingress.hosts }}
-http://{{ . }}
-{{- end }}
-{{- else }}
-Get the Prometheus server URL by running these commands in the same shell:
-{{- if contains "NodePort" .Values.server.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "prometheus.server.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.server.service.type }}
-  NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-        You can watch the status of by running 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "prometheus.server.fullname" . }}'
-
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "prometheus.server.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-  echo http://$SERVICE_IP:{{ .Values.server.service.servicePort }}
-{{- else if contains "ClusterIP"  .Values.server.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "prometheus.name" . }},component={{ .Values.server.name }}" -o jsonpath="{.items[0].metadata.name}")
-  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 9090
-{{- end }}
-{{- end }}
-
-{{- if .Values.server.persistentVolume.enabled }}
-{{- else }}
-#################################################################################
-######   WARNING: Persistence is disabled!!! You will lose your data when   #####
-######            the Server pod is terminated.                             #####
-#################################################################################
-{{- end }}
-
-{{ if .Values.alertmanager.enabled }}
-The Prometheus alertmanager can be accessed via port {{ .Values.alertmanager.service.servicePort }} on the following DNS name from within your cluster:
-{{ template "prometheus.alertmanager.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local
-
-{{ if .Values.alertmanager.ingress.enabled -}}
-From outside the cluster, the alertmanager URL(s) are:
-{{- range .Values.alertmanager.ingress.hosts }}
-http://{{ . }}
-{{- end }}
-{{- else }}
-Get the Alertmanager URL by running these commands in the same shell:
-{{- if contains "NodePort" .Values.alertmanager.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "prometheus.alertmanager.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.alertmanager.service.type }}
-  NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-        You can watch the status of by running 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "prometheus.alertmanager.fullname" . }}'
-
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "prometheus.alertmanager.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-  echo http://$SERVICE_IP:{{ .Values.alertmanager.service.servicePort }}
-{{- else if contains "ClusterIP"  .Values.alertmanager.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "prometheus.name" . }},component={{ .Values.alertmanager.name }}" -o jsonpath="{.items[0].metadata.name}")
-  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 9093
-{{- end }}
-{{- end }}
-
-{{- if .Values.alertmanager.persistentVolume.enabled }}
-{{- else }}
-#################################################################################
-######   WARNING: Persistence is disabled!!! You will lose your data when   #####
-######            the AlertManager pod is terminated.                       #####
-#################################################################################
-{{- end }}
-{{- end }}
-
-{{ if .Values.pushgateway.enabled }}
-The Prometheus PushGateway can be accessed via port {{ .Values.pushgateway.service.servicePort }} on the following DNS name from within your cluster:
-{{ template "prometheus.pushgateway.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local
-
-{{ if .Values.pushgateway.ingress.enabled -}}
-From outside the cluster, the pushgateway URL(s) are:
-{{- range .Values.pushgateway.ingress.hosts }}
-http://{{ . }}
-{{- end }}
-{{- else }}
-Get the PushGateway URL by running these commands in the same shell:
-{{- if contains "NodePort" .Values.pushgateway.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "prometheus.pushgateway.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.pushgateway.service.type }}
-  NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-        You can watch the status of by running 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "prometheus.pushgateway.fullname" . }}'
-
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "prometheus.pushgateway.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-  echo http://$SERVICE_IP:{{ .Values.pushgateway.service.servicePort }}
-{{- else if contains "ClusterIP"  .Values.pushgateway.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "prometheus.name" . }},component={{ .Values.pushgateway.name }}" -o jsonpath="{.items[0].metadata.name}")
-  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 9091
-{{- end }}
-{{- end }}
-{{- end }}
-
-For more information on running Prometheus, visit:
-https://prometheus.io/
@@ -1,176 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "prometheus.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "prometheus.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create a fully qualified alertmanager name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-
-{{- define "prometheus.alertmanager.fullname" -}}
-{{- if .Values.alertmanager.fullnameOverride -}}
-{{- .Values.alertmanager.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- printf "%s-%s" .Release.Name .Values.alertmanager.name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s-%s" .Release.Name $name .Values.alertmanager.name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create a fully qualified kube-state-metrics name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "prometheus.kubeStateMetrics.fullname" -}}
-{{- if .Values.kubeStateMetrics.fullnameOverride -}}
-{{- .Values.kubeStateMetrics.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- printf "%s-%s" .Release.Name .Values.kubeStateMetrics.name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s-%s" .Release.Name $name .Values.kubeStateMetrics.name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create a fully qualified node-exporter name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "prometheus.nodeExporter.fullname" -}}
-{{- if .Values.nodeExporter.fullnameOverride -}}
-{{- .Values.nodeExporter.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- printf "%s-%s" .Release.Name .Values.nodeExporter.name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s-%s" .Release.Name $name .Values.nodeExporter.name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create a fully qualified Prometheus server name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "prometheus.server.fullname" -}}
-{{- if .Values.server.fullnameOverride -}}
-{{- .Values.server.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- printf "%s-%s" .Release.Name .Values.server.name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s-%s" .Release.Name $name .Values.server.name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create a fully qualified pushgateway name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "prometheus.pushgateway.fullname" -}}
-{{- if .Values.pushgateway.fullnameOverride -}}
-{{- .Values.pushgateway.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- printf "%s-%s" .Release.Name .Values.pushgateway.name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s-%s" .Release.Name $name .Values.pushgateway.name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return the appropriate apiVersion for networkpolicy.
-*/}}
-{{- define "prometheus.networkPolicy.apiVersion" -}}
-{{- if semverCompare ">=1.4-0, <1.7-0" .Capabilities.KubeVersion.GitVersion -}}
-{{- print "extensions/v1beta1" -}}
-{{- else if semverCompare "^1.7-0" .Capabilities.KubeVersion.GitVersion -}}
-{{- print "networking.k8s.io/v1" -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use for the alertmanager component
-*/}}
-{{- define "prometheus.serviceAccountName.alertmanager" -}}
-{{- if .Values.serviceAccounts.alertmanager.create -}}
-    {{ default (include "prometheus.alertmanager.fullname" .) .Values.serviceAccounts.alertmanager.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccounts.alertmanager.name }}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use for the kubeStateMetrics component
-*/}}
-{{- define "prometheus.serviceAccountName.kubeStateMetrics" -}}
-{{- if .Values.serviceAccounts.kubeStateMetrics.create -}}
-    {{ default (include "prometheus.kubeStateMetrics.fullname" .) .Values.serviceAccounts.kubeStateMetrics.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccounts.kubeStateMetrics.name }}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use for the nodeExporter component
-*/}}
-{{- define "prometheus.serviceAccountName.nodeExporter" -}}
-{{- if .Values.serviceAccounts.nodeExporter.create -}}
-    {{ default (include "prometheus.nodeExporter.fullname" .) .Values.serviceAccounts.nodeExporter.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccounts.nodeExporter.name }}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use for the pushgateway component
-*/}}
-{{- define "prometheus.serviceAccountName.pushgateway" -}}
-{{- if .Values.serviceAccounts.pushgateway.create -}}
-    {{ default (include "prometheus.pushgateway.fullname" .) .Values.serviceAccounts.pushgateway.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccounts.pushgateway.name }}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use for the server component
-*/}}
-{{- define "prometheus.serviceAccountName.server" -}}
-{{- if .Values.serviceAccounts.server.create -}}
-    {{ default (include "prometheus.server.fullname" .) .Values.serviceAccounts.server.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccounts.server.name }}
-{{- end -}}
-{{- end -}}
@@ -1,18 +0,0 @@
-{{- if and .Values.alertmanager.enabled (empty .Values.alertmanager.configMapOverrideName) -}}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  labels:
-    app: {{ template "prometheus.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: "{{ .Values.alertmanager.name }}"
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: {{ template "prometheus.alertmanager.fullname" . }}
-data:
-{{- $root := . -}}
-{{- range $key, $value := .Values.alertmanagerFiles }}
-  {{ $key }}: |
-{{ toYaml $value | default "{}" | indent 4 }}
-{{- end -}}
-{{- end -}}
@@ -1,115 +0,0 @@
-{{- if .Values.alertmanager.enabled -}}
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  labels:
-    app: {{ template "prometheus.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: "{{ .Values.alertmanager.name }}"
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: {{ template "prometheus.alertmanager.fullname" . }}
-spec:
-  replicas: {{ .Values.alertmanager.replicaCount }}
-  {{- if .Values.server.strategy }}
-  strategy:
-{{ toYaml .Values.server.strategy | indent 4 }}
-  {{- end }}
-  template:
-    metadata:
-    {{- if .Values.alertmanager.podAnnotations }}
-      annotations:
-{{ toYaml .Values.alertmanager.podAnnotations | indent 8 }}
-    {{- end }}
-      labels:
-        app: {{ template "prometheus.name" . }}
-        component: "{{ .Values.alertmanager.name }}"
-        release: {{ .Release.Name }}
-    spec:
-{{- if .Values.alertmanager.affinity }}
-      affinity:
-{{ toYaml .Values.alertmanager.affinity | indent 8 }}
-{{- end }}
-{{- if .Values.alertmanager.schedulerName }}
-      schedulerName: "{{ .Values.alertmanager.schedulerName }}"
-{{- end }}
-      serviceAccountName: {{ template "prometheus.serviceAccountName.alertmanager" . }}
-{{- if .Values.alertmanager.priorityClassName }}
-      priorityClassName: "{{ .Values.alertmanager.priorityClassName }}"
-{{- end }}
-      containers:
-        - name: {{ template "prometheus.name" . }}-{{ .Values.alertmanager.name }}
-          image: "{{ .Values.alertmanager.image.repository }}:{{ .Values.alertmanager.image.tag }}"
-          imagePullPolicy: "{{ .Values.alertmanager.image.pullPolicy }}"
-          env:
-            {{- range $key, $value := .Values.alertmanager.extraEnv }}
-            - name: {{ $key }}
-              value: {{ $value }}
-            {{- end }}
-          args:
-            - --config.file=/etc/config/alertmanager.yml
-            - --storage.path={{ .Values.alertmanager.persistentVolume.mountPath }}
-          {{- range $key, $value := .Values.alertmanager.extraArgs }}
-            - --{{ $key }}={{ $value }}
-          {{- end }}
-          {{- if .Values.alertmanager.baseURL }}
-            - --web.external-url={{ .Values.alertmanager.baseURL }}
-          {{- end }}
-
-          ports:
-            - containerPort: 9093
-          readinessProbe:
-            httpGet:
-              path: {{ .Values.alertmanager.prefixURL }}/#/status
-              port: 9093
-            initialDelaySeconds: 30
-            timeoutSeconds: 30
-          resources:
-{{ toYaml .Values.alertmanager.resources | indent 12 }}
-          volumeMounts:
-            - name: config-volume
-              mountPath: /etc/config
-            - name: storage-volume
-              mountPath: "{{ .Values.alertmanager.persistentVolume.mountPath }}"
-              subPath: "{{ .Values.alertmanager.persistentVolume.subPath }}"
-
-        - name: {{ template "prometheus.name" . }}-{{ .Values.alertmanager.name }}-{{ .Values.configmapReload.name }}
-          image: "{{ .Values.configmapReload.image.repository }}:{{ .Values.configmapReload.image.tag }}"
-          imagePullPolicy: "{{ .Values.configmapReload.image.pullPolicy }}"
-          args:
-            - --volume-dir=/etc/config
-            - --webhook-url=http://localhost:9093{{ .Values.alertmanager.prefixURL }}/-/reload
-          resources:
-{{ toYaml .Values.configmapReload.resources | indent 12 }}
-          volumeMounts:
-            - name: config-volume
-              mountPath: /etc/config
-              readOnly: true
-    {{- if .Values.alertmanager.nodeSelector }}
-      nodeSelector:
-{{ toYaml .Values.alertmanager.nodeSelector | indent 8 }}
-    {{- end }}
-    {{- if .Values.alertmanager.securityContext }}
-      securityContext:
-{{ toYaml .Values.alertmanager.securityContext | indent 8 }}
-    {{- end }}
-    {{- if .Values.alertmanager.tolerations }}
-      tolerations:
-{{ toYaml .Values.alertmanager.tolerations | indent 8 }}
-    {{- end }}
-    {{- if .Values.alertmanager.affinity }}
-      affinity:
-{{ toYaml .Values.alertmanager.affinity | indent 8 }}
-    {{- end }}
-      volumes:
-        - name: config-volume
-          configMap:
-            name: {{ if .Values.alertmanager.configMapOverrideName }}{{ .Release.Name }}-{{ .Values.alertmanager.configMapOverrideName }}{{- else }}{{ template "prometheus.alertmanager.fullname" . }}{{- end }}
-        - name: storage-volume
-        {{- if .Values.alertmanager.persistentVolume.enabled }}
-          persistentVolumeClaim:
-            claimName: {{ if .Values.alertmanager.persistentVolume.existingClaim }}{{ .Values.alertmanager.persistentVolume.existingClaim }}{{- else }}{{ template "prometheus.alertmanager.fullname" . }}{{- end }}
-        {{- else }}
-          emptyDir: {}
-        {{- end -}}
-{{- end }}
@@ -1,38 +0,0 @@
-{{- if and .Values.alertmanager.enabled .Values.alertmanager.ingress.enabled -}}
-{{- $releaseName := .Release.Name -}}
-{{- $serviceName := include "prometheus.alertmanager.fullname" . }}
-{{- $servicePort := .Values.alertmanager.service.servicePort -}}
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-{{- if .Values.alertmanager.ingress.annotations }}
-  annotations:
-{{ toYaml .Values.alertmanager.ingress.annotations | indent 4 }}
-{{- end }}
-  labels:
-    app: {{ template "prometheus.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: "{{ .Values.alertmanager.name }}"
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-{{- range $key, $value := .Values.alertmanager.ingress.extraLabels }}
-    {{ $key }}: {{ $value }}
-{{- end }}
-  name: {{ template "prometheus.alertmanager.fullname" . }}
-spec:
-  rules:
-  {{- range .Values.alertmanager.ingress.hosts }}
-    {{- $url := splitList "/" . }}
-    - host: {{ first $url }}
-      http:
-        paths:
-          - path: /{{ rest $url | join "/" }}
-            backend:
-              serviceName: {{ $serviceName }}
-              servicePort: {{ $servicePort }}
-  {{- end -}}
-{{- if .Values.alertmanager.ingress.tls }}
-  tls:
-{{ toYaml .Values.alertmanager.ingress.tls | indent 4 }}
-  {{- end -}}
-{{- end -}}
@@ -1,26 +0,0 @@
-{{- if .Values.networkPolicy.enabled }}
-apiVersion: {{ template "prometheus.networkPolicy.apiVersion" . }}
-kind: NetworkPolicy
-metadata:
-  name: {{ template "prometheus.alertmanager.fullname" . }}
-  labels:
-    app: {{ template "prometheus.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: "{{ .Values.alertmanager.name }}"
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-spec:
-  podSelector:
-    matchLabels:
-      app: {{ template "prometheus.name" . }}
-      component: "{{ .Values.alertmanager.name }}"
-      release: {{ .Release.Name }}
-  ingress:
-    - from:
-      - podSelector:
-          matchLabels:
-            release: {{ .Release.Name }}
-            component: "{{ .Values.server.name }}"
-    - ports:
-      - port: 9093
-{{- end }}
@@ -1,31 +0,0 @@
-{{- if and .Values.alertmanager.enabled .Values.alertmanager.persistentVolume.enabled -}}
-{{- if not .Values.alertmanager.persistentVolume.existingClaim -}}
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  {{- if .Values.alertmanager.persistentVolume.annotations }}
-  annotations:
-{{ toYaml .Values.alertmanager.persistentVolume.annotations | indent 4 }}
-  {{- end }}
-  labels:
-    app: {{ template "prometheus.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: "{{ .Values.alertmanager.name }}"
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: {{ template "prometheus.alertmanager.fullname" . }}
-spec:
-  accessModes:
-{{ toYaml .Values.alertmanager.persistentVolume.accessModes | indent 4 }}
-{{- if .Values.alertmanager.persistentVolume.storageClass }}
-{{- if (eq "-" .Values.alertmanager.persistentVolume.storageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: "{{ .Values.alertmanager.persistentVolume.storageClass }}"
-{{- end }}
-{{- end }}
-  resources:
-    requests:
-      storage: "{{ .Values.alertmanager.persistentVolume.size }}"
-{{- end -}}
-{{- end -}}
@@ -1,55 +0,0 @@
-{{- if .Values.alertmanager.enabled -}}
-apiVersion: v1
-kind: Service
-metadata:
-{{- if .Values.alertmanager.service.annotations }}
-  annotations:
-{{ toYaml .Values.alertmanager.service.annotations | indent 4 }}
-{{- end }}
-  labels:
-    app: {{ template "prometheus.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: "{{ .Values.alertmanager.name }}"
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-{{- if .Values.alertmanager.service.labels }}
-{{ toYaml .Values.alertmanager.service.labels | indent 4 }}
-{{- end }}
-  name: {{ template "prometheus.alertmanager.fullname" . }}
-spec:
-{{- if .Values.alertmanager.service.clusterIP }}
-  clusterIP: {{ .Values.alertmanager.service.clusterIP }}
-{{- end }}
-{{- if .Values.alertmanager.service.externalIPs }}
-  externalIPs:
-{{ toYaml .Values.alertmanager.service.externalIPs | indent 4 }}
-{{- end }}
-{{- if .Values.alertmanager.service.loadBalancerIP }}
-  loadBalancerIP: {{ .Values.alertmanager.service.loadBalancerIP }}
-{{- end }}
-{{- if .Values.alertmanager.service.loadBalancerSourceRanges }}
-  loadBalancerSourceRanges:
-  {{- range $cidr := .Values.alertmanager.service.loadBalancerSourceRanges }}
-    - {{ $cidr }}
-  {{- end }}
-{{- end }}
-  ports:
-    - name: http
-      port: {{ .Values.alertmanager.service.servicePort }}
-      protocol: TCP
-      targetPort: 9093
-    {{- if .Values.alertmanager.service.nodePort }}
-      nodePort: {{ .Values.alertmanager.service.nodePort }}
-    {{- end }}
-{{- if .Values.alertmanager.service.enableMeshPeer }}
-    - name: meshpeer
-      port: 6783
-      protocol: TCP
-      targetPort: 6783
-{{- end }}
-  selector:
-    app: {{ template "prometheus.name" . }}
-    component: "{{ .Values.alertmanager.name }}"
-    release: {{ .Release.Name }}
-  type: "{{ .Values.alertmanager.service.type }}"
-{{- end }}
@@ -1,12 +0,0 @@
-{{- if .Values.serviceAccounts.alertmanager.create }}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  labels:
-    app: {{ template "prometheus.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: "{{ .Values.alertmanager.name }}"
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: {{ template "prometheus.serviceAccountName.alertmanager" . }}
-{{- end }}
@@ -1,64 +0,0 @@
-{{- if .Values.rbac.create }}
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: ClusterRole
-metadata:
-  labels:
-    app: {{ template "prometheus.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: "{{ .Values.kubeStateMetrics.name }}"
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: {{ template "prometheus.kubeStateMetrics.fullname" . }}
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - namespaces
-      - nodes
-      - persistentvolumeclaims
-      - pods
-      - services
-      - resourcequotas
-      - replicationcontrollers
-      - limitranges
-      - persistentvolumeclaims
-      - persistentvolumes
-      - endpoints
-      - secrets
-      - configmaps
-    verbs:
-      - list
-      - watch
-  - apiGroups:
-      - extensions
-    resources:
-      - daemonsets
-      - deployments
-      - replicasets
-    verbs:
-      - list
-      - watch
-  - apiGroups:
-      - apps
-    resources:
-      - statefulsets
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - batch
-    resources:
-      - cronjobs
-      - jobs
-    verbs:
-      - list
-      - watch
-  - apiGroups:
-      - autoscaling
-    resources:
-      - horizontalpodautoscalers
-    verbs:
-      - list
-      - watch
-{{- end }}
@@ -1,20 +0,0 @@
-{{- if .Values.rbac.create }}
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: ClusterRoleBinding
-metadata:
-  labels:
-    app: {{ template "prometheus.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: "{{ .Values.kubeStateMetrics.name }}"
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: {{ template "prometheus.kubeStateMetrics.fullname" . }}
-subjects:
-  - kind: ServiceAccount
-    name: {{ template "prometheus.serviceAccountName.kubeStateMetrics" . }}
-    namespace: {{ .Release.Namespace }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: {{ template "prometheus.kubeStateMetrics.fullname" . }}
-{{- end }}
@@ -1,67 +0,0 @@
-{{- if .Values.kubeStateMetrics.enabled -}}
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-{{- if .Values.kubeStateMetrics.deploymentAnnotations }}
-  annotations:
-{{ toYaml .Values.kubeStateMetrics.deploymentAnnotations | indent 4 }}
-{{- end }}
-  labels:
-    app: {{ template "prometheus.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: "{{ .Values.kubeStateMetrics.name }}"
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: {{ template "prometheus.kubeStateMetrics.fullname" . }}
-spec:
-  replicas: {{ .Values.kubeStateMetrics.replicaCount }}
-  template:
-    metadata:
-    {{- if .Values.kubeStateMetrics.podAnnotations }}
-      annotations:
-{{ toYaml .Values.kubeStateMetrics.podAnnotations | indent 8 }}
-    {{- end }}
-      labels:
-        app: {{ template "prometheus.name" . }}
-        component: "{{ .Values.kubeStateMetrics.name }}"
-        release: {{ .Release.Name }}
-{{- if .Values.kubeStateMetrics.pod.labels }}
-{{ toYaml .Values.kubeStateMetrics.pod.labels | indent 8 }}
-{{- end }}
-    spec:
-      serviceAccountName: {{ template "prometheus.serviceAccountName.kubeStateMetrics" . }}
-{{- if .Values.kubeStateMetrics.priorityClassName }}
-      priorityClassName: "{{ .Values.kubeStateMetrics.priorityClassName }}"
-{{- end }}
-      containers:
-        - name: {{ template "prometheus.name" . }}-{{ .Values.kubeStateMetrics.name }}
-          image: "{{ .Values.kubeStateMetrics.image.repository }}:{{ .Values.kubeStateMetrics.image.tag }}"
-          imagePullPolicy: "{{ .Values.kubeStateMetrics.image.pullPolicy }}"
-        {{- if .Values.kubeStateMetrics.args }}
-          args:
-          {{- range $key, $value := .Values.kubeStateMetrics.args }}
-            - --{{ $key }}={{ $value }}
-          {{- end }}
-        {{- end }}
-          ports:
-            - name: metrics
-              containerPort: 8080
-          resources:
-{{ toYaml .Values.kubeStateMetrics.resources | indent 12 }}
-    {{- if .Values.kubeStateMetrics.nodeSelector }}
-      nodeSelector:
-{{ toYaml .Values.kubeStateMetrics.nodeSelector | indent 8 }}
-    {{- end }}
-    {{- if .Values.kubeStateMetrics.securityContext }}
-      securityContext:
-{{ toYaml .Values.kubeStateMetrics.securityContext | indent 8 }}
-    {{- end }}
-    {{- if .Values.kubeStateMetrics.tolerations }}
-      tolerations:
-{{ toYaml .Values.kubeStateMetrics.tolerations | indent 8 }}
-    {{- end }}
-    {{- if .Values.kubeStateMetrics.affinity }}
-      affinity:
-{{ toYaml .Values.kubeStateMetrics.affinity | indent 8 }}
-    {{- end }}
-{{- end }}
@@ -1,26 +0,0 @@
-{{- if .Values.networkPolicy.enabled }}
-apiVersion: {{ template "prometheus.networkPolicy.apiVersion" . }}
-kind: NetworkPolicy
-metadata:
-  name: {{ template "prometheus.kubeStateMetrics.fullname" . }}
-  labels:
-    app: {{ template "prometheus.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: "{{ .Values.kubeStateMetrics.name }}"
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-spec:
-  podSelector:
-    matchLabels:
-      app: {{ template "prometheus.name" . }}
-      component: "{{ .Values.kubeStateMetrics.name }}"
-      release: {{ .Release.Name }}
-  ingress:
-  - from:
-    - podSelector:
-        matchLabels:
-          release: {{ .Release.Name }}
-          component: "{{ .Values.server.name }}"
-  - ports:
-    - port: 8080
-{{- end }}
@@ -1,12 +0,0 @@
-{{- if .Values.serviceAccounts.kubeStateMetrics.create }}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  labels:
-    app: {{ template "prometheus.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: "{{ .Values.kubeStateMetrics.name }}"
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: {{ template "prometheus.serviceAccountName.kubeStateMetrics" . }}
-{{- end }}
@@ -1,46 +0,0 @@
-{{- if .Values.kubeStateMetrics.enabled -}}
-apiVersion: v1
-kind: Service
-metadata:
-{{- if .Values.kubeStateMetrics.service.annotations }}
-  annotations:
-{{ toYaml .Values.kubeStateMetrics.service.annotations | indent 4 }}
-{{- end }}
-  labels:
-    app: {{ template "prometheus.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: "{{ .Values.kubeStateMetrics.name }}"
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-{{- if .Values.kubeStateMetrics.service.labels }}
-{{ toYaml .Values.kubeStateMetrics.service.labels | indent 4 }}
-{{- end }}
-  name: {{ template "prometheus.kubeStateMetrics.fullname" . }}
-spec:
-{{- if .Values.kubeStateMetrics.service.clusterIP }}
-  clusterIP: {{ .Values.kubeStateMetrics.service.clusterIP }}
-{{- end }}
-{{- if .Values.kubeStateMetrics.service.externalIPs }}
-  externalIPs:
-{{ toYaml .Values.kubeStateMetrics.service.externalIPs | indent 4 }}
-{{- end }}
-{{- if .Values.kubeStateMetrics.service.loadBalancerIP }}
-  loadBalancerIP: {{ .Values.kubeStateMetrics.service.loadBalancerIP }}
-{{- end }}
-{{- if .Values.kubeStateMetrics.service.loadBalancerSourceRanges }}
-  loadBalancerSourceRanges:
-  {{- range $cidr := .Values.kubeStateMetrics.service.loadBalancerSourceRanges }}
-    - {{ $cidr }}
-  {{- end }}
-{{- end }}
-  ports:
-    - name: http
-      port: {{ .Values.kubeStateMetrics.service.servicePort }}
-      protocol: TCP
-      targetPort: 8080
-  selector:
-    app: {{ template "prometheus.name" . }}
-    component: "{{ .Values.kubeStateMetrics.name }}"
-    release: {{ .Release.Name }}
-  type: "{{ .Values.kubeStateMetrics.service.type }}"
-{{- end }}
@@ -1,108 +0,0 @@
-{{- if .Values.nodeExporter.enabled -}}
-apiVersion: extensions/v1beta1
-kind: DaemonSet
-metadata:
-{{- if .Values.nodeExporter.deploymentAnnotations }}
-  annotations:
-{{ toYaml .Values.nodeExporter.deploymentAnnotations | indent 4 }}
-{{- end }}
-  labels:
-    app: {{ template "prometheus.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: "{{ .Values.nodeExporter.name }}"
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: {{ template "prometheus.nodeExporter.fullname" . }}
-spec:
-  {{- if .Values.nodeExporter.updateStrategy }}
-  updateStrategy:
-{{ toYaml .Values.nodeExporter.updateStrategy | indent 4 }}
-  {{- end }}
-  template:
-    metadata:
-    {{- if .Values.nodeExporter.podAnnotations }}
-      annotations:
-{{ toYaml .Values.nodeExporter.podAnnotations | indent 8 }}
-    {{- end }}
-      labels:
-        app: {{ template "prometheus.name" . }}
-        component: "{{ .Values.nodeExporter.name }}"
-        release: {{ .Release.Name }}
-{{- if .Values.nodeExporter.pod.labels }}
-{{ toYaml .Values.nodeExporter.pod.labels | indent 8 }}
-{{- end }}
-    spec:
-      serviceAccountName: {{ template "prometheus.serviceAccountName.nodeExporter" . }}
-{{- if .Values.nodeExporter.priorityClassName }}
-      priorityClassName: "{{ .Values.nodeExporter.priorityClassName }}"
-{{- end }}
-      containers:
-        - name: {{ template "prometheus.name" . }}-{{ .Values.nodeExporter.name }}
-          image: "{{ .Values.nodeExporter.image.repository }}:{{ .Values.nodeExporter.image.tag }}"
-          imagePullPolicy: "{{ .Values.nodeExporter.image.pullPolicy }}"
-          args:
-            - --path.procfs=/host/proc
-            - --path.sysfs=/host/sys
-          {{- range $key, $value := .Values.nodeExporter.extraArgs }}
-          {{- if $value }}
-            - --{{ $key }}={{ $value }}
-          {{- else }}
-            - --{{ $key }}
-          {{- end }}
-          {{- end }}
-          ports:
-            - name: metrics
-              containerPort: 9100
-              hostPort: {{ .Values.nodeExporter.service.hostPort }}
-          resources:
-{{ toYaml .Values.nodeExporter.resources | indent 12 }}
-          volumeMounts:
-            - name: proc
-              mountPath: /host/proc
-              readOnly:  true
-            - name: sys
-              mountPath: /host/sys
-              readOnly: true
-          {{- range .Values.nodeExporter.extraHostPathMounts }}
-            - name: {{ .name }}
-              mountPath: {{ .mountPath }}
-              readOnly: {{ .readOnly }}
-          {{- end }}
-          {{- range .Values.nodeExporter.extraConfigmapMounts }}
-            - name: {{ .name }}
-              mountPath: {{ .mountPath }}
-              readOnly: {{ .readOnly }}
-          {{- end }}
-      hostNetwork: true
-      hostPID: true
-    {{- if .Values.nodeExporter.tolerations }}
-      tolerations:
-{{ toYaml .Values.nodeExporter.tolerations | indent 8 }}
-    {{- end }}
-    {{- if .Values.nodeExporter.nodeSelector }}
-      nodeSelector:
-{{ toYaml .Values.nodeExporter.nodeSelector | indent 8 }}
-    {{- end }}
-    {{- if .Values.nodeExporter.securityContext }}
-      securityContext:
-{{ toYaml .Values.nodeExporter.securityContext | indent 8 }}
-    {{- end }}
-      volumes:
-        - name: proc
-          hostPath:
-            path: /proc
-        - name: sys
-          hostPath:
-            path: /sys
-      {{- range .Values.nodeExporter.extraHostPathMounts }}
-        - name: {{ .name }}
-          hostPath:
-            path: {{ .hostPath }}
-      {{- end }}
-      {{- range .Values.nodeExporter.extraConfigmapMounts }}
-        - name: {{ .name }}
-          configMap:
-            name: {{ .configMap }}
-      {{- end }}
-
-{{- end -}}
@@ -1,46 +0,0 @@
-{{- if .Values.nodeExporter.enabled -}}
-apiVersion: v1
-kind: Service
-metadata:
-{{- if .Values.nodeExporter.service.annotations }}
-  annotations:
-{{ toYaml .Values.nodeExporter.service.annotations | indent 4 }}
-{{- end }}
-  labels:
-    app: {{ template "prometheus.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: "{{ .Values.nodeExporter.name }}"
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-{{- if .Values.nodeExporter.service.labels }}
-{{ toYaml .Values.nodeExporter.service.labels | indent 4 }}
-{{- end }}
-  name: {{ template "prometheus.nodeExporter.fullname" . }}
-spec:
-{{- if .Values.nodeExporter.service.clusterIP }}
-  clusterIP: {{ .Values.nodeExporter.service.clusterIP }}
-{{- end }}
-{{- if .Values.nodeExporter.service.externalIPs }}
-  externalIPs:
-{{ toYaml .Values.nodeExporter.service.externalIPs | indent 4 }}
-{{- end }}
-{{- if .Values.nodeExporter.service.loadBalancerIP }}
-  loadBalancerIP: {{ .Values.nodeExporter.service.loadBalancerIP }}
-{{- end }}
-{{- if .Values.nodeExporter.service.loadBalancerSourceRanges }}
-  loadBalancerSourceRanges:
-  {{- range $cidr := .Values.nodeExporter.service.loadBalancerSourceRanges }}
-    - {{ $cidr }}
-  {{- end }}
-{{- end }}
-  ports:
-    - name: metrics
-      port: {{ .Values.nodeExporter.service.servicePort }}
-      protocol: TCP
-      targetPort: 9100
-  selector:
-    app: {{ template "prometheus.name" . }}
-    component: "{{ .Values.nodeExporter.name }}"
-    release: {{ .Release.Name }}
-  type: "{{ .Values.nodeExporter.service.type }}"
-{{- end -}}
@@ -1,12 +0,0 @@
-{{- if .Values.serviceAccounts.nodeExporter.create }}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  labels:
-    app: {{ template "prometheus.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: "{{ .Values.nodeExporter.name }}"
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: {{ template "prometheus.serviceAccountName.nodeExporter" . }}
-{{- end }}
@@ -1,67 +0,0 @@
-{{- if .Values.pushgateway.enabled -}}
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  labels:
-    app: {{ template "prometheus.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: "{{ .Values.pushgateway.name }}"
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: {{ template "prometheus.pushgateway.fullname" . }}
-spec:
-  replicas: {{ .Values.pushgateway.replicaCount }}
-  template:
-    metadata:
-    {{- if .Values.pushgateway.podAnnotations }}
-      annotations:
-{{ toYaml .Values.pushgateway.podAnnotations | indent 8 }}
-    {{- end }}
-      labels:
-        app: {{ template "prometheus.name" . }}
-        component: "{{ .Values.pushgateway.name }}"
-        release: {{ .Release.Name }}
-    spec:
-      serviceAccountName: {{ template "prometheus.serviceAccountName.pushgateway" . }}
-{{- if .Values.pushgateway.priorityClassName }}
-      priorityClassName: "{{ .Values.pushgateway.priorityClassName }}"
-{{- end }}
-      containers:
-        - name: {{ template "prometheus.name" . }}-{{ .Values.pushgateway.name }}
-          image: "{{ .Values.pushgateway.image.repository }}:{{ .Values.pushgateway.image.tag }}"
-          imagePullPolicy: "{{ .Values.pushgateway.image.pullPolicy }}"
-          args:
-          {{- range $key, $value := .Values.pushgateway.extraArgs }}
-            - --{{ $key }}={{ $value }}
-          {{- end }}
-          ports:
-            - containerPort: 9091
-          readinessProbe:
-            httpGet:
-            {{- if (index .Values "pushgateway" "extraArgs" "web.route-prefix") }}
-              path: /{{ index .Values "pushgateway" "extraArgs" "web.route-prefix" }}/#/status
-            {{- else }}
-              path: /#/status
-            {{- end }}
-              port: 9091
-            initialDelaySeconds: 10
-            timeoutSeconds: 10
-          resources:
-{{ toYaml .Values.pushgateway.resources | indent 12 }}
-    {{- if .Values.pushgateway.nodeSelector }}
-      nodeSelector:
-{{ toYaml .Values.pushgateway.nodeSelector | indent 8 }}
-    {{- end }}
-    {{- if .Values.pushgateway.securityContext }}
-      securityContext:
-{{ toYaml .Values.pushgateway.securityContext | indent 8 }}
-    {{- end }}
-    {{- if .Values.pushgateway.tolerations }}
-      tolerations:
-{{ toYaml .Values.pushgateway.tolerations | indent 8 }}
-    {{- end }}
-    {{- if .Values.pushgateway.affinity }}
-      affinity:
-{{ toYaml .Values.pushgateway.affinity | indent 8 }}
-    {{- end }}
-{{- end }}
@@ -1,35 +0,0 @@
-{{- if and .Values.pushgateway.enabled .Values.pushgateway.ingress.enabled -}}
-{{- $releaseName := .Release.Name -}}
-{{- $serviceName := include "prometheus.pushgateway.fullname" . }}
-{{- $servicePort := .Values.pushgateway.service.servicePort -}}
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-{{- if .Values.pushgateway.ingress.annotations }}
-  annotations:
-{{ toYaml .Values.pushgateway.ingress.annotations | indent 4}}
-{{- end }}
-  labels:
-    app: {{ template "prometheus.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: "{{ .Values.pushgateway.name }}"
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: {{ template "prometheus.pushgateway.fullname" . }}
-spec:
-  rules:
-  {{- range .Values.pushgateway.ingress.hosts }}
-    {{- $url := splitList "/" . }}
-    - host: {{ first $url }}
-      http:
-        paths:
-          - path: /{{ rest $url | join "/" }}
-            backend:
-              serviceName: {{ $serviceName }}
-              servicePort: {{ $servicePort }}
-  {{- end -}}
-{{- if .Values.pushgateway.ingress.tls }}
-  tls:
-{{ toYaml .Values.pushgateway.ingress.tls | indent 4 }}
-  {{- end -}}
-{{- end -}}
@@ -1,46 +0,0 @@
-{{- if .Values.pushgateway.enabled -}}
-apiVersion: v1
-kind: Service
-metadata:
-{{- if .Values.pushgateway.service.annotations }}
-  annotations:
-{{ toYaml .Values.pushgateway.service.annotations | indent 4}}
-{{- end }}
-  labels:
-    app: {{ template "prometheus.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: "{{ .Values.pushgateway.name }}"
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-{{- if .Values.pushgateway.service.labels }}
-{{ toYaml .Values.pushgateway.service.labels | indent 4}}
-{{- end }}
-  name: {{ template "prometheus.pushgateway.fullname" . }}
-spec:
-{{- if .Values.pushgateway.service.clusterIP }}
-  clusterIP: {{ .Values.pushgateway.service.clusterIP }}
-{{- end }}
-{{- if .Values.pushgateway.service.externalIPs }}
-  externalIPs:
-{{ toYaml .Values.pushgateway.service.externalIPs | indent 4 }}
-{{- end }}
-{{- if .Values.pushgateway.service.loadBalancerIP }}
-  loadBalancerIP: {{ .Values.pushgateway.service.loadBalancerIP }}
-{{- end }}
-{{- if .Values.pushgateway.service.loadBalancerSourceRanges }}
-  loadBalancerSourceRanges:
-  {{- range $cidr := .Values.pushgateway.service.loadBalancerSourceRanges }}
-    - {{ $cidr }}
-  {{- end }}
-{{- end }}
-  ports:
-    - name: http
-      port: {{ .Values.pushgateway.service.servicePort }}
-      protocol: TCP
-      targetPort: 9091
-  selector:
-    app: {{ template "prometheus.name" . }}
-    component: "{{ .Values.pushgateway.name }}"
-    release: {{ .Release.Name }}
-  type: "{{ .Values.pushgateway.service.type }}"
-{{- end }}
@@ -1,12 +0,0 @@
-{{- if .Values.serviceAccounts.pushgateway.create }}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  labels:
-    app: {{ template "prometheus.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: "{{ .Values.pushgateway.name }}"
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: {{ template "prometheus.serviceAccountName.pushgateway" . }}
-{{- end }}
@@ -1,45 +0,0 @@
-{{- if .Values.rbac.create }}
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: ClusterRole
-metadata:
-  labels:
-    app: {{ template "prometheus.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: "{{ .Values.server.name }}"
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: {{ template "prometheus.server.fullname" . }}
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - nodes
-      - nodes/proxy
-      - services
-      - endpoints
-      - pods
-      - ingresses
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - ""
-    resources:
-      - configmaps
-    verbs:
-      - get
-  - apiGroups:
-      - "extensions"
-    resources:
-      - ingresses/status
-      - ingresses
-    verbs:
-      - get
-      - list
-      - watch
-  - nonResourceURLs:
-      - "/metrics"
-    verbs:
-      - get
-{{- end }}
@@ -1,20 +0,0 @@
-{{- if .Values.rbac.create }}
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: ClusterRoleBinding
-metadata:
-  labels:
-    app: {{ template "prometheus.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: "{{ .Values.server.name }}"
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: {{ template "prometheus.server.fullname" . }}
-subjects:
-  - kind: ServiceAccount
-    name: {{ template "prometheus.serviceAccountName.server" . }}
-    namespace: {{ .Release.Namespace }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: {{ template "prometheus.server.fullname" . }}
-{{- end }}
@@ -1,49 +0,0 @@
-{{- if (empty .Values.server.configMapOverrideName) -}}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  labels:
-    app: {{ template "prometheus.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: "{{ .Values.server.name }}"
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: {{ template "prometheus.server.fullname" . }}
-data:
-{{- $root := . -}}
-{{- range $key, $value := .Values.serverFiles }}
-  {{ $key }}: |
-{{- if eq $key "prometheus.yml" }}
-    global:
-{{ $root.Values.server.global | toYaml | indent 6 }}
-{{- end }}
-{{ toYaml $value | default "{}" | indent 4 }}
-{{- if eq $key "prometheus.yml" -}}
-{{- if $root.Values.alertmanager.enabled }}
-    alerting:
-      alertmanagers:
-      - kubernetes_sd_configs:
-          - role: pod
-        tls_config:
-          ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
-        bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
-        {{- if $root.Values.alertmanager.prefixURL }}
-        path_prefix: {{ $root.Values.alertmanager.prefixURL }}
-        {{- end }}
-        relabel_configs:
-        - source_labels: [__meta_kubernetes_namespace]
-          regex: {{ $root.Release.Namespace }}
-          action: keep
-        - source_labels: [__meta_kubernetes_pod_label_app]
-          regex: prometheus
-          action: keep
-        - source_labels: [__meta_kubernetes_pod_label_component]
-          regex: alertmanager
-          action: keep
-        - source_labels: [__meta_kubernetes_pod_container_port_number]
-          regex:
-          action: drop
-{{- end -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
@@ -1,189 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-{{- if .Values.server.deploymentAnnotations }}
-  annotations:
-{{ toYaml .Values.server.deploymentAnnotations | indent 4 }}
-{{- end }}
-  labels:
-    app: {{ template "prometheus.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: "{{ .Values.server.name }}"
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: {{ template "prometheus.server.fullname" . }}
-spec:
-  replicas: {{ .Values.server.replicaCount }}
-  {{- if .Values.server.strategy }}
-  strategy:
-{{ toYaml .Values.server.strategy | indent 4 }}
-  {{- end }}
-  template:
-    metadata:
-    {{- if .Values.server.podAnnotations }}
-      annotations:
-{{ toYaml .Values.server.podAnnotations | indent 8 }}
-    {{- end }}
-      labels:
-        app: {{ template "prometheus.name" . }}
-        component: "{{ .Values.server.name }}"
-        release: {{ .Release.Name }}
-    spec:
-{{- if .Values.server.affinity }}
-      affinity:
-{{ toYaml .Values.server.affinity | indent 8 }}
-{{- end }}
-{{- if .Values.server.priorityClassName }}
-      priorityClassName: "{{ .Values.server.priorityClassName }}"
-{{- end }}
-{{- if .Values.server.schedulerName }}
-      schedulerName: "{{ .Values.server.schedulerName }}"
-{{- end }}
-      serviceAccountName: {{ template "prometheus.serviceAccountName.server" . }}
-      {{- if .Values.initChownData.enabled }}
-      initContainers:
-      - name: "{{ .Values.initChownData.name }}"
-        image: "{{ .Values.initChownData.image.repository }}:{{ .Values.initChownData.image.tag }}"
-        imagePullPolicy: "{{ .Values.initChownData.image.pullPolicy }}"
-        resources:
-{{ toYaml .Values.initChownData.resources | indent 12 }}
-        # 65534 is the nobody user that prometheus uses.
-        command: ["chown", "-R", "65534:65534", "{{ .Values.server.persistentVolume.mountPath }}"]
-        volumeMounts:
-        - name: storage-volume
-          mountPath: {{ .Values.server.persistentVolume.mountPath }}
-          subPath: "{{ .Values.server.persistentVolume.subPath }}"
-      {{- end }}
-      containers:
-        - name: {{ template "prometheus.name" . }}-{{ .Values.server.name }}-{{ .Values.configmapReload.name }}
-          image: "{{ .Values.configmapReload.image.repository }}:{{ .Values.configmapReload.image.tag }}"
-          imagePullPolicy: "{{ .Values.configmapReload.image.pullPolicy }}"
-          args:
-            - --volume-dir=/etc/config
-            - --webhook-url=http://127.0.0.1:9090{{ .Values.server.prefixURL }}/-/reload
-          {{- range $key, $value := .Values.configmapReload.extraArgs }}
-            - --{{ $key }}={{ $value }}
-          {{- end }}
-          resources:
-{{ toYaml .Values.configmapReload.resources | indent 12 }}
-          volumeMounts:
-            - name: config-volume
-              mountPath: /etc/config
-              readOnly: true
-          {{- range .Values.configmapReload.extraConfigmapMounts }}
-            - name: {{ $.Values.configmapReload.name }}-{{ .name }}
-              mountPath: {{ .mountPath }}
-              readOnly: {{ .readOnly }}
-          {{- end }}
-
-        - name: {{ template "prometheus.name" . }}-{{ .Values.server.name }}
-          image: "{{ .Values.server.image.repository }}:{{ .Values.server.image.tag }}"
-          imagePullPolicy: "{{ .Values.server.image.pullPolicy }}"
-          args:
-          {{- if .Values.server.retention }}
-            - --storage.tsdb.retention={{ .Values.server.retention }}
-          {{- end }}
-            - --config.file=/etc/config/prometheus.yml
-            - --storage.tsdb.path={{ .Values.server.persistentVolume.mountPath }}
-            - --web.console.libraries=/etc/prometheus/console_libraries
-            - --web.console.templates=/etc/prometheus/consoles
-            - --web.enable-lifecycle
-          {{- range $key, $value := .Values.server.extraArgs }}
-            - --{{ $key }}={{ $value }}
-          {{- end }}
-          {{- if .Values.server.baseURL }}
-            - --web.external-url={{ .Values.server.baseURL }}
-          {{- end }}
-          {{- if .Values.server.enableAdminApi }}
-            - --web.enable-admin-api
-          {{- end }}
-          ports:
-            - containerPort: 9090
-          readinessProbe:
-            httpGet:
-              path: {{ .Values.server.prefixURL }}/-/ready
-              port: 9090
-            initialDelaySeconds: 30
-            timeoutSeconds: 30
-          livenessProbe:
-            httpGet:
-              path: {{ .Values.server.prefixURL }}/-/healthy
-              port: 9090
-            initialDelaySeconds: 30
-            timeoutSeconds: 30
-          resources:
-{{ toYaml .Values.server.resources | indent 12 }}
-          volumeMounts:
-            - name: config-volume
-              mountPath: /etc/config
-            - name: storage-volume
-              mountPath: {{ .Values.server.persistentVolume.mountPath }}
-              subPath: "{{ .Values.server.persistentVolume.subPath }}"
-          {{- range .Values.server.extraHostPathMounts }}
-            - name: {{ .name }}
-              mountPath: {{ .mountPath }}
-              readOnly: {{ .readOnly }}
-          {{- end }}
-          {{- range .Values.server.extraConfigmapMounts }}
-            - name: {{ $.Values.server.name }}-{{ .name }}
-              mountPath: {{ .mountPath }}
-              readOnly: {{ .readOnly }}
-          {{- end }}
-          {{- range .Values.server.extraSecretMounts }}
-            - name: {{ .name }}
-              mountPath: {{ .mountPath }}
-              readOnly: {{ .readOnly }}
-          {{- end }}
-    {{- if .Values.server.nodeSelector }}
-      nodeSelector:
-{{ toYaml .Values.server.nodeSelector | indent 8 }}
-    {{- end }}
-    {{- if .Values.server.securityContext }}
-      securityContext:
-{{ toYaml .Values.server.securityContext | indent 8 }}
-    {{- end }}
-    {{- if .Values.server.tolerations }}
-      tolerations:
-{{ toYaml .Values.server.tolerations | indent 8 }}
-    {{- end }}
-    {{- if .Values.server.affinity }}
-      affinity:
-{{ toYaml .Values.server.affinity | indent 8 }}
-    {{- end }}
-      terminationGracePeriodSeconds: {{ .Values.server.terminationGracePeriodSeconds }}
-      volumes:
-        - name: config-volume
-          configMap:
-            name: {{ if .Values.server.configMapOverrideName }}{{ .Release.Name }}-{{ .Values.server.configMapOverrideName }}{{- else }}{{ template "prometheus.server.fullname" . }}{{- end }}
-        - name: storage-volume
-        {{- if .Values.server.persistentVolume.enabled }}
-          persistentVolumeClaim:
-            claimName: {{ if .Values.server.persistentVolume.existingClaim }}{{ .Values.server.persistentVolume.existingClaim }}{{- else }}{{ template "prometheus.server.fullname" . }}{{- end }}
-        {{- else }}
-          emptyDir: {}
-        {{- end -}}
-      {{- range .Values.server.extraHostPathMounts }}
-        - name: {{ .name }}
-          hostPath:
-            path: {{ .hostPath }}
-      {{- end }}
-      {{- range .Values.configmapReload.extraConfigmapMounts }}
-        - name: {{ $.Values.configmapReload.name }}-{{ .name }}
-          configMap:
-            name: {{ .configMap }}
-      {{- end }}
-      {{- range .Values.server.extraConfigmapMounts }}
-        - name: {{ $.Values.server.name }}-{{ .name }}
-          configMap:
-            name: {{ .configMap }}
-      {{- end }}
-      {{- range .Values.server.extraSecretMounts }}
-        - name: {{ .name }}
-          secret:
-            secretName: {{ .secretName }}
-      {{- end }}
-      {{- range .Values.configmapReload.extraConfigmapMounts }}
-        - name: {{ .name }}
-          configMap:
-            name: {{ .configMap }}
-      {{- end }}
@@ -1,38 +0,0 @@
-{{- if .Values.server.ingress.enabled -}}
-{{- $releaseName := .Release.Name -}}
-{{- $serviceName := include "prometheus.server.fullname" . }}
-{{- $servicePort := .Values.server.service.servicePort -}}
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-{{- if .Values.server.ingress.annotations }}
-  annotations:
-{{ toYaml .Values.server.ingress.annotations | indent 4 }}
-{{- end }}
-  labels:
-    app: {{ template "prometheus.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: "{{ .Values.server.name }}"
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-{{- range $key, $value := .Values.server.ingress.extraLabels }}
-    {{ $key }}: {{ $value }}
-{{- end }}
-  name: {{ template "prometheus.server.fullname" . }}
-spec:
-  rules:
-  {{- range .Values.server.ingress.hosts }}
-    {{- $url := splitList "/" . }}
-    - host: {{ first $url }}
-      http:
-        paths:
-          - path: /{{ rest $url | join "/" }}
-            backend:
-              serviceName: {{ $serviceName }}
-              servicePort: {{ $servicePort }}
-  {{- end -}}
-{{- if .Values.server.ingress.tls }}
-  tls:
-{{ toYaml .Values.server.ingress.tls | indent 4 }}
-  {{- end -}}
-{{- end -}}
@@ -1,21 +0,0 @@
-{{- if .Values.networkPolicy.enabled }}
-apiVersion: {{ template "prometheus.networkPolicy.apiVersion" . }}
-kind: NetworkPolicy
-metadata:
-  name: {{ template "prometheus.server.fullname" . }}
-  labels:
-    app: {{ template "prometheus.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: "{{ .Values.server.name }}"
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-spec:
-  podSelector:
-    matchLabels:
-      app: {{ template "prometheus.name" . }}
-      component: "{{ .Values.server.name }}"
-      release: {{ .Release.Name }}
-  ingress:
-    - ports:
-      - port: 9090
-{{- end }}
@@ -1,31 +0,0 @@
-{{- if .Values.server.persistentVolume.enabled -}}
-{{- if not .Values.server.persistentVolume.existingClaim -}}
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  {{- if .Values.server.persistentVolume.annotations }}
-  annotations:
-{{ toYaml .Values.server.persistentVolume.annotations | indent 4 }}
-  {{- end }}
-  labels:
-    app: {{ template "prometheus.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: "{{ .Values.server.name }}"
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: {{ template "prometheus.server.fullname" . }}
-spec:
-  accessModes:
-{{ toYaml .Values.server.persistentVolume.accessModes | indent 4 }}
-{{- if .Values.server.persistentVolume.storageClass }}
-{{- if (eq "-" .Values.server.persistentVolume.storageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: "{{ .Values.server.persistentVolume.storageClass }}"
-{{- end }}
-{{- end }}
-  resources:
-    requests:
-      storage: "{{ .Values.server.persistentVolume.size }}"
-{{- end -}}
-{{- end -}}
@@ -1,47 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-{{- if .Values.server.service.annotations }}
-  annotations:
-{{ toYaml .Values.server.service.annotations | indent 4 }}
-{{- end }}
-  labels:
-    app: {{ template "prometheus.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: "{{ .Values.server.name }}"
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-{{- if .Values.server.service.labels }}
-{{ toYaml .Values.server.service.labels | indent 4 }}
-{{- end }}
-  name: {{ template "prometheus.server.fullname" . }}
-spec:
-{{- if .Values.server.service.clusterIP }}
-  clusterIP: {{ .Values.server.service.clusterIP }}
-{{- end }}
-{{- if .Values.server.service.externalIPs }}
-  externalIPs:
-{{ toYaml .Values.server.service.externalIPs | indent 4 }}
-{{- end }}
-{{- if .Values.server.service.loadBalancerIP }}
-  loadBalancerIP: {{ .Values.server.service.loadBalancerIP }}
-{{- end }}
-{{- if .Values.server.service.loadBalancerSourceRanges }}
-  loadBalancerSourceRanges:
-  {{- range $cidr := .Values.server.service.loadBalancerSourceRanges }}
-    - {{ $cidr }}
-  {{- end }}
-{{- end }}
-  ports:
-    - name: http
-      port: {{ .Values.server.service.servicePort }}
-      protocol: TCP
-      targetPort: 9090
-    {{- if .Values.server.service.nodePort }}
-      nodePort: {{ .Values.server.service.nodePort }}
-    {{- end }}
-  selector:
-    app: {{ template "prometheus.name" . }}
-    component: "{{ .Values.server.name }}"
-    release: {{ .Release.Name }}
-  type: "{{ .Values.server.service.type }}"
@@ -1,12 +0,0 @@
-{{- if .Values.serviceAccounts.server.create }}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  labels:
-    app: {{ template "prometheus.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: "{{ .Values.server.name }}"
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: {{ template "prometheus.serviceAccountName.server" . }}
-{{- end }}