Skip to content

feat: add --redis-stack flag to dapr init for RediSearch support #1644

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

Open
singhvishalkr wants to merge 1 commit into
base: master
Choose a base branch
from
+24 −9
Open

feat: add --redis-stack flag to dapr init for RediSearch support #1644

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
5 changes: 5 additions & 0 deletions cmd/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
imageVariant string
schedulerVolume string
schedulerOverrideBroadcastHostPort string
redisStack bool
)

var InitCmd = &cobra.Command{
Expand Down Expand Up @@ -97,6 +98,9 @@
# Folder .dapr will be created in folder pointed to by <path-to-install-directory>
dapr init --runtime-path <path-to-install-directory>

# Initialize Dapr with Redis Stack for RediSearch/vector store support
dapr init --redis-stack

# See more at: https://docs.dapr.io/getting-started/
`,
Run: func(cmd *cobra.Command, args []string) {
Expand Down Expand Up @@ -179,7 +183,7 @@
schedulerHostPort = nil
}

err := standalone.Init(runtimeVersion, dashboardVersion, dockerNetwork, slimMode, imageRegistryURI, fromDir, containerRuntime, imageVariant, runtime.GetDaprRuntimePath(), &schedulerVolume, schedulerHostPort)

Check failure on line 186 in cmd/init.go

View workflow job for this annotation

GitHub Actions / Build linux_arm binaries 

not enough arguments in call to standalone.Init

Check failure on line 186 in cmd/init.go

View workflow job for this annotation

GitHub Actions / Build darwin_arm64 binaries 

not enough arguments in call to standalone.Init

Check failure on line 186 in cmd/init.go

View workflow job for this annotation

GitHub Actions / Run Self-Hosted E2E tests in darwin_amd64_slim 

not enough arguments in call to standalone.Init

Check failure on line 186 in cmd/init.go

View workflow job for this annotation

GitHub Actions / Run Self-Hosted E2E tests in windows_amd64_slim 

not enough arguments in call to standalone.Init

Check failure on line 186 in cmd/init.go

View workflow job for this annotation

GitHub Actions / Run Self-Hosted E2E tests in linux_amd64_complete 

not enough arguments in call to standalone.Init

Check failure on line 186 in cmd/init.go

View workflow job for this annotation

GitHub Actions / Run Self-Hosted E2E tests in linux_amd64_slim 

not enough arguments in call to standalone.Init

Check failure on line 186 in cmd/init.go

View workflow job for this annotation

GitHub Actions / Run Self-Hosted E2E tests in darwin_amd64_complete 

not enough arguments in call to standalone.Init
if err != nil {
print.FailureStatusEvent(os.Stderr, err.Error())
os.Exit(1)
Expand Down Expand Up @@ -230,6 +234,7 @@
InitCmd.Flags().StringVarP(&imageVariant, "image-variant", "", "", "The image variant to use for the Dapr runtime, for example: mariner")
InitCmd.Flags().StringVarP(&schedulerVolume, "scheduler-volume", "", "dapr_scheduler", "Self-hosted only. Specify a volume for the scheduler service data directory.")
InitCmd.Flags().StringVarP(&schedulerOverrideBroadcastHostPort, "scheduler-override-broadcast-host-port", "", "", "Self-hosted only. Specify the scheduler broadcast host and port, for example: 192.168.42.42:50006. If not specified, it uses localhost:50006 (6060 for Windows).")
InitCmd.Flags().BoolVarP(&redisStack, "redis-stack", "", false, "Use redis-stack-server image instead of standard Redis for RediSearch support")
InitCmd.Flags().BoolP("help", "h", false, "Print this help message")
InitCmd.Flags().StringArrayVar(&values, "set", []string{}, "set values on the command line (can specify multiple or separate values with commas: key1=val1,key2=val2)")
InitCmd.Flags().String("image-registry", "", "Custom/private docker image repository URL")
Expand Down
28 changes: 19 additions & 9 deletions pkg/standalone/standalone.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,20 @@ const (
githubContainerRegistryName = "ghcr"

// used when DAPR_DEFAULT_IMAGE_REGISTRY is not set.
daprDockerImageName = "docker.io/daprio/dapr"
redisDockerImageName = "docker.io/redis:6"
zipkinDockerImageName = "docker.io/openzipkin/zipkin"
daprDockerImageName = "docker.io/daprio/dapr"
redisDockerImageName = "docker.io/redis:6"
redisStackDockerImageName = "docker.io/redis/redis-stack-server:latest"
zipkinDockerImageName = "docker.io/openzipkin/zipkin"
Comment on lines +62 to +65

// used when DAPR_DEFAULT_IMAGE_REGISTRY is set as GHCR.
dockerURI = "docker.io"
ghcrURI = "ghcr.io"

// used when DAPR_DEFAULT_IMAGE_REGISTRY is set as GHCR or image-registry flag is set.
daprGhcrImageName = "dapr/dapr"
redisGhcrImageName = "dapr/3rdparty/redis:6"
zipkinGhcrImageName = "dapr/3rdparty/zipkin"
daprGhcrImageName = "dapr/dapr"
redisGhcrImageName = "dapr/3rdparty/redis:6"
redisStackGhcrImageName = "redis/redis-stack-server:latest"
zipkinGhcrImageName = "dapr/3rdparty/zipkin"
Comment on lines +72 to +75

// DaprPlacementContainerName is the container name of placement service.
DaprPlacementContainerName = "dapr_placement"
Expand Down Expand Up @@ -145,6 +147,7 @@ type initInfo struct {
imageVariant string
schedulerVolume *string
schedulerOverrideBroadcastHostPort *string
redisStack bool
}

type daprImageInfo struct {
Expand Down Expand Up @@ -186,7 +189,7 @@ func isSchedulerIncluded(runtimeVersion string) (bool, error) {
}

// Init installs Dapr on a local machine using the supplied runtimeVersion.
func Init(runtimeVersion, dashboardVersion string, dockerNetwork string, slimMode bool, imageRegistryURL string, fromDir string, containerRuntime string, imageVariant string, daprInstallPath string, schedulerVolume *string, schedulerOverrideBroadcastHostPort *string) error {
func Init(runtimeVersion, dashboardVersion string, dockerNetwork string, slimMode bool, imageRegistryURL string, fromDir string, containerRuntime string, imageVariant string, daprInstallPath string, schedulerVolume *string, schedulerOverrideBroadcastHostPort *string, redisStack bool) error {
var err error
Comment on lines 191 to 193
var bundleDet bundleDetails
containerRuntime = strings.TrimSpace(containerRuntime)
Expand Down Expand Up @@ -318,6 +321,7 @@ func Init(runtimeVersion, dashboardVersion string, dockerNetwork string, slimMod
imageVariant: imageVariant,
schedulerVolume: schedulerVolume,
schedulerOverrideBroadcastHostPort: schedulerOverrideBroadcastHostPort,
redisStack: redisStack,
}
for _, step := range initSteps {
// Run init on the configurations and containers.
Expand Down Expand Up @@ -462,9 +466,15 @@ func runRedis(wg *sync.WaitGroup, errorChan chan<- error, info initInfo) {
// do not create container again if it exists.
args = append(args, "start", redisContainerName)
} else {
ghcrImage := redisGhcrImageName
dockerImage := redisDockerImageName
if info.redisStack {
ghcrImage = redisStackGhcrImageName
dockerImage = redisStackDockerImageName
}
imageName, err = resolveImageURI(daprImageInfo{
ghcrImageName: redisGhcrImageName,
dockerHubImageName: redisDockerImageName,
ghcrImageName: ghcrImage,
dockerHubImageName: dockerImage,
imageRegistryURL: info.imageRegistryURL,
imageRegistryName: defaultImageRegistryName,
Comment on lines +471 to 479
})
Expand Down
Loading