Skip to content
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

Update version of driver and modules in manifests #103

Merged
merged 1 commit into from
Sep 15, 2022
Merged

Update version of driver and modules in manifests #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 5 additions & 9 deletions bundle/manifests/dell-csm-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,12 @@ metadata:
{
"name": "CSI_LOG_LEVEL",
"value": "debug"
},
{
"name": "CHECK_OWNER_REFERENCE",
"value": "false"
}
],
"image": "dellemc/csi-isilon:v2.3.0",
"image": "dellemc/csi-isilon:v2.4.0",
"imagePullPolicy": "IfNotPresent"
},
"configVersion": "v2.3.0",
"configVersion": "v2.4.0",
"controller": {
"envs": [
{
Expand Down Expand Up @@ -138,15 +134,15 @@ metadata:
"value": ""
},
{
"name": "INSECURE",
"name": "SKIP_CERTIFICATE_VALIDATION",
"value": "true"
}
],
"image": "dellemc/csm-authorization-sidecar:v1.3.0",
"image": "dellemc/csm-authorization-sidecar:v1.4.0",
"name": "karavi-authorization-proxy"
}
],
"configVersion": "v1.3.0",
"configVersion": "v1.4.0",
"enabled": false,
"name": "authorization"
},
Expand Down
15 changes: 3 additions & 12 deletions config/samples/storage_v1_csm_powerscale.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,6 @@ spec:
- name: "CSI_LOG_LEVEL"
value: "debug"

# CHECK_OWNER_REFERENCE
# Allowed values:
# true: perform owner reference check
# false: otherwise
# Default value: false
- name: "CHECK_OWNER_REFERENCE"
value: "false"


controller:
envs:
# X_CSI_ISI_QUOTA_ENABLED: Indicates whether the provisioner should attempt to set (later unset) quota
Expand Down Expand Up @@ -146,7 +137,7 @@ spec:
# Default value: false
- name: X_CSI_HEALTH_MONITOR_ENABLED
value: "false"

# nodeSelector: Define node selection constraints for pods of controller deployment.
# For the pod to be eligible to run on a node, the node must have each
# of the indicated key-value pairs as labels.
Expand Down Expand Up @@ -246,10 +237,10 @@ spec:
- name: authorization
# enable: Enable/Disable csm-authorization
enabled: false
configVersion: v1.3.0
configVersion: v1.4.0
components:
- name: karavi-authorization-proxy
image: dellemc/csm-authorization-sidecar:v1.3.0
image: dellemc/csm-authorization-sidecar:v1.4.0
envs:
# proxyHost: hostname of the csm-authorization server
- name: "PROXY_HOST"
Expand Down
2 changes: 1 addition & 1 deletion controllers/csm_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,7 +761,7 @@ func getAuthModule() []csmv1.Module {
{
Name: csmv1.Authorization,
Enabled: true,
ConfigVersion: "v1.3.0",
ConfigVersion: "v1.4.0",
Components: []csmv1.ContainerTemplate{
{
Name: "karavi-authorization-proxy",
Expand Down
2 changes: 1 addition & 1 deletion pkg/modules/authorization_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ func TestAuthorizationPreCheck(t *testing.T) {
namespace := customResource.Namespace
tmpCR := customResource
auth := tmpCR.Spec.Modules[0]
auth.ConfigVersion = "v1.3.0"
auth.ConfigVersion = "v1.4.0"

karaviAuthconfig := getSecret(namespace, "karavi-authorization-config")
proxyAuthzTokens := getSecret(namespace, "proxy-authz-tokens")
Expand Down
2 changes: 1 addition & 1 deletion pkg/modules/testdata/cr_powerscale_auth.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
enabled: true
components:
- name: karavi-authorization-proxy
image: dellemc/csm-authorization-sidecar:v1.3.0
image: dellemc/csm-authorization-sidecar:v1.4.0
envs:
# proxyHost: hostname of the csm-authorization server
- name: "PROXY_HOST"
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/testfiles/storage_csm_powerscale.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,10 @@ spec:
- name: authorization
# enable: Enable/Disable csm-authorization
enabled: false
configVersion: v1.3.0
configVersion: v1.4.0
components:
- name: karavi-authorization-proxy
image: dellemc/csm-authorization-sidecar:v1.3.0
image: dellemc/csm-authorization-sidecar:v1.4.0
envs:
# proxyHost: hostname of the csm-authorization server
- name: "PROXY_HOST"
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/testfiles/storage_csm_powerscale_auth.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,10 @@ spec:
- name: authorization
# enable: Enable/Disable csm-authorization
enabled: true
configVersion: v1.3.0
configVersion: v1.4.0
components:
- name: karavi-authorization-proxy
image: dellemc/csm-authorization-sidecar:v1.3.0
image: dellemc/csm-authorization-sidecar:v1.4.0
envs:
# proxyHost: hostname of the csm-authorization server
- name: "PROXY_HOST"
Expand Down