Skip to content

Add flags for charts to deploy on k3s/rke2 clusters #329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dahuang-purestorage wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add flags for charts to deploy on k3s/rke2 clusters #329

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ab95be
Add flags for k3s and required parameters
dahuang-purestorage Jan 13, 2022
310b252
moving k3s expression to a variable
dahuang-purestorage Jan 20, 2022
b088d3d
fixup! moving k3s expression to a variable
dahuang-purestorage Jan 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions charts/portworx/templates/portworx-ds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
{{- $pksInstall := .Values.pksInstall | default false }}
{{- $internalKVDB := .Values.internalKVDB | default false }}
{{- $kvdbDevice := .Values.kvdbDevice | default "none" }}
{{- $csi := .Values.csi | default false }}
{{- $csi := .Values.csi | default (not (.Capabilities.KubeVersion.GitVersion | toString | regexFind "(k3s|rke2)" | empty)) }}

{{- $etcdCredentials := .Values.etcd.credentials | default "none:none" }}
{{- $etcdCertPath := .Values.etcd.certPath | default "none" }}
Expand Down Expand Up @@ -258,6 +258,10 @@ spec:
{{- if not (eq $etcdCertPath "none") }}
- mountPath: /etc/pwx/etcdcerts
name: etcdcerts
{{- end }}
{{- if not (.Capabilities.KubeVersion.GitVersion | toString | regexFind "(k3s|rke2)" | empty) }}
- name: containerd-k3s
mountPath: /run/containerd/containerd.sock
{{- end }}
- name: diagsdump
mountPath: /var/cores
Expand Down Expand Up @@ -348,8 +352,6 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
securityContext:
privileged: true
volumeMounts:
- name: csi-driver-path
mountPath: /csi
Expand All @@ -358,6 +360,11 @@ spec:
{{- end }}

restartPolicy: Always
{{- if not (.Capabilities.KubeVersion.GitVersion | toString | regexFind "(k3s|rke2)" | empty) }}
tolerations:
- key: node-role.kubernetes.io/master
effect: NoSchedule
{{- end }}
serviceAccountName: px-account
volumes:
{{- if not (eq $etcdCertPath "none") }}
Expand All @@ -376,6 +383,11 @@ spec:
path: client-key.key
{{- end -}}
{{- end}}
{{- if not (.Capabilities.KubeVersion.GitVersion | toString | regexFind "(k3s|rke2)" | empty) }}
- name: containerd-k3s
hostPath:
path: /run/k3s/containerd/containerd.sock
{{- end }}
- name: diagsdump
hostPath:
path: {{if eq $pksInstall true }}/var/vcap/store/cores{{else}}/var/cores{{end}}
Expand Down Expand Up @@ -507,7 +519,7 @@ spec:
serviceAccountName: px-account
{{- if eq $csi true }}
---
apiVersion: storage.k8s.io/v1beta1
apiVersion: storage.k8s.io/v1
kind: CSIDriver
metadata:
name: "pxd.portworx.com"
Expand Down