Skip to content

Commit

Permalink
Merge branch 'master' into PWX-32409-master
Browse files Browse the repository at this point in the history
  • Loading branch information
nrevanna committed Aug 16, 2023
2 parents 43436ed + 2efec6b commit 6832256
Show file tree
Hide file tree
Showing 263 changed files with 10,713 additions and 3,993 deletions.
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -259,10 +259,13 @@ getccmconfigs:
getpluginconfigs:
cp deploy/plugin/* bin/configs/

getwindowsconfig:
cp deploy/windows/* bin/configs

getgrafanaconfigs:
cp deploy/grafana/* bin/configs/

getconfigs: cleanconfigs getccmconfigs getpluginconfigs getgrafanaconfigs
getconfigs: cleanconfigs getccmconfigs getpluginconfigs getgrafanaconfigs getwindowsconfig
wget -q '$(PX_DOC_HOST)/samples/k8s/pxc/portworx-prometheus-rule.yaml' -P bin/configs --no-check-certificate
wget -q '$(PROMETHEUS_OPERATOR_CRD_URL_PREFIX)/crd-alertmanagerconfigs.yaml' -O bin/configs/prometheus-crd-alertmanagerconfigs.yaml
wget -q '$(PROMETHEUS_OPERATOR_CRD_URL_PREFIX)/crd-alertmanagers.yaml' -O bin/configs/prometheus-crd-alertmanagers.yaml
Expand Down
7 changes: 1 addition & 6 deletions deploy/ccm/envoy-config-collector-custom-https-proxy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,4 @@ static_resources:
address:
socket_address:
address: CUSTOM_PROXY_ADDRESS
port_value: CUSTOM_PROXY_PORT
transport_socket:
name: envoy.transport_sockets.tls
typed_config:
"@type": type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext
sni: CUSTOM_PROXY_ADDRESS
port_value: CUSTOM_PROXY_PORT
7 changes: 1 addition & 6 deletions deploy/ccm/envoy-config-register-custom-https-proxy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,4 @@ static_resources:
address:
socket_address:
address: CUSTOM_PROXY_ADDRESS
port_value: CUSTOM_PROXY_PORT
transport_socket:
name: envoy.transport_sockets.tls
typed_config:
"@type": type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext
sni: CUSTOM_PROXY_ADDRESS
port_value: CUSTOM_PROXY_PORT
7 changes: 1 addition & 6 deletions deploy/ccm/envoy-config-rest-custom-https-proxy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,4 @@ static_resources:
address:
socket_address:
address: CUSTOM_PROXY_ADDRESS
port_value: CUSTOM_PROXY_PORT
transport_socket:
name: envoy.transport_sockets.tls
typed_config:
"@type": type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext
sni: CUSTOM_PROXY_ADDRESS
port_value: CUSTOM_PROXY_PORT
6 changes: 6 additions & 0 deletions deploy/crds/core_v1_storagecluster_crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3932,6 +3932,12 @@ spec:
csiNodeDriverRegistrar:
type: string
description: Desired image for CSI node driver registrar.
csiLivenessProbe:
type: string
description: Desired image for Liveness probe.
csiDriverWin:
type: string
description: Desired image for csi driver for windows.
csiDriverRegistrar:
type: string
description: Desired image for CSI driver registrar.
Expand Down
116 changes: 116 additions & 0 deletions deploy/windows/px-csi-node-win.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
apiVersion: apps/v1
kind: DaemonSet
metadata:
name: px-csi-node-win
spec:
selector:
matchLabels:
app: px-csi-node-win
template:
metadata:
labels:
app: px-csi-node-win
spec:
containers:
- args:
- '--csi-address=$(CSI_ENDPOINT)'
- '--probe-timeout=3s'
- '--health-port=29643'
- '--v=2'
command:
- /livenessprobe.exe
env:
- name: CSI_ENDPOINT
value: 'unix://C:\\csi\\csi.sock'
name: liveness-probe
resources:
limits:
memory: 100Mi
requests:
cpu: 10m
memory: 40Mi
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
- mountPath: 'C:\csi'
name: plugin-dir
- args:
- '--v=2'
- '--csi-address=$(CSI_ENDPOINT)'
- '--kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)'
command:
- /csi-node-driver-registrar.exe
env:
- name: CSI_ENDPOINT
value: 'unix://C:\\csi\\csi.sock'
- name: DRIVER_REG_SOCK_PATH
value: 'C:\\var\\lib\\kubelet\\plugins\\pxd.portworx.com\\csi.sock'
- name: KUBE_NODE_NAME
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: spec.nodeName
livenessProbe:
exec:
command:
- /csi-node-driver-registrar.exe
- '--kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)'
- '--mode=kubelet-registration-probe'
failureThreshold: 3
initialDelaySeconds: 60
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 30
name: node-driver-registrar
resources:
limits:
memory: 100Mi
requests:
cpu: 10m
memory: 40Mi
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
- mountPath: 'C:\var\lib\kubelet'
name: kubelet-dir
- mountPath: 'C:\csi'
name: plugin-dir
- mountPath: 'C:\registration'
name: registration-dir
dnsPolicy: ClusterFirst
hostNetwork: true
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: kubernetes.io/os
operator: In
values:
- windows
priorityClassName: system-node-critical
restartPolicy: Always
schedulerName: default-scheduler
securityContext: {}
terminationGracePeriodSeconds: 30
tolerations:
- key: os
value: Windows
volumes:
- hostPath:
path: 'C:\var\lib\kubelet\plugins_registry\'
type: Directory
name: registration-dir
- hostPath:
path: 'C:\var\lib\kubelet\'
type: Directory
name: kubelet-dir
- hostPath:
path: 'C:\var\lib\kubelet\plugins\pxd.portworx.com\'
type: DirectoryOrCreate
name: plugin-dir
updateStrategy:
rollingUpdate:
maxSurge: 0
maxUnavailable: 1
type: RollingUpdate
29 changes: 29 additions & 0 deletions deploy/windows/px-csi-win-driver.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
apiVersion: apps/v1
kind: DaemonSet
metadata:
name: px-csi-win-driver
labels:
app: px-csi-win-driver
spec:
selector:
matchLabels:
app: px-csi-win-driver
template:
metadata:
labels:
app: px-csi-win-driver
spec:
serviceAccountName: portworx
containers:
- name: windowsinstaller
image: docker.io/cnbuautomation800/pxwincsidriver:v0.1
imagePullPolicy: Always
securityContext:
windowsOptions:
hostProcess: true
runAsUserName: "NT AUTHORITY\\SYSTEM"
command:
- powershell.exe
- -command
- csidriver\\pxinstall.ps1
hostNetwork: true
36 changes: 18 additions & 18 deletions drivers/storage/portworx/component/portworx_sc.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ const (
// snapshots with encryption enabled
PxDbCloudSnapshotEncryptedCSIStorageClass = "px-csi-db-cloud-snapshot-encrypted"

portworxInTreeProvisioner = "kubernetes.io/portworx-volume"
portworxCSIProvisioner = "pxd.portworx.com"
PortworxInTreeProvisioner = "kubernetes.io/portworx-volume"
PortworxCSIProvisioner = "pxd.portworx.com"

portworxIoProfile = "db_remote"
)
Expand Down Expand Up @@ -121,7 +121,7 @@ func (c *portworxStorageClass) Reconcile(cluster *corev1.StorageCluster) error {
Name: PxDbStorageClass,
Annotations: docAnnotations,
},
Provisioner: portworxInTreeProvisioner,
Provisioner: PortworxInTreeProvisioner,
Parameters: map[string]string{
api.SpecHaLevel: "3",
api.SpecIoProfile: portworxIoProfile,
Expand All @@ -135,7 +135,7 @@ func (c *portworxStorageClass) Reconcile(cluster *corev1.StorageCluster) error {
"params/note": "Ensure that you have a cluster-wide secret created in the configured secrets provider",
},
},
Provisioner: portworxInTreeProvisioner,
Provisioner: PortworxInTreeProvisioner,
Parameters: map[string]string{
api.SpecHaLevel: "3",
api.SpecIoProfile: portworxIoProfile,
Expand All @@ -147,7 +147,7 @@ func (c *portworxStorageClass) Reconcile(cluster *corev1.StorageCluster) error {
ObjectMeta: metav1.ObjectMeta{
Name: PxReplicatedStorageClass,
},
Provisioner: portworxInTreeProvisioner,
Provisioner: PortworxInTreeProvisioner,
Parameters: map[string]string{
api.SpecHaLevel: "2",
},
Expand All @@ -157,7 +157,7 @@ func (c *portworxStorageClass) Reconcile(cluster *corev1.StorageCluster) error {
ObjectMeta: metav1.ObjectMeta{
Name: PxReplicatedEncryptedStorageClass,
},
Provisioner: portworxInTreeProvisioner,
Provisioner: PortworxInTreeProvisioner,
Parameters: map[string]string{
api.SpecHaLevel: "2",
api.SpecSecure: "true",
Expand All @@ -172,7 +172,7 @@ func (c *portworxStorageClass) Reconcile(cluster *corev1.StorageCluster) error {
ObjectMeta: metav1.ObjectMeta{
Name: PxDbLocalSnapshotStorageClass,
},
Provisioner: portworxInTreeProvisioner,
Provisioner: PortworxInTreeProvisioner,
Parameters: map[string]string{
api.SpecHaLevel: "3",
api.SpecIoProfile: portworxIoProfile,
Expand All @@ -187,7 +187,7 @@ annotations:
ObjectMeta: metav1.ObjectMeta{
Name: PxDbLocalSnapshotEncryptedStorageClass,
},
Provisioner: portworxInTreeProvisioner,
Provisioner: PortworxInTreeProvisioner,
Parameters: map[string]string{
api.SpecHaLevel: "3",
api.SpecSecure: "true",
Expand All @@ -203,7 +203,7 @@ annotations:
ObjectMeta: metav1.ObjectMeta{
Name: PxDbCloudSnapshotStorageClass,
},
Provisioner: portworxInTreeProvisioner,
Provisioner: PortworxInTreeProvisioner,
Parameters: map[string]string{
api.SpecHaLevel: "3",
api.SpecIoProfile: portworxIoProfile,
Expand All @@ -218,7 +218,7 @@ annotations:
ObjectMeta: metav1.ObjectMeta{
Name: PxDbCloudSnapshotEncryptedStorageClass,
},
Provisioner: portworxInTreeProvisioner,
Provisioner: PortworxInTreeProvisioner,
Parameters: map[string]string{
api.SpecHaLevel: "3",
api.SpecSecure: "true",
Expand Down Expand Up @@ -246,7 +246,7 @@ annotations:
Name: PxDbCSIStorageClass,
Annotations: docAnnotations,
},
Provisioner: portworxCSIProvisioner,
Provisioner: PortworxCSIProvisioner,
Parameters: map[string]string{
api.SpecHaLevel: "3",
api.SpecIoProfile: portworxIoProfile,
Expand All @@ -260,7 +260,7 @@ annotations:
"params/note": "Ensure that you have a cluster-wide secret created in the configured secrets provider",
},
},
Provisioner: portworxCSIProvisioner,
Provisioner: PortworxCSIProvisioner,
Parameters: map[string]string{
api.SpecHaLevel: "3",
api.SpecIoProfile: portworxIoProfile,
Expand All @@ -272,7 +272,7 @@ annotations:
ObjectMeta: metav1.ObjectMeta{
Name: PxReplicatedCSIStorageClass,
},
Provisioner: portworxCSIProvisioner,
Provisioner: PortworxCSIProvisioner,
Parameters: map[string]string{
api.SpecHaLevel: "2",
},
Expand All @@ -282,7 +282,7 @@ annotations:
ObjectMeta: metav1.ObjectMeta{
Name: PxReplicatedEncryptedCSIStorageClass,
},
Provisioner: portworxCSIProvisioner,
Provisioner: PortworxCSIProvisioner,
Parameters: map[string]string{
api.SpecHaLevel: "2",
api.SpecSecure: "true",
Expand All @@ -297,7 +297,7 @@ annotations:
ObjectMeta: metav1.ObjectMeta{
Name: PxDbLocalSnapshotCSIStorageClass,
},
Provisioner: portworxCSIProvisioner,
Provisioner: PortworxCSIProvisioner,
Parameters: map[string]string{
api.SpecHaLevel: "3",
api.SpecIoProfile: portworxIoProfile,
Expand All @@ -312,7 +312,7 @@ annotations:
ObjectMeta: metav1.ObjectMeta{
Name: PxDbLocalSnapshotEncryptedCSIStorageClass,
},
Provisioner: portworxCSIProvisioner,
Provisioner: PortworxCSIProvisioner,
Parameters: map[string]string{
api.SpecHaLevel: "3",
api.SpecSecure: "true",
Expand All @@ -328,7 +328,7 @@ annotations:
ObjectMeta: metav1.ObjectMeta{
Name: PxDbCloudSnapshotCSIStorageClass,
},
Provisioner: portworxCSIProvisioner,
Provisioner: PortworxCSIProvisioner,
Parameters: map[string]string{
api.SpecHaLevel: "3",
api.SpecIoProfile: portworxIoProfile,
Expand All @@ -343,7 +343,7 @@ annotations:
ObjectMeta: metav1.ObjectMeta{
Name: PxDbCloudSnapshotEncryptedCSIStorageClass,
},
Provisioner: portworxCSIProvisioner,
Provisioner: PortworxCSIProvisioner,
Parameters: map[string]string{
api.SpecHaLevel: "3",
api.SpecSecure: "true",
Expand Down
Loading

0 comments on commit 6832256

Please sign in to comment.