diff --git a/.github/workflows/helm-release.yaml b/.github/workflows/helm-release.yaml index 107996a..270eecf 100644 --- a/.github/workflows/helm-release.yaml +++ b/.github/workflows/helm-release.yaml @@ -26,11 +26,6 @@ jobs: with: version: v3.7.2 - # - name: helm deps - # run: | - # pwd - # helm dependency build charts/linkerd-jaeger - - name: Run chart-releaser uses: helm/chart-releaser-action@v1.2.1 env: diff --git a/charts/linkerd-viz/charts/partials/.helmignore b/charts/linkerd-viz/charts/partials/.helmignore deleted file mode 100644 index f0c1319..0000000 --- a/charts/linkerd-viz/charts/partials/.helmignore +++ /dev/null @@ -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 diff --git a/charts/linkerd-viz/charts/partials/Chart.yaml b/charts/linkerd-viz/charts/partials/Chart.yaml deleted file mode 100644 index b269da1..0000000 --- a/charts/linkerd-viz/charts/partials/Chart.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -description: | - A Helm chart containing Linkerd partial templates, - depended by the 'linkerd' and 'patch' charts. -name: partials -version: 0.1.0 diff --git a/charts/linkerd-viz/charts/partials/README.md b/charts/linkerd-viz/charts/partials/README.md deleted file mode 100644 index 1663c6e..0000000 --- a/charts/linkerd-viz/charts/partials/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# partials - -A Helm chart containing Linkerd partial templates, -depended by the 'linkerd' and 'patch' charts. - -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) - ----------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.4.0](https://github.com/norwoodj/helm-docs/releases/v1.4.0) diff --git a/charts/linkerd-viz/charts/partials/README.md.gotmpl b/charts/linkerd-viz/charts/partials/README.md.gotmpl deleted file mode 100644 index 37f5101..0000000 --- a/charts/linkerd-viz/charts/partials/README.md.gotmpl +++ /dev/null @@ -1,14 +0,0 @@ -{{ template "chart.header" . }} -{{ template "chart.description" . }} - -{{ template "chart.versionBadge" . }} -{{ template "chart.typeBadge" . }} -{{ template "chart.appVersionBadge" . }} - -{{ template "chart.homepageLine" . }} - -{{ template "chart.requirementsSection" . }} - -{{ template "chart.valuesSection" . }} - -{{ template "helm-docs.versionFooter" . }} diff --git a/charts/linkerd-viz/charts/partials/templates/NOTES.txt b/charts/linkerd-viz/charts/partials/templates/NOTES.txt deleted file mode 100644 index e69de29..0000000 diff --git a/charts/linkerd-viz/charts/partials/templates/_affinity.tpl b/charts/linkerd-viz/charts/partials/templates/_affinity.tpl deleted file mode 100644 index 926a4ee..0000000 --- a/charts/linkerd-viz/charts/partials/templates/_affinity.tpl +++ /dev/null @@ -1,22 +0,0 @@ -{{ define "linkerd.pod-affinity" -}} -affinity: - podAntiAffinity: - preferredDuringSchedulingIgnoredDuringExecution: - - podAffinityTerm: - labelSelector: - matchExpressions: - - key: {{ default "linkerd.io/control-plane-component" .label }} - operator: In - values: - - {{ .component }} - topologyKey: failure-domain.beta.kubernetes.io/zone - weight: 100 - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchExpressions: - - key: {{ default "linkerd.io/control-plane-component" .label }} - operator: In - values: - - {{ .component }} - topologyKey: kubernetes.io/hostname -{{- end }} diff --git a/charts/linkerd-viz/charts/partials/templates/_capabilities.tpl b/charts/linkerd-viz/charts/partials/templates/_capabilities.tpl deleted file mode 100644 index a595d74..0000000 --- a/charts/linkerd-viz/charts/partials/templates/_capabilities.tpl +++ /dev/null @@ -1,16 +0,0 @@ -{{- define "partials.proxy.capabilities" -}} -capabilities: - {{- if .Values.proxy.capabilities.add }} - add: - {{- toYaml .Values.proxy.capabilities.add | trim | nindent 4 }} - {{- end }} - {{- if .Values.proxy.capabilities.drop }} - drop: - {{- toYaml .Values.proxy.capabilities.drop | trim | nindent 4 }} - {{- end }} -{{- end -}} - -{{- define "partials.proxy-init.capabilities.drop" -}} -drop: -{{ toYaml .Values.proxyInit.capabilities.drop | trim }} -{{- end -}} diff --git a/charts/linkerd-viz/charts/partials/templates/_debug.tpl b/charts/linkerd-viz/charts/partials/templates/_debug.tpl deleted file mode 100644 index cf0eb14..0000000 --- a/charts/linkerd-viz/charts/partials/templates/_debug.tpl +++ /dev/null @@ -1,6 +0,0 @@ -{{- define "partials.debug" -}} -image: {{.Values.debugContainer.image.name}}:{{.Values.debugContainer.image.version | default .Values.linkerdVersion}} -imagePullPolicy: {{.Values.debugContainer.image.pullPolicy | default .Values.imagePullPolicy}} -name: linkerd-debug -terminationMessagePolicy: FallbackToLogsOnError -{{- end -}} diff --git a/charts/linkerd-viz/charts/partials/templates/_helpers.tpl b/charts/linkerd-viz/charts/partials/templates/_helpers.tpl deleted file mode 100644 index b6cdc34..0000000 --- a/charts/linkerd-viz/charts/partials/templates/_helpers.tpl +++ /dev/null @@ -1,14 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Splits a coma separated list into a list of string values. -For example "11,22,55,44" will become "11","22","55","44" -*/}} -{{- define "partials.splitStringList" -}} -{{- if gt (len (toString .)) 0 -}} -{{- $ports := toString . | splitList "," -}} -{{- $last := sub (len $ports) 1 -}} -{{- range $i,$port := $ports -}} -"{{$port}}"{{ternary "," "" (ne $i $last)}} -{{- end -}} -{{- end -}} -{{- end -}} diff --git a/charts/linkerd-viz/charts/partials/templates/_metadata.tpl b/charts/linkerd-viz/charts/partials/templates/_metadata.tpl deleted file mode 100644 index 7cf0744..0000000 --- a/charts/linkerd-viz/charts/partials/templates/_metadata.tpl +++ /dev/null @@ -1,16 +0,0 @@ -{{- define "partials.annotations.created-by" -}} -linkerd.io/created-by: {{ .Values.cliVersion | default (printf "linkerd/helm %s" (.Values.cniPluginVersion | default .Values.linkerdVersion)) }} -{{- end -}} - -{{- define "partials.proxy.annotations" -}} -linkerd.io/identity-mode: {{ternary "default" "disabled" (not .Values.proxy.disableIdentity)}} -linkerd.io/proxy-version: {{.Values.proxy.image.version | default .Values.linkerdVersion}} -{{- end -}} - -{{/* -To add labels to the control-plane components, instead update at individual component manifests as -adding here would also update `spec.selector.matchLabels` which are immutable and would fail upgrades. -*/}} -{{- define "partials.proxy.labels" -}} -linkerd.io/proxy-{{.workloadKind}}: {{.component}} -{{- end -}} diff --git a/charts/linkerd-viz/charts/partials/templates/_nodeselector.tpl b/charts/linkerd-viz/charts/partials/templates/_nodeselector.tpl deleted file mode 100644 index 4cde0ab..0000000 --- a/charts/linkerd-viz/charts/partials/templates/_nodeselector.tpl +++ /dev/null @@ -1,4 +0,0 @@ -{{- define "linkerd.node-selector" -}} -nodeSelector: -{{- toYaml .Values.nodeSelector | trim | nindent 2 }} -{{- end -}} diff --git a/charts/linkerd-viz/charts/partials/templates/_proxy-config-ann.tpl b/charts/linkerd-viz/charts/partials/templates/_proxy-config-ann.tpl deleted file mode 100644 index 9651b3b..0000000 --- a/charts/linkerd-viz/charts/partials/templates/_proxy-config-ann.tpl +++ /dev/null @@ -1,18 +0,0 @@ -{{- define "partials.proxy.config.annotations" -}} -{{- with .cpu }} -{{- with .request -}} -config.linkerd.io/proxy-cpu-request: {{. | quote}} -{{end}} -{{- with .limit -}} -config.linkerd.io/proxy-cpu-limit: {{. | quote}} -{{- end}} -{{- end}} -{{- with .memory }} -{{- with .request }} -config.linkerd.io/proxy-memory-request: {{. | quote}} -{{end}} -{{- with .limit -}} -config.linkerd.io/proxy-memory-limit: {{. | quote}} -{{- end}} -{{- end }} -{{- end }} diff --git a/charts/linkerd-viz/charts/partials/templates/_proxy-init.tpl b/charts/linkerd-viz/charts/partials/templates/_proxy-init.tpl deleted file mode 100644 index 3241155..0000000 --- a/charts/linkerd-viz/charts/partials/templates/_proxy-init.tpl +++ /dev/null @@ -1,62 +0,0 @@ -{{- define "partials.proxy-init" -}} -args: -- --incoming-proxy-port -- {{.Values.proxy.ports.inbound | quote}} -- --outgoing-proxy-port -- {{.Values.proxy.ports.outbound | quote}} -- --proxy-uid -- {{.Values.proxy.uid | quote}} -- --inbound-ports-to-ignore -- "{{.Values.proxy.ports.control}},{{.Values.proxy.ports.admin}}{{ternary (printf ",%s" (.Values.proxyInit.ignoreInboundPorts | toString)) "" (not (empty .Values.proxyInit.ignoreInboundPorts)) }}" -{{- if .Values.proxyInit.ignoreOutboundPorts }} -- --outbound-ports-to-ignore -- {{.Values.proxyInit.ignoreOutboundPorts | quote}} -{{- end }} -{{- if .Values.proxyInit.closeWaitTimeoutSecs }} -- --timeout-close-wait-secs -- {{ .Values.proxyInit.closeWaitTimeoutSecs | quote}} -{{- end }} -image: {{.Values.proxyInit.image.name}}:{{.Values.proxyInit.image.version}} -imagePullPolicy: {{.Values.proxyInit.image.pullPolicy | default .Values.imagePullPolicy}} -name: linkerd-init -{{ include "partials.resources" .Values.proxyInit.resources }} -securityContext: - {{- if .Values.proxyInit.closeWaitTimeoutSecs }} - allowPrivilegeEscalation: true - {{- else }} - allowPrivilegeEscalation: false - {{- end }} - capabilities: - add: - - NET_ADMIN - - NET_RAW - {{- if .Values.proxyInit.capabilities -}} - {{- if .Values.proxyInit.capabilities.add }} - {{- toYaml .Values.proxyInit.capabilities.add | trim | nindent 4 }} - {{- end }} - {{- if .Values.proxyInit.capabilities.drop -}} - {{- include "partials.proxy-init.capabilities.drop" . | nindent 4 -}} - {{- end }} - {{- end }} - {{- if .Values.proxyInit.closeWaitTimeoutSecs }} - privileged: true - {{- else }} - privileged: false - {{- end }} - readOnlyRootFilesystem: true - runAsNonRoot: false - runAsUser: 0 -terminationMessagePolicy: FallbackToLogsOnError -{{- if or (not .Values.cniEnabled) .Values.proxyInit.saMountPath }} -volumeMounts: -{{- end -}} -{{- if not .Values.cniEnabled }} -- mountPath: {{.Values.proxyInit.xtMountPath.mountPath}} - name: {{.Values.proxyInit.xtMountPath.name}} -{{- end -}} -{{- if .Values.proxyInit.saMountPath }} -- mountPath: {{.Values.proxyInit.saMountPath.mountPath}} - name: {{.Values.proxyInit.saMountPath.name}} - readOnly: {{.Values.proxyInit.saMountPath.readOnly}} -{{- end -}} -{{- end -}} diff --git a/charts/linkerd-viz/charts/partials/templates/_proxy.tpl b/charts/linkerd-viz/charts/partials/templates/_proxy.tpl deleted file mode 100644 index b91404e..0000000 --- a/charts/linkerd-viz/charts/partials/templates/_proxy.tpl +++ /dev/null @@ -1,189 +0,0 @@ -{{ define "partials.proxy" -}} -{{- $trustDomain := (.Values.identityTrustDomain | default .Values.clusterDomain) -}} -env: -- name: _pod_name - valueFrom: - fieldRef: - fieldPath: metadata.name -- name: _pod_ns - valueFrom: - fieldRef: - fieldPath: metadata.namespace -- name: _pod_nodeName - valueFrom: - fieldRef: - fieldPath: spec.nodeName -{{- if .Values.proxy.cores }} -- name: LINKERD2_PROXY_CORES - value: {{.Values.proxy.cores | quote}} -{{- end }} -{{ if .Values.proxy.requireIdentityOnInboundPorts -}} -- name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_IDENTITY - value: {{.Values.proxy.requireIdentityOnInboundPorts | quote}} -{{ end -}} -{{ if .Values.proxy.requireTLSOnInboundPorts -}} -- name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS - value: {{.Values.proxy.requireTLSOnInboundPorts | quote}} -{{ end -}} -- name: LINKERD2_PROXY_LOG - value: {{.Values.proxy.logLevel | quote}} -- name: LINKERD2_PROXY_LOG_FORMAT - value: {{.Values.proxy.logFormat | quote}} -- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR - value: {{ternary "localhost.:8086" (printf "linkerd-dst-headless.%s.svc.%s.:8086" .Values.namespace .Values.clusterDomain) (eq (toString .Values.proxy.component) "linkerd-destination")}} -- name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS - value: {{.Values.clusterNetworks | quote}} -- name: LINKERD2_PROXY_POLICY_SVC_ADDR - value: {{ternary "localhost.:8090" (printf "linkerd-policy.%s.svc.%s.:8090" .Values.namespace .Values.clusterDomain) (eq (toString .Values.proxy.component) "linkerd-destination")}} -- name: LINKERD2_PROXY_POLICY_WORKLOAD - value: "$(_pod_ns):$(_pod_name)" -- name: LINKERD2_PROXY_INBOUND_DEFAULT_POLICY - value: {{.Values.proxy.defaultInboundPolicy | default .Values.policyController.defaultAllowPolicy}} -- name: LINKERD2_PROXY_POLICY_CLUSTER_NETWORKS - value: {{.Values.clusterNetworks | quote}} -{{ if .Values.proxy.inboundConnectTimeout -}} -- name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT - value: {{.Values.proxy.inboundConnectTimeout | quote}} -{{ end -}} -{{ if .Values.proxy.outboundConnectTimeout -}} -- name: LINKERD2_PROXY_OUTBOUND_CONNECT_TIMEOUT - value: {{.Values.proxy.outboundConnectTimeout | quote}} -{{ end -}} -- name: LINKERD2_PROXY_CONTROL_LISTEN_ADDR - value: 0.0.0.0:{{.Values.proxy.ports.control}} -- name: LINKERD2_PROXY_ADMIN_LISTEN_ADDR - value: 0.0.0.0:{{.Values.proxy.ports.admin}} -- name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR - value: 127.0.0.1:{{.Values.proxy.ports.outbound}} -- name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR - value: 0.0.0.0:{{.Values.proxy.ports.inbound}} -- name: LINKERD2_PROXY_INBOUND_IPS - valueFrom: - fieldRef: - fieldPath: status.podIPs -{{ if .Values.proxy.podInboundPorts -}} -- name: LINKERD2_PROXY_INBOUND_PORTS - value: {{ .Values.proxy.podInboundPorts | quote }} -{{ end -}} -{{ if .Values.proxy.isGateway -}} -- name: LINKERD2_PROXY_INBOUND_GATEWAY_SUFFIXES - value: {{printf "svc.%s." .Values.clusterDomain}} -{{ end -}} -{{ if .Values.proxy.isIngress -}} -- name: LINKERD2_PROXY_INGRESS_MODE - value: "true" -{{ end -}} -- name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES - {{- $internalDomain := printf "svc.%s." .Values.clusterDomain }} - value: {{ternary "." $internalDomain .Values.proxy.enableExternalProfiles}} -- name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE - value: 10000ms -- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE - value: 10000ms -{{ if .Values.proxy.opaquePorts -}} -- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION - value: {{.Values.proxy.opaquePorts | quote}} -{{ end -}} -- name: LINKERD2_PROXY_DESTINATION_CONTEXT - value: | - {"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"} -{{ if .Values.proxy.disableIdentity -}} -- name: LINKERD2_PROXY_IDENTITY_DISABLED - value: disabled -{{ else -}} -- name: _pod_sa - valueFrom: - fieldRef: - fieldPath: spec.serviceAccountName -- name: _l5d_ns - value: {{.Values.namespace}} -- name: _l5d_trustdomain - value: {{$trustDomain}} -- name: LINKERD2_PROXY_IDENTITY_DIR - value: /var/run/linkerd/identity/end-entity -- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS -{{- /* -Pods in the `linkerd` namespace are not injected by the proxy injector and instead obtain -the trust anchor bundle from the `linkerd-identity-trust-roots` configmap. This should not -be used in other contexts. -*/}} -{{- if .Values.proxy.loadTrustBundleFromConfigMap }} - valueFrom: - configMapKeyRef: - name: linkerd-identity-trust-roots - key: ca-bundle.crt -{{ else }} - value: | - {{- required "Please provide the identity trust anchors" .Values.identityTrustAnchorsPEM | trim | nindent 4 }} -{{ end -}} -- name: LINKERD2_PROXY_IDENTITY_TOKEN_FILE - value: /var/run/secrets/kubernetes.io/serviceaccount/token -- name: LINKERD2_PROXY_IDENTITY_SVC_ADDR - value: {{ternary "localhost.:8080" (printf "linkerd-identity-headless.%s.svc.%s.:8080" .Values.namespace .Values.clusterDomain) (eq (toString .Values.proxy.component) "linkerd-identity")}} -- name: LINKERD2_PROXY_IDENTITY_LOCAL_NAME - value: $(_pod_sa).$(_pod_ns).serviceaccount.identity.{{.Values.namespace}}.{{$trustDomain}} -- name: LINKERD2_PROXY_IDENTITY_SVC_NAME - value: linkerd-identity.{{.Values.namespace}}.serviceaccount.identity.{{.Values.namespace}}.{{$trustDomain}} -- name: LINKERD2_PROXY_DESTINATION_SVC_NAME - value: linkerd-destination.{{.Values.namespace}}.serviceaccount.identity.{{.Values.namespace}}.{{$trustDomain}} -- name: LINKERD2_PROXY_POLICY_SVC_NAME - value: linkerd-destination.{{.Values.namespace}}.serviceaccount.identity.{{.Values.namespace}}.{{$trustDomain}} -{{ end -}} -image: {{.Values.proxy.image.name}}:{{.Values.proxy.image.version | default .Values.linkerdVersion}} -imagePullPolicy: {{.Values.proxy.image.pullPolicy | default .Values.imagePullPolicy}} -livenessProbe: - httpGet: - path: /live - port: {{.Values.proxy.ports.admin}} - initialDelaySeconds: 10 -name: linkerd-proxy -ports: -- containerPort: {{.Values.proxy.ports.inbound}} - name: linkerd-proxy -- containerPort: {{.Values.proxy.ports.admin}} - name: linkerd-admin -readinessProbe: - httpGet: - path: /ready - port: {{.Values.proxy.ports.admin}} - initialDelaySeconds: 2 -{{- if .Values.proxy.resources }} -{{ include "partials.resources" .Values.proxy.resources }} -{{- end }} -securityContext: - allowPrivilegeEscalation: false - {{- if .Values.proxy.capabilities -}} - {{- include "partials.proxy.capabilities" . | nindent 2 -}} - {{- end }} - readOnlyRootFilesystem: true - runAsUser: {{.Values.proxy.uid}} -terminationMessagePolicy: FallbackToLogsOnError -{{- if or (.Values.proxy.await) (.Values.proxy.waitBeforeExitSeconds) }} -lifecycle: -{{- if .Values.proxy.await }} - postStart: - exec: - command: - - /usr/lib/linkerd/linkerd-await -{{- end }} -{{- if .Values.proxy.waitBeforeExitSeconds }} - preStop: - exec: - command: - - /bin/sleep - - {{.Values.proxy.waitBeforeExitSeconds | quote}} -{{- end }} -{{- end }} -{{- if or (not .Values.proxy.disableIdentity) (.Values.proxy.saMountPath) }} -volumeMounts: -{{- if not .Values.proxy.disableIdentity }} -- mountPath: /var/run/linkerd/identity/end-entity - name: linkerd-identity-end-entity -{{- end -}} -{{- if .Values.proxy.saMountPath }} -- mountPath: {{.Values.proxy.saMountPath.mountPath}} - name: {{.Values.proxy.saMountPath.name}} - readOnly: {{.Values.proxy.saMountPath.readOnly}} -{{- end -}} -{{- end -}} -{{- end }} diff --git a/charts/linkerd-viz/charts/partials/templates/_pull-secrets.tpl b/charts/linkerd-viz/charts/partials/templates/_pull-secrets.tpl deleted file mode 100644 index 0c9aa4f..0000000 --- a/charts/linkerd-viz/charts/partials/templates/_pull-secrets.tpl +++ /dev/null @@ -1,6 +0,0 @@ -{{- define "partials.image-pull-secrets"}} -{{- if . }} -imagePullSecrets: -{{ toYaml . | indent 2 }} -{{- end }} -{{- end -}} diff --git a/charts/linkerd-viz/charts/partials/templates/_resources.tpl b/charts/linkerd-viz/charts/partials/templates/_resources.tpl deleted file mode 100644 index 0f33725..0000000 --- a/charts/linkerd-viz/charts/partials/templates/_resources.tpl +++ /dev/null @@ -1,21 +0,0 @@ -{{- define "partials.resources" -}} -resources: - {{- if or .cpu.limit .memory.limit }} - limits: - {{- with .cpu.limit }} - cpu: {{. | quote}} - {{- end }} - {{- with .memory.limit }} - memory: {{. | quote}} - {{- end }} - {{- end }} - {{- if or .cpu.request .memory.request }} - requests: - {{- with .cpu.request }} - cpu: {{. | quote}} - {{- end }} - {{- with .memory.request }} - memory: {{. | quote}} - {{- end }} - {{- end }} -{{- end }} diff --git a/charts/linkerd-viz/charts/partials/templates/_tolerations.tpl b/charts/linkerd-viz/charts/partials/templates/_tolerations.tpl deleted file mode 100644 index c2292b1..0000000 --- a/charts/linkerd-viz/charts/partials/templates/_tolerations.tpl +++ /dev/null @@ -1,4 +0,0 @@ -{{- define "linkerd.tolerations" -}} -tolerations: -{{ toYaml .Values.tolerations | trim | indent 2 }} -{{- end -}} diff --git a/charts/linkerd-viz/charts/partials/templates/_trace.tpl b/charts/linkerd-viz/charts/partials/templates/_trace.tpl deleted file mode 100644 index dee0595..0000000 --- a/charts/linkerd-viz/charts/partials/templates/_trace.tpl +++ /dev/null @@ -1,5 +0,0 @@ -{{ define "partials.linkerd.trace" -}} -{{ if .Values.controlPlaneTracing -}} -- -trace-collector=collector.{{.Values.controlPlaneTracingNamespace}}.svc.{{.Values.clusterDomain}}:55678 -{{ end -}} -{{- end }} diff --git a/charts/linkerd-viz/charts/partials/templates/_validate.tpl b/charts/linkerd-viz/charts/partials/templates/_validate.tpl deleted file mode 100644 index 3eeb70c..0000000 --- a/charts/linkerd-viz/charts/partials/templates/_validate.tpl +++ /dev/null @@ -1,5 +0,0 @@ -{{- define "linkerd.proxy.validation" -}} -{{- if .disableIdentity -}} -{{- fail (printf "Can't disable identity mTLS for %s. Set '.Values.proxy.disableIdentity' to 'false'" .component) -}} -{{- end -}} -{{- end -}} diff --git a/charts/linkerd-viz/charts/partials/templates/_volumes.tpl b/charts/linkerd-viz/charts/partials/templates/_volumes.tpl deleted file mode 100644 index 7debc9f..0000000 --- a/charts/linkerd-viz/charts/partials/templates/_volumes.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{ define "partials.proxy.volumes.identity" -}} -emptyDir: - medium: Memory -name: linkerd-identity-end-entity -{{- end -}} - -{{ define "partials.proxyInit.volumes.xtables" -}} -emptyDir: {} -name: {{ .Values.proxyInit.xtMountPath.name }} -{{- end -}} diff --git a/charts/linkerd-viz/charts/partials/values.yaml b/charts/linkerd-viz/charts/partials/values.yaml deleted file mode 100644 index e69de29..0000000 diff --git a/charts/linkerd-viz/requirements.lock b/charts/linkerd-viz/requirements.lock index 35fce64..d628603 100644 --- a/charts/linkerd-viz/requirements.lock +++ b/charts/linkerd-viz/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: partials - repository: file://charts/partials + repository: file://../partials version: 0.1.0 -digest: sha256:1e7c830a7b03158421bf87b0ce3785b5d14d71bc9977bb34c279703698facb7b -generated: "2021-12-10T11:03:05.076802+02:00" +digest: sha256:8e42f9c9d4a2dc883f17f94d6044c97518ced19ad0922f47b8760e47135369ba +generated: "2021-12-10T14:30:49.588141+02:00" diff --git a/charts/linkerd-viz/requirements.yaml b/charts/linkerd-viz/requirements.yaml index 7aa50fc..a17d782 100644 --- a/charts/linkerd-viz/requirements.yaml +++ b/charts/linkerd-viz/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: partials version: 0.1.0 - repository: file://charts/partials + repository: file://../partials diff --git a/charts/linkerd2/charts/partials/.helmignore b/charts/linkerd2/charts/partials/.helmignore deleted file mode 100644 index f0c1319..0000000 --- a/charts/linkerd2/charts/partials/.helmignore +++ /dev/null @@ -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 diff --git a/charts/linkerd2/charts/partials/Chart.yaml b/charts/linkerd2/charts/partials/Chart.yaml deleted file mode 100644 index b269da1..0000000 --- a/charts/linkerd2/charts/partials/Chart.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -description: | - A Helm chart containing Linkerd partial templates, - depended by the 'linkerd' and 'patch' charts. -name: partials -version: 0.1.0 diff --git a/charts/linkerd2/charts/partials/README.md b/charts/linkerd2/charts/partials/README.md deleted file mode 100644 index 1663c6e..0000000 --- a/charts/linkerd2/charts/partials/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# partials - -A Helm chart containing Linkerd partial templates, -depended by the 'linkerd' and 'patch' charts. - -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) - ----------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.4.0](https://github.com/norwoodj/helm-docs/releases/v1.4.0) diff --git a/charts/linkerd2/charts/partials/README.md.gotmpl b/charts/linkerd2/charts/partials/README.md.gotmpl deleted file mode 100644 index 37f5101..0000000 --- a/charts/linkerd2/charts/partials/README.md.gotmpl +++ /dev/null @@ -1,14 +0,0 @@ -{{ template "chart.header" . }} -{{ template "chart.description" . }} - -{{ template "chart.versionBadge" . }} -{{ template "chart.typeBadge" . }} -{{ template "chart.appVersionBadge" . }} - -{{ template "chart.homepageLine" . }} - -{{ template "chart.requirementsSection" . }} - -{{ template "chart.valuesSection" . }} - -{{ template "helm-docs.versionFooter" . }} diff --git a/charts/linkerd2/charts/partials/templates/NOTES.txt b/charts/linkerd2/charts/partials/templates/NOTES.txt deleted file mode 100644 index e69de29..0000000 diff --git a/charts/linkerd2/charts/partials/templates/_affinity.tpl b/charts/linkerd2/charts/partials/templates/_affinity.tpl deleted file mode 100644 index 926a4ee..0000000 --- a/charts/linkerd2/charts/partials/templates/_affinity.tpl +++ /dev/null @@ -1,22 +0,0 @@ -{{ define "linkerd.pod-affinity" -}} -affinity: - podAntiAffinity: - preferredDuringSchedulingIgnoredDuringExecution: - - podAffinityTerm: - labelSelector: - matchExpressions: - - key: {{ default "linkerd.io/control-plane-component" .label }} - operator: In - values: - - {{ .component }} - topologyKey: failure-domain.beta.kubernetes.io/zone - weight: 100 - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchExpressions: - - key: {{ default "linkerd.io/control-plane-component" .label }} - operator: In - values: - - {{ .component }} - topologyKey: kubernetes.io/hostname -{{- end }} diff --git a/charts/linkerd2/charts/partials/templates/_capabilities.tpl b/charts/linkerd2/charts/partials/templates/_capabilities.tpl deleted file mode 100644 index a595d74..0000000 --- a/charts/linkerd2/charts/partials/templates/_capabilities.tpl +++ /dev/null @@ -1,16 +0,0 @@ -{{- define "partials.proxy.capabilities" -}} -capabilities: - {{- if .Values.proxy.capabilities.add }} - add: - {{- toYaml .Values.proxy.capabilities.add | trim | nindent 4 }} - {{- end }} - {{- if .Values.proxy.capabilities.drop }} - drop: - {{- toYaml .Values.proxy.capabilities.drop | trim | nindent 4 }} - {{- end }} -{{- end -}} - -{{- define "partials.proxy-init.capabilities.drop" -}} -drop: -{{ toYaml .Values.proxyInit.capabilities.drop | trim }} -{{- end -}} diff --git a/charts/linkerd2/charts/partials/templates/_debug.tpl b/charts/linkerd2/charts/partials/templates/_debug.tpl deleted file mode 100644 index cf0eb14..0000000 --- a/charts/linkerd2/charts/partials/templates/_debug.tpl +++ /dev/null @@ -1,6 +0,0 @@ -{{- define "partials.debug" -}} -image: {{.Values.debugContainer.image.name}}:{{.Values.debugContainer.image.version | default .Values.linkerdVersion}} -imagePullPolicy: {{.Values.debugContainer.image.pullPolicy | default .Values.imagePullPolicy}} -name: linkerd-debug -terminationMessagePolicy: FallbackToLogsOnError -{{- end -}} diff --git a/charts/linkerd2/charts/partials/templates/_helpers.tpl b/charts/linkerd2/charts/partials/templates/_helpers.tpl deleted file mode 100644 index b6cdc34..0000000 --- a/charts/linkerd2/charts/partials/templates/_helpers.tpl +++ /dev/null @@ -1,14 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Splits a coma separated list into a list of string values. -For example "11,22,55,44" will become "11","22","55","44" -*/}} -{{- define "partials.splitStringList" -}} -{{- if gt (len (toString .)) 0 -}} -{{- $ports := toString . | splitList "," -}} -{{- $last := sub (len $ports) 1 -}} -{{- range $i,$port := $ports -}} -"{{$port}}"{{ternary "," "" (ne $i $last)}} -{{- end -}} -{{- end -}} -{{- end -}} diff --git a/charts/linkerd2/charts/partials/templates/_metadata.tpl b/charts/linkerd2/charts/partials/templates/_metadata.tpl deleted file mode 100644 index 7cf0744..0000000 --- a/charts/linkerd2/charts/partials/templates/_metadata.tpl +++ /dev/null @@ -1,16 +0,0 @@ -{{- define "partials.annotations.created-by" -}} -linkerd.io/created-by: {{ .Values.cliVersion | default (printf "linkerd/helm %s" (.Values.cniPluginVersion | default .Values.linkerdVersion)) }} -{{- end -}} - -{{- define "partials.proxy.annotations" -}} -linkerd.io/identity-mode: {{ternary "default" "disabled" (not .Values.proxy.disableIdentity)}} -linkerd.io/proxy-version: {{.Values.proxy.image.version | default .Values.linkerdVersion}} -{{- end -}} - -{{/* -To add labels to the control-plane components, instead update at individual component manifests as -adding here would also update `spec.selector.matchLabels` which are immutable and would fail upgrades. -*/}} -{{- define "partials.proxy.labels" -}} -linkerd.io/proxy-{{.workloadKind}}: {{.component}} -{{- end -}} diff --git a/charts/linkerd2/charts/partials/templates/_nodeselector.tpl b/charts/linkerd2/charts/partials/templates/_nodeselector.tpl deleted file mode 100644 index 4cde0ab..0000000 --- a/charts/linkerd2/charts/partials/templates/_nodeselector.tpl +++ /dev/null @@ -1,4 +0,0 @@ -{{- define "linkerd.node-selector" -}} -nodeSelector: -{{- toYaml .Values.nodeSelector | trim | nindent 2 }} -{{- end -}} diff --git a/charts/linkerd2/charts/partials/templates/_proxy-config-ann.tpl b/charts/linkerd2/charts/partials/templates/_proxy-config-ann.tpl deleted file mode 100644 index 9651b3b..0000000 --- a/charts/linkerd2/charts/partials/templates/_proxy-config-ann.tpl +++ /dev/null @@ -1,18 +0,0 @@ -{{- define "partials.proxy.config.annotations" -}} -{{- with .cpu }} -{{- with .request -}} -config.linkerd.io/proxy-cpu-request: {{. | quote}} -{{end}} -{{- with .limit -}} -config.linkerd.io/proxy-cpu-limit: {{. | quote}} -{{- end}} -{{- end}} -{{- with .memory }} -{{- with .request }} -config.linkerd.io/proxy-memory-request: {{. | quote}} -{{end}} -{{- with .limit -}} -config.linkerd.io/proxy-memory-limit: {{. | quote}} -{{- end}} -{{- end }} -{{- end }} diff --git a/charts/linkerd2/charts/partials/templates/_proxy-init.tpl b/charts/linkerd2/charts/partials/templates/_proxy-init.tpl deleted file mode 100644 index 3241155..0000000 --- a/charts/linkerd2/charts/partials/templates/_proxy-init.tpl +++ /dev/null @@ -1,62 +0,0 @@ -{{- define "partials.proxy-init" -}} -args: -- --incoming-proxy-port -- {{.Values.proxy.ports.inbound | quote}} -- --outgoing-proxy-port -- {{.Values.proxy.ports.outbound | quote}} -- --proxy-uid -- {{.Values.proxy.uid | quote}} -- --inbound-ports-to-ignore -- "{{.Values.proxy.ports.control}},{{.Values.proxy.ports.admin}}{{ternary (printf ",%s" (.Values.proxyInit.ignoreInboundPorts | toString)) "" (not (empty .Values.proxyInit.ignoreInboundPorts)) }}" -{{- if .Values.proxyInit.ignoreOutboundPorts }} -- --outbound-ports-to-ignore -- {{.Values.proxyInit.ignoreOutboundPorts | quote}} -{{- end }} -{{- if .Values.proxyInit.closeWaitTimeoutSecs }} -- --timeout-close-wait-secs -- {{ .Values.proxyInit.closeWaitTimeoutSecs | quote}} -{{- end }} -image: {{.Values.proxyInit.image.name}}:{{.Values.proxyInit.image.version}} -imagePullPolicy: {{.Values.proxyInit.image.pullPolicy | default .Values.imagePullPolicy}} -name: linkerd-init -{{ include "partials.resources" .Values.proxyInit.resources }} -securityContext: - {{- if .Values.proxyInit.closeWaitTimeoutSecs }} - allowPrivilegeEscalation: true - {{- else }} - allowPrivilegeEscalation: false - {{- end }} - capabilities: - add: - - NET_ADMIN - - NET_RAW - {{- if .Values.proxyInit.capabilities -}} - {{- if .Values.proxyInit.capabilities.add }} - {{- toYaml .Values.proxyInit.capabilities.add | trim | nindent 4 }} - {{- end }} - {{- if .Values.proxyInit.capabilities.drop -}} - {{- include "partials.proxy-init.capabilities.drop" . | nindent 4 -}} - {{- end }} - {{- end }} - {{- if .Values.proxyInit.closeWaitTimeoutSecs }} - privileged: true - {{- else }} - privileged: false - {{- end }} - readOnlyRootFilesystem: true - runAsNonRoot: false - runAsUser: 0 -terminationMessagePolicy: FallbackToLogsOnError -{{- if or (not .Values.cniEnabled) .Values.proxyInit.saMountPath }} -volumeMounts: -{{- end -}} -{{- if not .Values.cniEnabled }} -- mountPath: {{.Values.proxyInit.xtMountPath.mountPath}} - name: {{.Values.proxyInit.xtMountPath.name}} -{{- end -}} -{{- if .Values.proxyInit.saMountPath }} -- mountPath: {{.Values.proxyInit.saMountPath.mountPath}} - name: {{.Values.proxyInit.saMountPath.name}} - readOnly: {{.Values.proxyInit.saMountPath.readOnly}} -{{- end -}} -{{- end -}} diff --git a/charts/linkerd2/charts/partials/templates/_proxy.tpl b/charts/linkerd2/charts/partials/templates/_proxy.tpl deleted file mode 100644 index b91404e..0000000 --- a/charts/linkerd2/charts/partials/templates/_proxy.tpl +++ /dev/null @@ -1,189 +0,0 @@ -{{ define "partials.proxy" -}} -{{- $trustDomain := (.Values.identityTrustDomain | default .Values.clusterDomain) -}} -env: -- name: _pod_name - valueFrom: - fieldRef: - fieldPath: metadata.name -- name: _pod_ns - valueFrom: - fieldRef: - fieldPath: metadata.namespace -- name: _pod_nodeName - valueFrom: - fieldRef: - fieldPath: spec.nodeName -{{- if .Values.proxy.cores }} -- name: LINKERD2_PROXY_CORES - value: {{.Values.proxy.cores | quote}} -{{- end }} -{{ if .Values.proxy.requireIdentityOnInboundPorts -}} -- name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_IDENTITY - value: {{.Values.proxy.requireIdentityOnInboundPorts | quote}} -{{ end -}} -{{ if .Values.proxy.requireTLSOnInboundPorts -}} -- name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS - value: {{.Values.proxy.requireTLSOnInboundPorts | quote}} -{{ end -}} -- name: LINKERD2_PROXY_LOG - value: {{.Values.proxy.logLevel | quote}} -- name: LINKERD2_PROXY_LOG_FORMAT - value: {{.Values.proxy.logFormat | quote}} -- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR - value: {{ternary "localhost.:8086" (printf "linkerd-dst-headless.%s.svc.%s.:8086" .Values.namespace .Values.clusterDomain) (eq (toString .Values.proxy.component) "linkerd-destination")}} -- name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS - value: {{.Values.clusterNetworks | quote}} -- name: LINKERD2_PROXY_POLICY_SVC_ADDR - value: {{ternary "localhost.:8090" (printf "linkerd-policy.%s.svc.%s.:8090" .Values.namespace .Values.clusterDomain) (eq (toString .Values.proxy.component) "linkerd-destination")}} -- name: LINKERD2_PROXY_POLICY_WORKLOAD - value: "$(_pod_ns):$(_pod_name)" -- name: LINKERD2_PROXY_INBOUND_DEFAULT_POLICY - value: {{.Values.proxy.defaultInboundPolicy | default .Values.policyController.defaultAllowPolicy}} -- name: LINKERD2_PROXY_POLICY_CLUSTER_NETWORKS - value: {{.Values.clusterNetworks | quote}} -{{ if .Values.proxy.inboundConnectTimeout -}} -- name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT - value: {{.Values.proxy.inboundConnectTimeout | quote}} -{{ end -}} -{{ if .Values.proxy.outboundConnectTimeout -}} -- name: LINKERD2_PROXY_OUTBOUND_CONNECT_TIMEOUT - value: {{.Values.proxy.outboundConnectTimeout | quote}} -{{ end -}} -- name: LINKERD2_PROXY_CONTROL_LISTEN_ADDR - value: 0.0.0.0:{{.Values.proxy.ports.control}} -- name: LINKERD2_PROXY_ADMIN_LISTEN_ADDR - value: 0.0.0.0:{{.Values.proxy.ports.admin}} -- name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR - value: 127.0.0.1:{{.Values.proxy.ports.outbound}} -- name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR - value: 0.0.0.0:{{.Values.proxy.ports.inbound}} -- name: LINKERD2_PROXY_INBOUND_IPS - valueFrom: - fieldRef: - fieldPath: status.podIPs -{{ if .Values.proxy.podInboundPorts -}} -- name: LINKERD2_PROXY_INBOUND_PORTS - value: {{ .Values.proxy.podInboundPorts | quote }} -{{ end -}} -{{ if .Values.proxy.isGateway -}} -- name: LINKERD2_PROXY_INBOUND_GATEWAY_SUFFIXES - value: {{printf "svc.%s." .Values.clusterDomain}} -{{ end -}} -{{ if .Values.proxy.isIngress -}} -- name: LINKERD2_PROXY_INGRESS_MODE - value: "true" -{{ end -}} -- name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES - {{- $internalDomain := printf "svc.%s." .Values.clusterDomain }} - value: {{ternary "." $internalDomain .Values.proxy.enableExternalProfiles}} -- name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE - value: 10000ms -- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE - value: 10000ms -{{ if .Values.proxy.opaquePorts -}} -- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION - value: {{.Values.proxy.opaquePorts | quote}} -{{ end -}} -- name: LINKERD2_PROXY_DESTINATION_CONTEXT - value: | - {"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"} -{{ if .Values.proxy.disableIdentity -}} -- name: LINKERD2_PROXY_IDENTITY_DISABLED - value: disabled -{{ else -}} -- name: _pod_sa - valueFrom: - fieldRef: - fieldPath: spec.serviceAccountName -- name: _l5d_ns - value: {{.Values.namespace}} -- name: _l5d_trustdomain - value: {{$trustDomain}} -- name: LINKERD2_PROXY_IDENTITY_DIR - value: /var/run/linkerd/identity/end-entity -- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS -{{- /* -Pods in the `linkerd` namespace are not injected by the proxy injector and instead obtain -the trust anchor bundle from the `linkerd-identity-trust-roots` configmap. This should not -be used in other contexts. -*/}} -{{- if .Values.proxy.loadTrustBundleFromConfigMap }} - valueFrom: - configMapKeyRef: - name: linkerd-identity-trust-roots - key: ca-bundle.crt -{{ else }} - value: | - {{- required "Please provide the identity trust anchors" .Values.identityTrustAnchorsPEM | trim | nindent 4 }} -{{ end -}} -- name: LINKERD2_PROXY_IDENTITY_TOKEN_FILE - value: /var/run/secrets/kubernetes.io/serviceaccount/token -- name: LINKERD2_PROXY_IDENTITY_SVC_ADDR - value: {{ternary "localhost.:8080" (printf "linkerd-identity-headless.%s.svc.%s.:8080" .Values.namespace .Values.clusterDomain) (eq (toString .Values.proxy.component) "linkerd-identity")}} -- name: LINKERD2_PROXY_IDENTITY_LOCAL_NAME - value: $(_pod_sa).$(_pod_ns).serviceaccount.identity.{{.Values.namespace}}.{{$trustDomain}} -- name: LINKERD2_PROXY_IDENTITY_SVC_NAME - value: linkerd-identity.{{.Values.namespace}}.serviceaccount.identity.{{.Values.namespace}}.{{$trustDomain}} -- name: LINKERD2_PROXY_DESTINATION_SVC_NAME - value: linkerd-destination.{{.Values.namespace}}.serviceaccount.identity.{{.Values.namespace}}.{{$trustDomain}} -- name: LINKERD2_PROXY_POLICY_SVC_NAME - value: linkerd-destination.{{.Values.namespace}}.serviceaccount.identity.{{.Values.namespace}}.{{$trustDomain}} -{{ end -}} -image: {{.Values.proxy.image.name}}:{{.Values.proxy.image.version | default .Values.linkerdVersion}} -imagePullPolicy: {{.Values.proxy.image.pullPolicy | default .Values.imagePullPolicy}} -livenessProbe: - httpGet: - path: /live - port: {{.Values.proxy.ports.admin}} - initialDelaySeconds: 10 -name: linkerd-proxy -ports: -- containerPort: {{.Values.proxy.ports.inbound}} - name: linkerd-proxy -- containerPort: {{.Values.proxy.ports.admin}} - name: linkerd-admin -readinessProbe: - httpGet: - path: /ready - port: {{.Values.proxy.ports.admin}} - initialDelaySeconds: 2 -{{- if .Values.proxy.resources }} -{{ include "partials.resources" .Values.proxy.resources }} -{{- end }} -securityContext: - allowPrivilegeEscalation: false - {{- if .Values.proxy.capabilities -}} - {{- include "partials.proxy.capabilities" . | nindent 2 -}} - {{- end }} - readOnlyRootFilesystem: true - runAsUser: {{.Values.proxy.uid}} -terminationMessagePolicy: FallbackToLogsOnError -{{- if or (.Values.proxy.await) (.Values.proxy.waitBeforeExitSeconds) }} -lifecycle: -{{- if .Values.proxy.await }} - postStart: - exec: - command: - - /usr/lib/linkerd/linkerd-await -{{- end }} -{{- if .Values.proxy.waitBeforeExitSeconds }} - preStop: - exec: - command: - - /bin/sleep - - {{.Values.proxy.waitBeforeExitSeconds | quote}} -{{- end }} -{{- end }} -{{- if or (not .Values.proxy.disableIdentity) (.Values.proxy.saMountPath) }} -volumeMounts: -{{- if not .Values.proxy.disableIdentity }} -- mountPath: /var/run/linkerd/identity/end-entity - name: linkerd-identity-end-entity -{{- end -}} -{{- if .Values.proxy.saMountPath }} -- mountPath: {{.Values.proxy.saMountPath.mountPath}} - name: {{.Values.proxy.saMountPath.name}} - readOnly: {{.Values.proxy.saMountPath.readOnly}} -{{- end -}} -{{- end -}} -{{- end }} diff --git a/charts/linkerd2/charts/partials/templates/_pull-secrets.tpl b/charts/linkerd2/charts/partials/templates/_pull-secrets.tpl deleted file mode 100644 index 0c9aa4f..0000000 --- a/charts/linkerd2/charts/partials/templates/_pull-secrets.tpl +++ /dev/null @@ -1,6 +0,0 @@ -{{- define "partials.image-pull-secrets"}} -{{- if . }} -imagePullSecrets: -{{ toYaml . | indent 2 }} -{{- end }} -{{- end -}} diff --git a/charts/linkerd2/charts/partials/templates/_resources.tpl b/charts/linkerd2/charts/partials/templates/_resources.tpl deleted file mode 100644 index 0f33725..0000000 --- a/charts/linkerd2/charts/partials/templates/_resources.tpl +++ /dev/null @@ -1,21 +0,0 @@ -{{- define "partials.resources" -}} -resources: - {{- if or .cpu.limit .memory.limit }} - limits: - {{- with .cpu.limit }} - cpu: {{. | quote}} - {{- end }} - {{- with .memory.limit }} - memory: {{. | quote}} - {{- end }} - {{- end }} - {{- if or .cpu.request .memory.request }} - requests: - {{- with .cpu.request }} - cpu: {{. | quote}} - {{- end }} - {{- with .memory.request }} - memory: {{. | quote}} - {{- end }} - {{- end }} -{{- end }} diff --git a/charts/linkerd2/charts/partials/templates/_tolerations.tpl b/charts/linkerd2/charts/partials/templates/_tolerations.tpl deleted file mode 100644 index c2292b1..0000000 --- a/charts/linkerd2/charts/partials/templates/_tolerations.tpl +++ /dev/null @@ -1,4 +0,0 @@ -{{- define "linkerd.tolerations" -}} -tolerations: -{{ toYaml .Values.tolerations | trim | indent 2 }} -{{- end -}} diff --git a/charts/linkerd2/charts/partials/templates/_trace.tpl b/charts/linkerd2/charts/partials/templates/_trace.tpl deleted file mode 100644 index dee0595..0000000 --- a/charts/linkerd2/charts/partials/templates/_trace.tpl +++ /dev/null @@ -1,5 +0,0 @@ -{{ define "partials.linkerd.trace" -}} -{{ if .Values.controlPlaneTracing -}} -- -trace-collector=collector.{{.Values.controlPlaneTracingNamespace}}.svc.{{.Values.clusterDomain}}:55678 -{{ end -}} -{{- end }} diff --git a/charts/linkerd2/charts/partials/templates/_validate.tpl b/charts/linkerd2/charts/partials/templates/_validate.tpl deleted file mode 100644 index 3eeb70c..0000000 --- a/charts/linkerd2/charts/partials/templates/_validate.tpl +++ /dev/null @@ -1,5 +0,0 @@ -{{- define "linkerd.proxy.validation" -}} -{{- if .disableIdentity -}} -{{- fail (printf "Can't disable identity mTLS for %s. Set '.Values.proxy.disableIdentity' to 'false'" .component) -}} -{{- end -}} -{{- end -}} diff --git a/charts/linkerd2/charts/partials/templates/_volumes.tpl b/charts/linkerd2/charts/partials/templates/_volumes.tpl deleted file mode 100644 index 7debc9f..0000000 --- a/charts/linkerd2/charts/partials/templates/_volumes.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{ define "partials.proxy.volumes.identity" -}} -emptyDir: - medium: Memory -name: linkerd-identity-end-entity -{{- end -}} - -{{ define "partials.proxyInit.volumes.xtables" -}} -emptyDir: {} -name: {{ .Values.proxyInit.xtMountPath.name }} -{{- end -}} diff --git a/charts/linkerd2/charts/partials/values.yaml b/charts/linkerd2/charts/partials/values.yaml deleted file mode 100644 index e69de29..0000000 diff --git a/charts/linkerd2/requirements.lock b/charts/linkerd2/requirements.lock index 337d452..8080130 100644 --- a/charts/linkerd2/requirements.lock +++ b/charts/linkerd2/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: partials - repository: file://charts/partials + repository: file://../partials version: 0.1.0 -digest: sha256:1e7c830a7b03158421bf87b0ce3785b5d14d71bc9977bb34c279703698facb7b -generated: "2021-12-10T11:03:24.308401+02:00" +digest: sha256:8e42f9c9d4a2dc883f17f94d6044c97518ced19ad0922f47b8760e47135369ba +generated: "2021-12-10T14:30:57.844415+02:00" diff --git a/charts/linkerd2/requirements.yaml b/charts/linkerd2/requirements.yaml index 8ae44ba..a17d782 100644 --- a/charts/linkerd2/requirements.yaml +++ b/charts/linkerd2/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: partials version: 0.1.0 - repository: file://charts/partials + repository: file://../partials