Skip to content

CSM csi-install.sh updates #617

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

Closed
csmbot wants to merge 1 commit into from
Closed

CSM csi-install.sh updates #617

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
84 changes: 45 additions & 39 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,45 @@
# CSI Driver for Dell PowerMax

[![Go Report Card](https://goreportcard.com/badge/github.com/dell/csi-powermax?style=flat-square)](https://goreportcard.com/report/github.com/dell/csi-powermax)
[![License](https://img.shields.io/github/license/dell/csi-powermax?style=flat-square&color=blue&label=License)](https://github.com/dell/csi-powermax/blob/main/LICENSE)
[![Docker](https://img.shields.io/docker/pulls/dellemc/csi-powermax.svg?logo=docker&style=flat-square&label=Pulls)](https://hub.docker.com/r/dellemc/csi-powermax)
[![Last Release](https://img.shields.io/github/v/release/dell/csi-powermax?label=Latest&style=flat-square&logo=go)](https://github.com/dell/csi-powermax/releases)

**Repository for CSI Driver for Dell PowerMax**

## Description
CSI Driver for PowerMax is part of the [CSM (Container Storage Modules)](https://github.com/dell/csm) open-source suite of Kubernetes storage enablers for Dell products. The CSI Driver for PowerMax is a Container Storage Interface (CSI) driver that provides support for provisioning persistent storage using Dell PowerMax storage array.

This project may be compiled as a stand-alone binary using Golang that, when run, provides a valid CSI endpoint. It also can be used as a precompiled container image.

## Table of Contents

* [Code of Conduct](https://github.com/dell/csm/blob/main/docs/CODE_OF_CONDUCT.md)
* [Maintainer Guide](https://github.com/dell/csm/blob/main/docs/MAINTAINER_GUIDE.md)
* [Committer Guide](https://github.com/dell/csm/blob/main/docs/COMMITTER_GUIDE.md)
* [Contributing Guide](https://github.com/dell/csm/blob/main/docs/CONTRIBUTING.md)
* [List of Adopters](https://github.com/dell/csm/blob/main/docs/ADOPTERS.md)
* [Support](#support)
* [Security](https://github.com/dell/csm/blob/main/docs/SECURITY.md)
* [Building](#building)
* [Runtime Dependecies](#runtime-dependencies)
* [Documentation](#documentation)

## Support
For any issues, questions or feedback, please contact [Dell support](https://www.dell.com/support/incidents-online/en-us/contactus/product/container-storage-modules).

## Building

To build the source, execute `make build`.

To run unit tests, execute `make unit-test`.

To build an image, execute `make docker`.

You can run an integration test on a Linux system by populating the file `env.sh` with values for your Dell PowerMax systems and then run "`make integration-test`".
# CSI Driver for Dell PowerMax

[![Go Report Card](https://goreportcard.com/badge/github.com/dell/csi-powermax?style=flat-square)](https://goreportcard.com/report/github.com/dell/csi-powermax)
[![License](https://img.shields.io/github/license/dell/csi-powermax?style=flat-square&color=blue&label=License)](https://github.com/dell/csi-powermax/blob/main/LICENSE)
[![Docker](https://img.shields.io/docker/pulls/dellemc/csi-powermax.svg?logo=docker&style=flat-square&label=Pulls)](https://hub.docker.com/r/dellemc/csi-powermax)
[![Last Release](https://img.shields.io/github/v/release/dell/csi-powermax?label=Latest&style=flat-square&logo=go)](https://github.com/dell/csi-powermax/releases)

**Repository for CSI Driver for Dell PowerMax**

## Description
CSI Driver for PowerMax is part of the [CSM (Container Storage Modules)](https://github.com/dell/csm) open-source suite of Kubernetes storage enablers for Dell products. The CSI Driver for PowerMax is a Container Storage Interface (CSI) driver that provides support for provisioning persistent storage using Dell PowerMax storage array.

This project may be compiled as a stand-alone binary using Golang that, when run, provides a valid CSI endpoint. It also can be used as a precompiled container image.

## Table of Contents

* [Code of Conduct](https://github.com/dell/csm/blob/main/docs/CODE_OF_CONDUCT.md)
* [Maintainer Guide](https://github.com/dell/csm/blob/main/docs/MAINTAINER_GUIDE.md)
* [Committer Guide](https://github.com/dell/csm/blob/main/docs/COMMITTER_GUIDE.md)
* [Contributing Guide](https://github.com/dell/csm/blob/main/docs/CONTRIBUTING.md)
* [List of Adopters](https://github.com/dell/csm/blob/main/docs/ADOPTERS.md)
* [Support](#support)
* [Security](https://github.com/dell/csm/blob/main/docs/SECURITY.md)
* [Building](#building)
* [Runtime Dependecies](#runtime-dependencies)
* [Documentation](#documentation)

## Support
For any issues, questions or feedback, please contact [Dell support](https://www.dell.com/support/incidents-online/en-us/contactus/product/container-storage-modules).

## Building

To build the source, execute `make build`.

To run unit tests, execute `make unit-test`.

To build an image, execute `make docker`.

You can run an integration test on a Linux system by populating the file `env.sh` with values for your Dell PowerMax systems and then run "`make integration-test`".

## Runtime Dependencies
For a complete list of dependencies, please see the project documentation.

## Documentation
For more detailed information on the driver, please refer to [Container Storage Modules documentation](https://www.dell.com/support/product-details/en-us/product/container-storage-modules/resources/manuals).
94 changes: 90 additions & 4 deletions csireverseproxy/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ type RevProxy interface {
ServeReverseProxy(res http.ResponseWriter, req *http.Request)
UpdateConfig(proxyConfig config.ProxyConfig) error
GetRouter() http.Handler
SetAuthToken(token string)
}

// ServerOpts - Proxy server configuration
Expand Down Expand Up @@ -127,10 +128,69 @@ func (s *Server) Config() *config.ProxyConfig {
return s.config
}

// isSidecarMode detects if running as sidecar by checking multiple indicators
func isSidecarMode() bool {
// Method 1: Check the DeployAsSidecar environment variable set by the operator
// In sidecar mode, the operator sets DeployAsSidecar=true
deployAsSidecar := getEnv("DeployAsSidecar", "") // No default for more accurate detection

// Method 2: Check if we're running in the same pod as CSI driver containers
// by checking for CSI driver environment variables or container presence

// Check for CSI driver specific environment variables that indicate sidecar mode
csiDriverEnvVars := []string{
"X_CSI_POWERMAX_ENDPOINT",
"X_CSI_POWERMAX_USER",
"X_CSI_POWERMAX_PASSWORD",
"X_CSI_POWERMAX_NODENAME",
"X_CSI_POWERMAX_PORTGROUPS",
}

hasCSIEnvVars := false
for _, envVar := range csiDriverEnvVars {
if getEnv(envVar, "") != "" {
hasCSIEnvVars = true
break
}
}

// Method 3: Check pod name and namespace patterns
podName := getEnv("POD_NAME", "")

// CSI driver pods typically have specific naming patterns
isCSIDriverPod := strings.Contains(podName, "controller") ||
strings.Contains(podName, "node") ||
strings.Contains(podName, "csi-")

// Debug logging to understand the mode detection
log.Infof("DeployAsSidecar environment variable: '%s'", deployAsSidecar)
log.Infof("Has CSI driver environment variables: %t", hasCSIEnvVars)
log.Infof("Pod name: '%s', Is CSI driver pod: %t", podName, isCSIDriverPod)

// Determine sidecar mode based on multiple indicators
isSidecar := false

// Primary check: DeployAsSidecar environment variable explicitly set
if deployAsSidecar != "" {
lowerValue := strings.ToLower(strings.TrimSpace(deployAsSidecar))
isSidecar = lowerValue == "true" || lowerValue == "1" || lowerValue == "yes"
log.Infof("DeployAsSidecar explicitly set, sidecar mode: %t", isSidecar)
} else {
// Fallback check: If we have CSI driver env vars and are in a CSI driver pod
isSidecar = hasCSIEnvVars && isCSIDriverPod
log.Infof("DeployAsSidecar not set, using fallback detection, sidecar mode: %t", isSidecar)
}

log.Infof("Final sidecar mode determination: %t", isSidecar)
return isSidecar
}

// Setup sets up the server and the proxy configuration
// this includes - reading the secret or config map, creating appropriate proxy instance
// and setting up the signal handler channel
func (s *Server) Setup(k8sUtils k8sutils.UtilsInterface) error {
// Auth token validation is handled during loading in the proxy configuration section below

// Read the config from secret if secret provided
if getEnv(common.EnvReverseProxyUseSecret, "false") == "true" {
log.Info("Reading config using secret")
Expand Down Expand Up @@ -212,6 +272,32 @@ func (s *Server) Setup(k8sUtils k8sutils.UtilsInterface) error {
s.SigChan = make(chan os.Signal, 1)
}

// Load shared auth token if configured
// Note: Auth token is only used in standalone mode, not in sidecar mode
isSidecar := isSidecarMode()
if tokenFile := getEnv(common.EnvProxyAuthTokenFile, ""); tokenFile != "" {
if isSidecar {
log.Info("Sidecar deployment detected - auth token is not used in sidecar mode, skipping")
// Skip auth token loading entirely in sidecar mode
} else {
log.Info("Standalone deployment detected - loading auth token")
tokenBytes, err := os.ReadFile(filepath.Clean(tokenFile))
if err != nil {
log.Warnf("Proxy auth token file %s not found or not readable in standalone mode, continuing without auth token: %v", tokenFile, err)
// Continue deployment without auth token - don't fail
} else {
token := strings.TrimSpace(string(tokenBytes))
if token == "" {
log.Warnf("Proxy auth token file %s is empty in standalone mode, continuing without auth token", tokenFile)
// Continue deployment without auth token - don't fail
} else {
s.Proxy.SetAuthToken(token)
log.Info("Proxy auth token loaded successfully for standalone deployment")
}
}
}
}

return nil
}

Expand Down Expand Up @@ -314,7 +400,7 @@ func (s *Server) SetupConfigWatcher(k8sUtils k8sutils.UtilsInterface, v *viper.V
}

func (s *Server) configChangeConfigMap(k8sUtils k8sutils.UtilsInterface, vcm *viper.Viper) {
log.Infof("Received a config change event for configmap - all settings %v", vcm.AllSettings())
log.Infof("Received a config change event for configmap - all settings")
var proxyConfigMap config.ProxyConfigMap
err := vcm.Unmarshal(&proxyConfigMap)
if err != nil {
Expand All @@ -336,12 +422,12 @@ func (s *Server) configChangeConfigMap(k8sUtils k8sutils.UtilsInterface, vcm *vi
if err != nil {
log.Errorf("Error in updating the config: %s", err.Error())
}
log.Infof("Updated proxy config: %+v", proxyConfig)
log.Infof("Updated proxy config")
}
}

func (s *Server) configChangeSecret(k8sUtils k8sutils.UtilsInterface, vs *viper.Viper) {
log.Infof("Received a config change event for secret - all settings %v", vs.AllSettings())
log.Info("Received a config change event for secret")
var proxySecret config.ProxySecret
err := vs.Unmarshal(&proxySecret)
if err != nil {
Expand All @@ -361,7 +447,7 @@ func (s *Server) configChangeSecret(k8sUtils k8sutils.UtilsInterface, vs *viper.
}

func (s *Server) configChangeParamsConfigMap(k8sUtils k8sutils.UtilsInterface, vcmp *viper.Viper) {
log.Infof("Received a config change event for params configmap - all settings %v", vcmp.AllSettings())
log.Infof("Received a config change event for params configmap")
var ParamsConfigMap config.ParamsConfigMap
err := vcmp.Unmarshal(&ParamsConfigMap)
if err != nil {
Expand Down
Loading
Loading