Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/dell/dell-csi-operator into…
Browse files Browse the repository at this point in the history
… leader-election-flag-value-update
  • Loading branch information
Sakshi-dell committed Mar 4, 2022
2 parents 5382a7a + 3d40221 commit e3bf1b0
Show file tree
Hide file tree
Showing 16 changed files with 270 additions and 42 deletions.
12 changes: 12 additions & 0 deletions .github/containerscan/allowedlist.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
general:
vulnerabilities:
# list of CVEs that are currently unfixed
- CVE-2022-24407
- CVE-2021-25741
bestPracticeViolations:
# list of best practies violatied that needs a fix
- DKL-DI-0006
- CIS-DI-0005
- CIS-DI-0006
- CIS-DI-0008
- DKL-LI-0003
36 changes: 30 additions & 6 deletions .github/workflows/actions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,24 @@ jobs:
name: Run Go unit tests and check package coverage
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.17+
uses: actions/setup-go@v2
with:
go-version: ^1.17
id: go
- name: Checkout the code
uses: actions/checkout@v2
- name: Checkout dell-csi-operator
uses: actions/checkout@v2
with:
repository: 'dell/dell-csi-operator'
path: 'dell-csi-operator'
# Not able to use dell common git hub actions as there is
# no way to skip integration tests currently. And this
# way of using 'run' to execute run do not allow us to
# check for threshold.But it ensures there are no failures
- name: Run unit tests and check package coverage
uses: dell/common-github-actions/go-code-tester@main
with:
threshold: 60
test-folder: "./test"
skip-list: "./test/integration-tests"
run: make unit-test
malware_security_scan:
name: Malware Scanner
runs-on: ubuntu-latest
Expand All @@ -53,4 +58,23 @@ jobs:
with:
directories: .
options: -ri

image_security_scan:
name: Image Scanner
runs-on: ubuntu-latest
env:
BASE_IMG : ubuntu:latest
steps:
- name: Set up Go 1.17+
uses: actions/setup-go@v2
with:
go-version: ^1.17
id: go
- name: Checkout the code
uses: actions/checkout@v2
- name: Build Docker Images
run: docker build . -t dell-csi-operator:latest
- name: Scan operator Image
uses: Azure/container-scan@v0
with:
image-name: dell-csi-operator:latest
severity-threshold: HIGH
2 changes: 1 addition & 1 deletion driverconfig/unity_v210_v120.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
"DefaultValueForNode": "0"
},
{
"Name": "X_CSI_ENABLE_VOL_HEALTH_MONITOR",
"Name": "X_CSI_HEALTH_MONITOR_ENABLED",
"CSIEnvType": "Boolean",
"SetForController": true,
"SetForNode": true,
Expand Down
2 changes: 1 addition & 1 deletion driverconfig/unity_v210_v121.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
"DefaultValueForNode": "0"
},
{
"Name": "X_CSI_ENABLE_VOL_HEALTH_MONITOR",
"Name": "X_CSI_HEALTH_MONITOR_ENABLED",
"CSIEnvType": "Boolean",
"SetForController": true,
"SetForNode": true,
Expand Down
2 changes: 1 addition & 1 deletion driverconfig/unity_v210_v122.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
"DefaultValueForNode": "0"
},
{
"Name": "X_CSI_ENABLE_VOL_HEALTH_MONITOR",
"Name": "X_CSI_HEALTH_MONITOR_ENABLED",
"CSIEnvType": "Boolean",
"SetForController": true,
"SetForNode": true,
Expand Down
2 changes: 1 addition & 1 deletion driverconfig/unity_v220_v121.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
"DefaultValueForNode": "0"
},
{
"Name": "X_CSI_ENABLE_VOL_HEALTH_MONITOR",
"Name": "X_CSI_HEALTH_MONITOR_ENABLED",
"CSIEnvType": "Boolean",
"SetForController": true,
"SetForNode": true,
Expand Down
2 changes: 1 addition & 1 deletion driverconfig/unity_v220_v122.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
"DefaultValueForNode": "0"
},
{
"Name": "X_CSI_ENABLE_VOL_HEALTH_MONITOR",
"Name": "X_CSI_HEALTH_MONITOR_ENABLED",
"CSIEnvType": "Boolean",
"SetForController": true,
"SetForNode": true,
Expand Down
2 changes: 1 addition & 1 deletion driverconfig/unity_v220_v123.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
"DefaultValueForNode": "0"
},
{
"Name": "X_CSI_ENABLE_VOL_HEALTH_MONITOR",
"Name": "X_CSI_HEALTH_MONITOR_ENABLED",
"CSIEnvType": "Boolean",
"SetForController": true,
"SetForNode": true,
Expand Down
10 changes: 5 additions & 5 deletions samples/unity_v210_k8s_120.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,29 +18,29 @@ spec:
- name: snapshotter
args: ["--snapshot-name-prefix=csiunitysnap"]
# Uncomment the following to install 'external-health-monitor' sidecar to enable health monitor of CSI volumes from Controller plugin.
# Also set the env variable controller.envs.X_CSI_ENABLE_VOL_HEALTH_MONITOR to "true".
# Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true".
# - name: external-health-monitor
# args: ["--monitor-interval=60s"]

controller:
envs:
# X_CSI_ENABLE_VOL_HEALTH_MONITOR: Enable/Disable health monitor of CSI volumes from Controller plugin - volume condition.
# X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin - volume condition.
# Install the 'external-health-monitor' sidecar accordingly.
# Allowed values:
# true: enable checking of health condition of CSI volumes
# false: disable checking of health condition of CSI volumes
# Default value: false
- name: X_CSI_ENABLE_VOL_HEALTH_MONITOR
- name: X_CSI_HEALTH_MONITOR_ENABLED
value: "false"

node:
envs:
# X_CSI_ENABLE_VOL_HEALTH_MONITOR: Enable/Disable health monitor of CSI volumes from node plugin - volume usage
# X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from node plugin - volume usage
# Allowed values:
# true: enable checking of health condition of CSI volumes
# false: disable checking of health condition of CSI volumes
# Default value: false
- name: X_CSI_ENABLE_VOL_HEALTH_MONITOR
- name: X_CSI_HEALTH_MONITOR_ENABLED
value: "false"
---
apiVersion: v1
Expand Down
10 changes: 5 additions & 5 deletions samples/unity_v210_k8s_121.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,29 +18,29 @@ spec:
- name: snapshotter
args: ["--snapshot-name-prefix=csiunitysnap"]
# Uncomment the following to install 'external-health-monitor' sidecar to enable health monitor of CSI volumes from Controller plugin.
# Also set the env variable controller.envs.X_CSI_ENABLE_VOL_HEALTH_MONITOR to "true".
# Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true".
# - name: external-health-monitor
# args: ["--monitor-interval=60s"]

controller:
envs:
# X_CSI_ENABLE_VOL_HEALTH_MONITOR: Enable/Disable health monitor of CSI volumes from Controller plugin - volume condition.
# X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin - volume condition.
# Install the 'external-health-monitor' sidecar accordingly.
# Allowed values:
# true: enable checking of health condition of CSI volumes
# false: disable checking of health condition of CSI volumes
# Default value: false
- name: X_CSI_ENABLE_VOL_HEALTH_MONITOR
- name: X_CSI_HEALTH_MONITOR_ENABLED
value: "false"

node:
envs:
# X_CSI_ENABLE_VOL_HEALTH_MONITOR: Enable/Disable health monitor of CSI volumes from node plugin - volume usage
# X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from node plugin - volume usage
# Allowed values:
# true: enable checking of health condition of CSI volumes
# false: disable checking of health condition of CSI volumes
# Default value: false
- name: X_CSI_ENABLE_VOL_HEALTH_MONITOR
- name: X_CSI_HEALTH_MONITOR_ENABLED
value: "false"
---
apiVersion: v1
Expand Down
10 changes: 5 additions & 5 deletions samples/unity_v210_k8s_122.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,29 +18,29 @@ spec:
- name: snapshotter
args: ["--snapshot-name-prefix=csiunitysnap"]
# Uncomment the following to install 'external-health-monitor' sidecar to enable health monitor of CSI volumes from Controller plugin.
# Also set the env variable controller.envs.X_CSI_ENABLE_VOL_HEALTH_MONITOR to "true".
# Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true".
# - name: external-health-monitor
# args: ["--monitor-interval=60s"]

controller:
envs:
# X_CSI_ENABLE_VOL_HEALTH_MONITOR: Enable/Disable health monitor of CSI volumes from Controller plugin - volume condition.
# X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin - volume condition.
# Install the 'external-health-monitor' sidecar accordingly.
# Allowed values:
# true: enable checking of health condition of CSI volumes
# false: disable checking of health condition of CSI volumes
# Default value: false
- name: X_CSI_ENABLE_VOL_HEALTH_MONITOR
- name: X_CSI_HEALTH_MONITOR_ENABLED
value: "false"

node:
envs:
# X_CSI_ENABLE_VOL_HEALTH_MONITOR: Enable/Disable health monitor of CSI volumes from node plugin - volume usage
# X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from node plugin - volume usage
# Allowed values:
# true: enable checking of health condition of CSI volumes
# false: disable checking of health condition of CSI volumes
# Default value: false
- name: X_CSI_ENABLE_VOL_HEALTH_MONITOR
- name: X_CSI_HEALTH_MONITOR_ENABLED
value: "false"
---
apiVersion: v1
Expand Down
48 changes: 43 additions & 5 deletions samples/unity_v220_k8s_121.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,30 +18,68 @@ spec:
- name: snapshotter
args: ["--snapshot-name-prefix=csiunitysnap"]
# Uncomment the following to install 'external-health-monitor' sidecar to enable health monitor of CSI volumes from Controller plugin.
# Also set the env variable controller.envs.X_CSI_ENABLE_VOL_HEALTH_MONITOR to "true".
# Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true".
# - name: external-health-monitor
# args: ["--monitor-interval=60s"]

controller:
envs:
# X_CSI_ENABLE_VOL_HEALTH_MONITOR: Enable/Disable health monitor of CSI volumes from Controller plugin - volume condition.
# X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin - volume condition.
# Install the 'external-health-monitor' sidecar accordingly.
# Allowed values:
# true: enable checking of health condition of CSI volumes
# false: disable checking of health condition of CSI volumes
# Default value: false
- name: X_CSI_ENABLE_VOL_HEALTH_MONITOR
- name: X_CSI_HEALTH_MONITOR_ENABLED
value: "false"

# nodeSelector: Define node selection constraints for controller pods.
# For the pod to be eligible to run on a node, the node must have each
# of the indicated key-value pairs as labels.
# Leave as blank to consider all nodes
# Allowed values: map of key-value pairs
# Default value: None
# Examples:
# node-role.kubernetes.io/master: ""
nodeSelector:
# node-role.kubernetes.io/master: ""

# tolerations: Define tolerations for the controllers, if required.
# Leave as blank to install controller on worker nodes
# Default value: None
tolerations:
# - key: "node-role.kubernetes.io/master"
# operator: "Exists"
# effect: "NoSchedule"

node:
envs:
# X_CSI_ENABLE_VOL_HEALTH_MONITOR: Enable/Disable health monitor of CSI volumes from node plugin - volume usage
# X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from node plugin - volume usage
# Allowed values:
# true: enable checking of health condition of CSI volumes
# false: disable checking of health condition of CSI volumes
# Default value: false
- name: X_CSI_ENABLE_VOL_HEALTH_MONITOR
- name: X_CSI_HEALTH_MONITOR_ENABLED
value: "false"
# nodeSelector: Define node selection constraints for node pods.
# For the pod to be eligible to run on a node, the node must have each
# of the indicated key-value pairs as labels.
# Leave as blank to consider all nodes
# Allowed values: map of key-value pairs
# Default value: None
# Examples:
# node-role.kubernetes.io/master: ""
nodeSelector:
# node-role.kubernetes.io/master: ""

# tolerations: Define tolerations for the controllers, if required.
# Leave as blank to install controller on worker nodes
# Default value: None
tolerations:
# - key: "node-role.kubernetes.io/master"
# operator: "Exists"
# effect: "NoSchedule"

---
apiVersion: v1
kind: ConfigMap
Expand Down
47 changes: 42 additions & 5 deletions samples/unity_v220_k8s_122.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,30 +18,67 @@ spec:
- name: snapshotter
args: ["--snapshot-name-prefix=csiunitysnap"]
# Uncomment the following to install 'external-health-monitor' sidecar to enable health monitor of CSI volumes from Controller plugin.
# Also set the env variable controller.envs.X_CSI_ENABLE_VOL_HEALTH_MONITOR to "true".
# Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true".
# - name: external-health-monitor
# args: ["--monitor-interval=60s"]

controller:
envs:
# X_CSI_ENABLE_VOL_HEALTH_MONITOR: Enable/Disable health monitor of CSI volumes from Controller plugin - volume condition.
# X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin - volume condition.
# Install the 'external-health-monitor' sidecar accordingly.
# Allowed values:
# true: enable checking of health condition of CSI volumes
# false: disable checking of health condition of CSI volumes
# Default value: false
- name: X_CSI_ENABLE_VOL_HEALTH_MONITOR
- name: X_CSI_HEALTH_MONITOR_ENABLED
value: "false"
# nodeSelector: Define node selection constraints for controller pods.
# For the pod to be eligible to run on a node, the node must have each
# of the indicated key-value pairs as labels.
# Leave as blank to consider all nodes
# Allowed values: map of key-value pairs
# Default value: None
# Examples:
# node-role.kubernetes.io/master: ""
nodeSelector:
# node-role.kubernetes.io/master: ""

# tolerations: Define tolerations for the controllers, if required.
# Leave as blank to install controller on worker nodes
# Default value: None
tolerations:
# - key: "node-role.kubernetes.io/master"
# operator: "Exists"
# effect: "NoSchedule"

node:
envs:
# X_CSI_ENABLE_VOL_HEALTH_MONITOR: Enable/Disable health monitor of CSI volumes from node plugin - volume usage
# X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from node plugin - volume usage
# Allowed values:
# true: enable checking of health condition of CSI volumes
# false: disable checking of health condition of CSI volumes
# Default value: false
- name: X_CSI_ENABLE_VOL_HEALTH_MONITOR
- name: X_CSI_HEALTH_MONITOR_ENABLED
value: "false"
# nodeSelector: Define node selection constraints for node pods.
# For the pod to be eligible to run on a node, the node must have each
# of the indicated key-value pairs as labels.
# Leave as blank to consider all nodes
# Allowed values: map of key-value pairs
# Default value: None
# Examples:
# node-role.kubernetes.io/master: ""
nodeSelector:
# node-role.kubernetes.io/master: ""

# tolerations: Define tolerations for the controllers, if required.
# Leave as blank to install controller on worker nodes
# Default value: None
tolerations:
# - key: "node-role.kubernetes.io/master"
# operator: "Exists"
# effect: "NoSchedule"

---
apiVersion: v1
kind: ConfigMap
Expand Down
Loading

0 comments on commit e3bf1b0

Please sign in to comment.