(Fix) Updating helm charts to support version 3 windows integration #754
+107
−13
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
There was a problem hiding this comment. I may not understand the approach. However, this seems a V2 component being merged into the V3 chart. The image used is |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| {{- if and .Values.kubelet.enabled .Values.kubelet.enableWindows }} | ||
| {{- range .Values.kubelet.windowsOsList }} | ||
| apiVersion: apps/v1 | ||
| kind: DaemonSet | ||
| metadata: | ||
| namespace: {{ $.Release.Namespace }} | ||
| name: {{ include "nriKubernetes.kubelet.windows.fullname" $ }}-{{ .version }} | ||
| {{- $legacyAnnotation:= fromYaml (include "newrelic.compatibility.annotations" $) -}} | ||
| {{- with include "newrelic.compatibility.valueWithFallback" (dict "legacy" $legacyAnnotation "supported" $.Values.kubelet.annotations )}} | ||
| annotations: {{ . | nindent 4 }} | ||
| {{- end }} | ||
| spec: | ||
| {{- with $.Values.updateStrategy }} | ||
| updateStrategy: {{ toYaml . | nindent 4 }} | ||
| {{- end }} | ||
| selector: | ||
| matchLabels: | ||
| {{- include "newrelic.common.labels.selectorLabels" $ | nindent 6 }} | ||
| app.kubernetes.io/component: kubelet | ||
| template: | ||
| metadata: | ||
| annotations: | ||
| checksum/nri-kubernetes: {{ include (print $.Template.BasePath "/kubelet/scraper-configmap.yaml") $ | sha256sum }} | ||
|
There was a problem hiding this comment. Nri-kubernetes in V2 branch does not read any configuration, that was introduced in V3. I wonder if you actually compiled the V3 branch and pushed it to the old repo There are some discrepancies:
There was a problem hiding this comment. how a user could change the config mounted? or set a proxy? |
||
| checksum/agent-config: {{ include (print $.Template.BasePath "/kubelet/agent-configmap.yaml") $ | sha256sum }} | ||
| {{- if include "newrelic.common.license.secret" $ }}{{- /* If the is secret to template */}} | ||
| checksum/license-secret: {{ include (print $.Template.BasePath "/secret.yaml") $ | sha256sum }} | ||
| {{- end }} | ||
| labels: | ||
| {{- include "nriKubernetes.labels.podLabels" $ | nindent 8 }} | ||
| app.kubernetes.io/component: kubelet | ||
| spec: | ||
| {{- with include "newrelic.common.dnsConfig" $ }} | ||
| dnsConfig: | ||
| {{- . | nindent 8 }} | ||
| {{- end }} | ||
| serviceAccountName: {{ include "newrelic.common.serviceAccount.name" $ }} | ||
| containers: | ||
| - name: agent | ||
| image: newrelic/infrastructure-k8s:{{ .imageTag }} | ||
|
There was a problem hiding this comment. This is a V2 image, why not installing the nri-bundle-v2 next to the V3 then? In this way we are mixing them up in the same chart! |
||
| imagePullPolicy: {{ $.Values.images.integration.pullPolicy }} | ||
| env: | ||
| - name: NRIA_LICENSE_KEY | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: {{ include "newrelic.common.license.secretName" $ }} | ||
| key: {{ include "newrelic.common.license.secretKeyName" $ }} | ||
| - name: "NRI_KUBERNETES_CLUSTERNAME" | ||
| value: {{ include "newrelic.common.cluster" $ }} | ||
| - name: "NRI_KUBERNETES_VERBOSE" | ||
| value: {{ include "newrelic.common.verboseLog.valueAsBoolean" $ | quote }} | ||
| - name: "NRK8S_NODE_NAME" | ||
| valueFrom: | ||
| fieldRef: | ||
| apiVersion: "v1" | ||
| fieldPath: "spec.nodeName" | ||
| - name: "CLUSTER_NAME" | ||
| value: {{ include "newrelic.common.cluster" $ }} | ||
| - name: "NRIA_PASSTHROUGH_ENVIRONMENT" | ||
| value: "KUBERNETES_SERVICE_HOST,KUBERNETES_SERVICE_PORT,CLUSTER_NAME,CADVISOR_PORT,NRK8S_NODE_NAME,KUBE_STATE_METRICS_URL,ETCD_TLS_SECRET_NAME,ETCD_TLS_SECRET_NAMESPACE,API_SERVER_SECURE_PORT,NRIA_CACHE_PATH,TIMEOUT,DISCOVERY_CACHE_TTL" | ||
| nodeSelector: | ||
| node.kubernetes.io/windows-build: {{ .buildNumber }} | ||
| kubernetes.io/os: windows | ||
| tolerations: | ||
| - key: "node.kubernetes.io/os" | ||
| operator: "Equal" | ||
| value: "windows" | ||
| effect: "NoSchedule" | ||
| --- | ||
| {{- end }} | ||
| {{- end }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
make sure this readme is auto-generated by
helm-docs, otherwise, it will be overwritten