Merge branch 'master' of github.com:prometheus-operator/kube-prometheus

examples/ingress.jsonnet

@@ -1,9 +1,17 @@
-local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
-local secret = k.core.v1.secret;
-local ingress = k.extensions.v1beta1.ingress;
-local ingressTls = ingress.mixin.spec.tlsType;
-local ingressRule = ingress.mixin.spec.rulesType;
-local httpIngressPath = ingressRule.mixin.http.pathsType;
+local ingress(name, namespace, rules) = {
+  apiVersion: 'networking.k8s.io/v1',
+  kind: 'Ingress',
+  metadata: {
+    name: name,
+    namespace: namespace,
+    annotations: {
+      'nginx.ingress.kubernetes.io/auth-type': 'basic',
+      'nginx.ingress.kubernetes.io/auth-secret': 'basic-auth',
+      'nginx.ingress.kubernetes.io/auth-realm': 'Authentication Required',
+    },
+  },
+  spec: { rules: rules },
+};
 
 local kp =
   (import 'kube-prometheus/kube-prometheus.libsonnet') +
@@ -37,67 +45,71 @@ local kp =
     },
     // Create ingress objects per application
     ingress+:: {
-      'alertmanager-main':
-        ingress.new() +
-        ingress.mixin.metadata.withName('alertmanager-main') +
-        ingress.mixin.metadata.withNamespace($._config.namespace) +
-        ingress.mixin.metadata.withAnnotations({
-          'nginx.ingress.kubernetes.io/auth-type': 'basic',
-          'nginx.ingress.kubernetes.io/auth-secret': 'basic-auth',
-          'nginx.ingress.kubernetes.io/auth-realm': 'Authentication Required',
-        }) +
-        ingress.mixin.spec.withRules(
-          ingressRule.new() +
-          ingressRule.withHost('alertmanager.example.com') +
-          ingressRule.mixin.http.withPaths(
-            httpIngressPath.new() +
-            httpIngressPath.mixin.backend.withServiceName('alertmanager-main') +
-            httpIngressPath.mixin.backend.withServicePort('web')
-          ),
-        ),
-      grafana:
-        ingress.new() +
-        ingress.mixin.metadata.withName('grafana') +
-        ingress.mixin.metadata.withNamespace($._config.namespace) +
-        ingress.mixin.metadata.withAnnotations({
-          'nginx.ingress.kubernetes.io/auth-type': 'basic',
-          'nginx.ingress.kubernetes.io/auth-secret': 'basic-auth',
-          'nginx.ingress.kubernetes.io/auth-realm': 'Authentication Required',
-        }) +
-        ingress.mixin.spec.withRules(
-          ingressRule.new() +
-          ingressRule.withHost('grafana.example.com') +
-          ingressRule.mixin.http.withPaths(
-            httpIngressPath.new() +
-            httpIngressPath.mixin.backend.withServiceName('grafana') +
-            httpIngressPath.mixin.backend.withServicePort('http')
-          ),
-        ),
-      'prometheus-k8s':
-        ingress.new() +
-        ingress.mixin.metadata.withName('prometheus-k8s') +
-        ingress.mixin.metadata.withNamespace($._config.namespace) +
-        ingress.mixin.metadata.withAnnotations({
-          'nginx.ingress.kubernetes.io/auth-type': 'basic',
-          'nginx.ingress.kubernetes.io/auth-secret': 'basic-auth',
-          'nginx.ingress.kubernetes.io/auth-realm': 'Authentication Required',
-        }) +
-        ingress.mixin.spec.withRules(
-          ingressRule.new() +
-          ingressRule.withHost('prometheus.example.com') +
-          ingressRule.mixin.http.withPaths(
-            httpIngressPath.new() +
-            httpIngressPath.mixin.backend.withServiceName('prometheus-k8s') +
-            httpIngressPath.mixin.backend.withServicePort('web')
-          ),
-        ),
+      'alertmanager-main': ingress(
+        'alertmanager-main',
+        $._config.namespace,
+        [{
+          host: 'alertmanager.example.com',
+          http: {
+            paths: [{
+              backend: {
+                service: {
+                  name: 'alertmanager-main',
+                  port: 'web',
+                },
+              },
+            }],
+          },
+        }]
+      ),
+      grafana: ingress(
+        'grafana',
+        $._config.namespace,
+        [{
+          host: 'grafana.example.com',
+          http: {
+            paths: [{
+              backend: {
+                service: {
+                  name: 'grafana',
+                  port: 'http',
+                },
+              },
+            }],
+          },
+        }],
+      ),
+      'prometheus-k8s': ingress(
+        'prometheus-k8s',
+        $._config.namespace,
+        [{
+          host: 'prometheus.example.com',
+          http: {
+            paths: [{
+              backend: {
+                service: {
+                  name: 'prometheus-k8s',
+                  port: 'web',
+                },
+              },
+            }],
+          },
+        }],
+      ),
     },
   } + {
     // Create basic auth secret - replace 'auth' file with your own
     ingress+:: {
-      'basic-auth-secret':
-        secret.new('basic-auth', { auth: std.base64(importstr 'auth') }) +
-        secret.mixin.metadata.withNamespace($._config.namespace),
+      'basic-auth-secret': {
+        apiVersion: 'v1',
+        kind: 'Secret',
+        metadata: {
+          name: 'basic-auth',
+          namespace: $._config.namespace,
+        },
+        data: { auth: std.base64(importstr 'auth') },
+        type: 'Opaque',
+      },
     },
   };
 

examples/ksonnet-example.jsonnet

@@ -1,9 +1,9 @@
-local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
-local daemonset = k.apps.v1beta2.daemonSet;
-
 ((import 'kube-prometheus/kube-prometheus.libsonnet') + {
    nodeExporter+: {
-     daemonset+:
-       daemonset.mixin.metadata.withNamespace('my-custom-namespace'),
+     daemonset+: {
+       metadata+: {
+         namespace: 'my-custom-namespace',
+       },
+     },
    },
  }).nodeExporter.daemonset

examples/prometheus-pvc.jsonnet

@@ -1,10 +1,3 @@
-// Reference info: documentation for https://github.com/ksonnet/ksonnet-lib can be found at http://g.bryan.dev.hepti.center
-//
-local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';  // https://github.com/ksonnet/ksonnet-lib/blob/master/ksonnet.beta.3/k.libsonnet - imports k8s.libsonnet
-// * https://github.com/ksonnet/ksonnet-lib/blob/master/ksonnet.beta.3/k8s.libsonnet defines things such as "persistentVolumeClaim:: {"
-//
-local pvc = k.core.v1.persistentVolumeClaim;  // https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.11/#persistentvolumeclaim-v1-core (defines variable named 'spec' of type 'PersistentVolumeClaimSpec')
-
 local kp =
   (import 'kube-prometheus/kube-prometheus.libsonnet') +
   // Uncomment the following imports to enable its patches
@@ -32,22 +25,22 @@ local kp =
           //  * PersistentVolumeClaim (and a corresponding PersistentVolume)
           //  * the actual volume (per the StorageClassName specified below)
           storage: {  // https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#storagespec
-            volumeClaimTemplate:  // (same link as above where the 'pvc' variable is defined)
-              pvc.new() +  // http://g.bryan.dev.hepti.center/core/v1/persistentVolumeClaim/#core.v1.persistentVolumeClaim.new
-
-              pvc.mixin.spec.withAccessModes('ReadWriteOnce') +
-
-              // https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.11/#resourcerequirements-v1-core (defines 'requests'),
-              // and https://kubernetes.io/docs/concepts/policy/resource-quotas/#storage-resource-quota (defines 'requests.storage')
-              pvc.mixin.spec.resources.withRequests({ storage: '100Gi' }) +
-
-              // A StorageClass of the following name (which can be seen via `kubectl get storageclass` from a node in the given K8s cluster) must exist prior to kube-prometheus being deployed.
-              pvc.mixin.spec.withStorageClassName('ssd'),
-
-            // The following 'selector' is only needed if you're using manual storage provisioning (https://github.com/coreos/prometheus-operator/blob/master/Documentation/user-guides/storage.md#manual-storage-provisioning).
-            // And note that this is not supported/allowed by AWS - uncommenting the following 'selector' line (when deploying kube-prometheus to a K8s cluster in AWS) will cause the pvc to be stuck in the Pending status and have the following error:
-            //  * 'Failed to provision volume with StorageClass "ssd": claim.Spec.Selector is not supported for dynamic provisioning on AWS'
-            //pvc.mixin.spec.selector.withMatchLabels({}),
+            volumeClaimTemplate: {  // https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.11/#persistentvolumeclaim-v1-core (defines variable named 'spec' of type 'PersistentVolumeClaimSpec')
+              apiVersion: 'v1',
+              kind: 'PersistentVolumeClaim',
+              spec: {
+                accessModes: ['ReadWriteOnce'],
+                // https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.11/#resourcerequirements-v1-core (defines 'requests'),
+                // and https://kubernetes.io/docs/concepts/policy/resource-quotas/#storage-resource-quota (defines 'requests.storage')
+                resources: { requests: { storage: '100Gi' } },
+                // A StorageClass of the following name (which can be seen via `kubectl get storageclass` from a node in the given K8s cluster) must exist prior to kube-prometheus being deployed.
+                storageClassName: 'ssd',
+                // The following 'selector' is only needed if you're using manual storage provisioning (https://github.com/coreos/prometheus-operator/blob/master/Documentation/user-guides/storage.md#manual-storage-provisioning).
+                // And note that this is not supported/allowed by AWS - uncommenting the following 'selector' line (when deploying kube-prometheus to a K8s cluster in AWS) will cause the pvc to be stuck in the Pending status and have the following error:
+                //  * 'Failed to provision volume with StorageClass "ssd": claim.Spec.Selector is not supported for dynamic provisioning on AWS'
+                // selector: { matchLabels: {} },
+              },
+            },
           },  // storage
         },  // spec
       },  // prometheus

examples/tolerations.libsonnet

@@ -1,7 +1,3 @@
-local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
-local statefulSet = k.apps.v1beta2.statefulSet;
-local toleration = statefulSet.mixin.spec.template.spec.tolerationsType;
-
 {
   _config+:: {
     tolerations+:: [
@@ -15,24 +11,14 @@ local toleration = statefulSet.mixin.spec.template.spec.tolerationsType;
         key: 'key2',
         operator: 'Exists',
       },
-    ]
-  },
-
-  local withTolerations() = {
-    tolerations: [
-      toleration.new() + (
-      if std.objectHas(t, 'key') then toleration.withKey(t.key) else toleration) + (
-      if std.objectHas(t, 'operator') then toleration.withOperator(t.operator) else toleration) + (
-      if std.objectHas(t, 'value') then toleration.withValue(t.value) else toleration) + (
-      if std.objectHas(t, 'effect') then toleration.withEffect(t.effect) else toleration),
-      for t in $._config.tolerations
     ],
   },
 
   prometheus+: {
     prometheus+: {
-      spec+:
-        withTolerations(),
+      spec+: {
+        tolerations: [t for t in $._config.tolerations],
+      },
     },
   },
-}
+}