WIP: Linkerd Add-Ons Model

Dockerfile-proxy

@@ -9,7 +9,7 @@ RUN (proxy=$(bin/fetch-proxy $(cat proxy-version)) && \
     mv "$proxy" linkerd2-proxy)
 
 ## compile proxy-identity agent
-FROM gcr.io/linkerd-io/go-deps:f6fda337 as golang
+FROM gcr.io/linkerd-io/go-deps:bfb89c7f as golang
 WORKDIR /linkerd-build
 COPY pkg/flags pkg/flags
 COPY pkg/tls pkg/tls

charts/linkerd2/add-ons/grafana/.helmignore

@@ -0,0 +1,22 @@
+# 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
+.vscode/

charts/linkerd2/add-ons/grafana/Chart.yaml

@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: grafana
+version: 0.1.0

charts/linkerd2/add-ons/grafana/requirements.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: partials
+  repository: file://../../../partials
+  version: 0.1.0
+digest: sha256:5eedd268cf82aa72641060432d2edfd9b350a27e022d243e9b71ac34e1cd6f8d
+generated: "2019-12-26T12:38:35.839386551+05:30"

charts/linkerd2/add-ons/grafana/requirements.yaml

@@ -0,0 +1,4 @@
+dependencies:
+    - name: partials
+      version: 0.1.0
+      repository: file://../../../partials

charts/linkerd2/templates/grafana.yaml → charts/linkerd2/add-ons/grafana/templates/grafana.yaml

@@ -84,7 +84,6 @@ spec:
 ---
 {{ $_ := set .Values.global.proxy "workloadKind" "deployment" -}}
 {{ $_ := set .Values.global.proxy "component" "linkerd-grafana" -}}
-{{ include "linkerd.proxy.validation" .Values.global.proxy -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -115,12 +114,11 @@ spec:
         {{.Values.global.controllerNamespaceLabel}}: {{.Values.global.namespace}}
         {{- include "partials.proxy.labels" .Values.global.proxy | nindent 8}}
     spec:
-      {{- include "linkerd.node-selector" . | nindent 6 }}
       containers:
       - env:
         - name: GF_PATHS_DATA
           value: /data
-        image: {{.Values.grafanaImage}}:{{default .Values.global.linkerdVersion .Values.controllerImageVersion}}
+        image: {{.Values.image}}:{{default .Values.global.linkerdVersion .Values.controllerImageVersion}}
         imagePullPolicy: {{.Values.global.imagePullPolicy}}
         livenessProbe:
           httpGet:
@@ -135,8 +133,8 @@ spec:
           httpGet:
             path: /api/health
             port: 3000
-        {{- if .Values.grafanaResources -}}
-        {{- include "partials.resources" .Values.grafanaResources | nindent 8 }}
+        {{- if .Values.resources -}}
+        {{- include "partials.resources" .Values.resources | nindent 8 }}
         {{- end }}
         securityContext:
           runAsUser: 472
@@ -147,7 +145,7 @@ spec:
           name: grafana-config
           readOnly: true
       - {{- include "partials.proxy" . | indent 8 | trimPrefix (repeat 7 " ") }}
-      {{ if not .Values.noInitContainer -}}
+      {{ if not .Values.global.noInitContainer -}}
       initContainers:
       - {{- include "partials.proxy-init" . | indent 8 | trimPrefix (repeat 7 " ") }}
       {{ end -}}

charts/linkerd2/add-ons/grafana/values.yaml

@@ -0,0 +1,3 @@
+# Config for grafana add-on
+enabled: true
+image: gcr.io/linkerd-io/grafana

charts/linkerd2/add-ons/prometheus/.helmignore

@@ -0,0 +1,22 @@
+# 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
+.vscode/

charts/linkerd2/add-ons/prometheus/Chart.yaml

@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: prometheus
+version: 0.1.0

charts/linkerd2/add-ons/prometheus/requirements.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: partials
+  repository: file://../../../partials
+  version: 0.1.0
+digest: sha256:5eedd268cf82aa72641060432d2edfd9b350a27e022d243e9b71ac34e1cd6f8d
+generated: "2020-01-02T21:27:59.919462049+05:30"

charts/linkerd2/add-ons/prometheus/requirements.yaml

@@ -0,0 +1,4 @@
+dependencies:
+  - name: partials
+    version: 0.1.0
+    repository: file://../../../partials

charts/linkerd2/templates/prometheus.yaml → charts/linkerd2/add-ons/prometheus/templates/prometheus.yaml

@@ -143,7 +143,6 @@ spec:
 {{ end -}}
 {{ $_ := set .Values.global.proxy "workloadKind" "deployment" -}}
 {{ $_ := set .Values.global.proxy "component" "linkerd-prometheus" -}}
-{{ include "linkerd.proxy.validation" .Values.global.proxy -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -174,14 +173,13 @@ spec:
         {{.Values.global.controllerNamespaceLabel}}: {{.Values.global.namespace}}
         {{- include "partials.proxy.labels" .Values.global.proxy | nindent 8}}
     spec:
-      {{- include "linkerd.node-selector" . | nindent 6 }}
       containers:
       - args:
         - --storage.tsdb.path=/data
         - --storage.tsdb.retention.time=6h
         - --config.file=/etc/prometheus/prometheus.yml
-        - --log.level={{lower .Values.prometheusLogLevel}}
-        image: {{.Values.prometheusImage}}
+        - --log.level={{lower .Values.logLevel}}
+        image: {{.Values.image}}
         imagePullPolicy: {{.Values.global.imagePullPolicy}}
         livenessProbe:
           httpGet:
@@ -199,8 +197,8 @@ spec:
             port: 9090
           initialDelaySeconds: 30
           timeoutSeconds: 30
-        {{- if .Values.prometheusResources -}}
-        {{- include "partials.resources" .Values.prometheusResources | nindent 8 }}
+        {{- if .Values.resources -}}
+        {{- include "partials.resources" .Values.resources | nindent 8 }}
         {{- end }}
         securityContext:
           runAsUser: 65534
@@ -211,7 +209,7 @@ spec:
           name: prometheus-config
           readOnly: true
       - {{- include "partials.proxy" . | indent 8 | trimPrefix (repeat 7 " ") }}
-      {{ if not .Values.noInitContainer -}}
+      {{ if not .Values.global.noInitContainer -}}
       initContainers:
       - {{- include "partials.proxy-init" . | indent 8 | trimPrefix (repeat 7 " ") }}
       {{ end -}}

charts/linkerd2/add-ons/prometheus/values.yaml

@@ -0,0 +1,4 @@
+# Config for add-ons
+enabled: true
+image: prometheus/prom:v1.15.0
+logLevel: info

charts/linkerd2/requirements.lock

@@ -2,5 +2,11 @@ dependencies:
 - name: partials
   repository: file://../partials
   version: 0.1.0
-digest: sha256:3a86b96a2966f03ba04518723838b49719a3277dfb9bea0b3f067e83d370e0b3
-generated: 2019-07-24T19:51:15.04322926-07:00
+- name: grafana
+  repository: file://../linkerd2/add-ons/grafana
+  version: 0.1.0
+- name: prometheus
+  repository: file://../linkerd2/add-ons/prometheus
+  version: 0.1.0
+digest: sha256:92e328557dbf69c48fa71be1f68d98c2a5702c64e01553048b6062a15df66ebe
+generated: "2020-01-06T22:34:19.253434901+05:30"

charts/linkerd2/requirements.yaml

@@ -2,3 +2,11 @@ dependencies:
 - name: partials
   version: 0.1.0
   repository: file://../partials
+- name: grafana
+  version: 0.1.0
+  repository: file://../linkerd2/add-ons/grafana
+  condition: grafana.enabled
+- name: prometheus
+  version: 0.1.0
+  repository: file://../linkerd2/add-ons/prometheus
+  condition: prometheus.enabled

charts/linkerd2/templates/controller.yaml

@@ -63,7 +63,9 @@ spec:
       containers:
       - args:
         - public-api
+        {{ if .Values.prometheus.enabled -}}
         - -prometheus-url=http://linkerd-prometheus.{{.Values.global.namespace}}.svc.{{.Values.global.clusterDomain}}:9090
+        {{ end -}}
         - -destination-addr=linkerd-dst.{{.Values.global.namespace}}.svc.{{.Values.global.clusterDomain}}:8086
         - -controller-namespace={{.Values.global.namespace}}
         - -log-level={{.Values.controllerLogLevel}}

charts/linkerd2/templates/heartbeat.yaml

@@ -38,8 +38,9 @@ spec:
             imagePullPolicy: {{.Values.global.imagePullPolicy}}
             args:
             - "heartbeat"
+            {{ if .Values.prometheus.enabled -}}
             - "-prometheus-url=http://linkerd-prometheus.{{.Values.global.namespace}}.svc.{{.Values.global.clusterDomain}}:9090"
-            - "-controller-namespace={{.Values.global.namespace}}"
+            {{ end -}}            - "-controller-namespace={{.Values.global.namespace}}"
             - "-log-level={{.Values.controllerLogLevel}}"
             {{- if .Values.heartbeatResources -}}
             {{- include "partials.resources" .Values.heartbeatResources | nindent 12 }}

charts/linkerd2/templates/linkerd-values.yaml

@@ -0,0 +1,24 @@
+---
+###
+### linkerd values
+###
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: linkerd-values
+  namespace: {{.Values.global.namespace}}
+  labels:
+    {{.Values.global.controllerComponentLabel}}: controller
+    {{.Values.global.controllerNamespaceLabel}}: {{.Values.global.namespace}}
+  annotations:
+    {{.Values.global.createdByAnnotation}}: {{default (printf "linkerd/helm %s" .Values.global.linkerdVersion) .Values.global.cliVersion}}
+data:
+  values: |-
+    global:
+      {{- toYaml .Values.global | trim | nindent 6}}
+    grafana:
+      {{- toYaml .Values.grafana | trim | nindent 6}}
+    prometheus:
+      {{- toYaml .Values.prometheus | trim | nindent 6}}
+

charts/linkerd2/templates/psp.yaml

@@ -90,9 +90,11 @@ subjects:
 - kind: ServiceAccount
   name: linkerd-destination
   namespace: {{.Values.global.namespace}}
+{{ if .Values.grafana.enabled -}}
 - kind: ServiceAccount
   name: linkerd-grafana
   namespace: {{.Values.global.namespace}}
+{{end -}}
 {{ if not .Values.disableHeartBeat -}}
 - kind: ServiceAccount
   name: linkerd-heartbeat
@@ -101,9 +103,11 @@ subjects:
 - kind: ServiceAccount
   name: linkerd-identity
   namespace: {{.Values.global.namespace}}
+{{ if .Values.prometheus.enabled -}}
 - kind: ServiceAccount
   name: linkerd-prometheus
   namespace: {{.Values.global.namespace}}
+{{ end -}}
 - kind: ServiceAccount
   name: linkerd-proxy-injector
   namespace: {{.Values.global.namespace}}

charts/linkerd2/templates/web.yaml

@@ -62,7 +62,9 @@ spec:
       containers:
       - args:
         - -api-addr=linkerd-controller-api.{{.Values.global.namespace}}.svc.{{.Values.global.clusterDomain}}:8085
+        {{ if .Values.grafana.enabled -}}
         - -grafana-addr=linkerd-grafana.{{.Values.global.namespace}}.svc.{{.Values.global.clusterDomain}}:3000
+        {{ end -}}
         - -controller-namespace={{.Values.global.namespace}}
         - -log-level={{.Values.controllerLogLevel}}
         {{- $hostFull := replace "." "\\." (printf "linkerd-web.%s.svc.%s" .Values.global.namespace .Values.global.clusterDomain) }}

charts/linkerd2/values.yaml

@@ -110,9 +110,6 @@ identity:
       # PEM-encoded ECDSA private key
       keyPEM: |
 
-# grafana configuration
-grafanaImage: gcr.io/linkerd-io/grafana
-
 # heartbeat configuration
 disableHeartBeat: false
 heartbeatSchedule: "0 0 * * *"
@@ -159,3 +156,13 @@ installNamespace: true
 # https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector.
 nodeSelector:
   beta.kubernetes.io/os: linux
+
+# Config for add-ons
+grafana:
+  enabled: true
+  image: gcr.io/linkerd-io/grafana
+
+prometheus:
+  enabled: true
+  logLevel: debug
+  image: prom/prometheus:v2.11.1

cli/Dockerfile-bin

@@ -1,5 +1,5 @@
 ## compile binaries
-FROM gcr.io/linkerd-io/go-deps:f6fda337 as golang
+FROM gcr.io/linkerd-io/go-deps:bfb89c7f as golang
 WORKDIR /linkerd-build
 COPY cli cli
 COPY charts charts

cli/cmd/install-cni-plugin.go

@@ -197,7 +197,7 @@ func renderCNIPlugin(w io.Writer, config *cniPluginOptions) error {
 		RawValues: rawValues,
 		Files:     files,
 	}
-	buf, err := chart.RenderCNI()
+	buf, err := chart.RenderWithoutPartials()
 	if err != nil {
 		return err
 	}