Skip to content

Commit

Permalink
Disabled crash on no Weka installed
Browse files Browse the repository at this point in the history
  • Loading branch information
sergeyberezansky committed Jan 26, 2021
1 parent a6b0b14 commit d5876ec
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 9 deletions.
8 changes: 4 additions & 4 deletions deploy/helm/csi-wekafsplugin/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
name: csi-wekafsplugin
description: Helm chart for Deployment of WekaIO Container Storage Interface (CSI) plugin for WekaFS - the world fastests filesystem
description: Helm chart for Deployment of WekaIO Container Storage Interface (CSI) plugin for WekaFS - the world fastest filesystem
sources:
- https://github.com/weka/csi-wekafs/tree/v0.6.3/deploy/helm/csi-wekafsplugin
- https://github.com/weka/csi-wekafs/tree/v0.6.4/deploy/helm/csi-wekafsplugin
home: https://github.com/weka/csi-wekafs
icon: https://weka.github.io/csi-wekafs/logo.png

Expand All @@ -18,8 +18,8 @@ type: application

# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: "0.6.3"
version: "0.6.4"

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: "0.6.3"
appVersion: "0.6.4"
2 changes: 1 addition & 1 deletion deploy/helm/csi-wekafsplugin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This repository hosts the CSI WekaFS driver and all of its build and dependent c
## Deployment
```shell
helm repo add csi-wekafs https://weka.github.io/csi-wekafs
helm install csi-wekafs csi-wekafs/csi-wekafsplugin --namespace csi-wekafsplugin --create-namespace
helm install csi-wekafsplugin csi-wekafs/csi-wekafsplugin --namespace csi-wekafsplugin --create-namespace
```

## Usage
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/csi-wekafsplugin/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dynamicProvisionPath: "csi-volumes"
# name of the driver
# note same name will be used for provisioner name
csiDriverName : "csi.weka.io"
csiDriverVersion : &csiDriverVersion "0.6.3"
csiDriverVersion : &csiDriverVersion "0.6.4"

# Image paths
images:
Expand Down
4 changes: 2 additions & 2 deletions deploy/kubernetes-1.18/wekafs/csi-wekafs-plugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ spec:
serviceAccountName: csi-wekafsplugin-controller
containers:
- name: wekafs
image: quay.io/weka.io/csi-wekafs:v0.6.3
image: quay.io/weka.io/csi-wekafs:v0.6.4
imagePullPolicy: Always
args:
- "--drivername=csi.weka.io"
Expand Down Expand Up @@ -347,7 +347,7 @@ spec:
name: csi-data-dir

- name: wekafs
image: quay.io/weka.io/csi-wekafs:v0.6.3
image: quay.io/weka.io/csi-wekafs:v0.6.4
imagePullPolicy: Always
args:
- "--drivername=csi.weka.io"
Expand Down
3 changes: 2 additions & 1 deletion pkg/wekafs/nodeserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import (

const TopologyKeyNode = "topology.wekafs.csi/node"
const WekaModule = "wekafsgw"
const crashOnNoWeka = false

type nodeServer struct {
caps []*csi.NodeServiceCapability
Expand Down Expand Up @@ -98,7 +99,7 @@ func (ns *nodeServer) NodeExpandVolume(ctx context.Context, req *csi.NodeExpandV
}

func NewNodeServer(nodeId string, maxVolumesPerNode int64, mounter *wekaMounter, gc *dirVolumeGc) *nodeServer {
if mounter.debugPath == "" && !isWekaInstalled() {
if mounter.debugPath == "" && !isWekaInstalled() && crashOnNoWeka == true {
exitMsg := "weka OS driver module not installed, exiting"
_ = ioutil.WriteFile("/dev/termination-log", []byte(exitMsg), 0644)
panic(exitMsg)
Expand Down

0 comments on commit d5876ec

Please sign in to comment.