Skip to content

replaced opensds to soda #1329

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

replaced opensds to soda #1329

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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ jobs:
mkdir -p $(go env GOPATH)/src/github.com/sodafoundation/multi-cloud
sudo ln -s $(pwd) $(go env GOPATH)/src/github.com/sodafoundation/multi-cloud

- name: Create the Folder structure and symlink to opensds (TODO:-Fix vendor module from opensds to sodafoundation)
- name: Create the Folder structure and symlink to soda (TODO:-Fix vendor module from soda to sodafoundation)
run: |
echo "Check current dir: \n"
pwd
echo "GOPATH: $(go env GOPATH)"
sudo mkdir -p $(go env GOPATH)/src/github.com/opensds
sudo ln -s $(go env GOPATH)/src/github.com/sodafoundation $(go env GOPATH)/src/github.com/opensds
sudo mkdir -p $(go env GOPATH)/src/github.com/soda
sudo ln -s $(go env GOPATH)/src/github.com/sodafoundation $(go env GOPATH)/src/github.com/soda

- name: Install Pre-requisites
run: |
Expand Down
4 changes: 2 additions & 2 deletions K8s/soda-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ metadata:
name: soda-secret
type: Opaque
stringData:
OS_USERNAME: opensds
OS_PASSWORD: opensds@123
OS_USERNAME: soda
OS_PASSWORD: soda@123
MONGO_USER: admin
MONGO_PASSWORD: mongo

18 changes: 9 additions & 9 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2019 The OpenSDS Authors.
# Copyright 2019 The soda Authors.
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be SODA, Thanks

#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -30,28 +30,28 @@ prebuild:
mkdir -p $(BUILD_DIR)

api: prebuild
CGO_ENABLED=0 GOOS=linux go build -ldflags '-w -s -extldflags "-static"' -o $(BUILD_DIR)/api github.com/opensds/multi-cloud/api/cmd
CGO_ENABLED=0 GOOS=linux go build -ldflags '-w -s -extldflags "-static"' -o $(BUILD_DIR)/api github.com/soda/multi-cloud/api/cmd
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why we are not making full changes as per current repo and org name.
Replace opensds/multi-cloud with sodafoundation/strato


aksk: prebuild
CGO_ENABLED=0 GOOS=linux go build -ldflags '-w -s -extldflags "-static"' -o $(BUILD_DIR)/aksk github.com/opensds/multi-cloud/aksk/cmd
CGO_ENABLED=0 GOOS=linux go build -ldflags '-w -s -extldflags "-static"' -o $(BUILD_DIR)/aksk github.com/soda/multi-cloud/aksk/cmd

backend: prebuild
CGO_ENABLED=0 GOOS=linux go build -ldflags '-w -s -extldflags "-static"' -o $(BUILD_DIR)/backend github.com/opensds/multi-cloud/backend/cmd
CGO_ENABLED=0 GOOS=linux go build -ldflags '-w -s -extldflags "-static"' -o $(BUILD_DIR)/backend github.com/soda/multi-cloud/backend/cmd

s3: prebuild
CGO_ENABLED=1 GOOS=linux go build -ldflags '-w -s -extldflags "-dynamic"' -o $(BUILD_DIR)/s3 github.com/opensds/multi-cloud/s3/cmd
CGO_ENABLED=1 GOOS=linux go build -ldflags '-w -s -extldflags "-dynamic"' -o $(BUILD_DIR)/s3 github.com/soda/multi-cloud/s3/cmd

dataflow: prebuild
CGO_ENABLED=0 GOOS=linux go build -ldflags '-w -s -extldflags "-static"' -o $(BUILD_DIR)/dataflow github.com/opensds/multi-cloud/dataflow/cmd
CGO_ENABLED=0 GOOS=linux go build -ldflags '-w -s -extldflags "-static"' -o $(BUILD_DIR)/dataflow github.com/soda/multi-cloud/dataflow/cmd

datamover: prebuild
CGO_ENABLED=0 GOOS=linux go build -ldflags '-w -s -extldflags "-static"' -o $(BUILD_DIR)/datamover github.com/opensds/multi-cloud/datamover/cmd
CGO_ENABLED=0 GOOS=linux go build -ldflags '-w -s -extldflags "-static"' -o $(BUILD_DIR)/datamover github.com/soda/multi-cloud/datamover/cmd

file: prebuild
CGO_ENABLED=0 GOOS=linux go build -ldflags '-w -s -extldflags "-static"' -o $(BUILD_DIR)/file github.com/opensds/multi-cloud/file/cmd
CGO_ENABLED=0 GOOS=linux go build -ldflags '-w -s -extldflags "-static"' -o $(BUILD_DIR)/file github.com/soda/multi-cloud/file/cmd

block: prebuild
CGO_ENABLED=0 GOOS=linux go build -ldflags '-w -s -extldflags "-static"' -o $(BUILD_DIR)/block github.com/opensds/multi-cloud/block/cmd
CGO_ENABLED=0 GOOS=linux go build -ldflags '-w -s -extldflags "-static"' -o $(BUILD_DIR)/block github.com/soda/multi-cloud/block/cmd

docker: build

Expand Down
10 changes: 5 additions & 5 deletions aksk/cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ import (
"github.com/micro/go-micro/v2"
log "github.com/sirupsen/logrus"

"github.com/opensds/multi-cloud/aksk/pkg/iam"
handler "github.com/opensds/multi-cloud/aksk/pkg/service"
"github.com/opensds/multi-cloud/aksk/pkg/utils/config"
pb "github.com/opensds/multi-cloud/aksk/proto"
"github.com/opensds/multi-cloud/api/pkg/utils/obs"
"github.com/soda/multi-cloud/aksk/pkg/iam"
handler "github.com/soda/multi-cloud/aksk/pkg/service"
"github.com/soda/multi-cloud/aksk/pkg/utils/config"
pb "github.com/soda/multi-cloud/aksk/proto"
"github.com/soda/multi-cloud/api/pkg/utils/obs"
)

func main() {
Expand Down
6 changes: 3 additions & 3 deletions aksk/pkg/iam/driver/keystone/keystone.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ import (

log "github.com/sirupsen/logrus"

"github.com/opensds/multi-cloud/aksk/pkg/model"
"github.com/opensds/multi-cloud/aksk/pkg/utils"
pb "github.com/opensds/multi-cloud/aksk/proto"
"github.com/soda/multi-cloud/aksk/pkg/model"
"github.com/soda/multi-cloud/aksk/pkg/utils"
pb "github.com/soda/multi-cloud/aksk/proto"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions aksk/pkg/iam/iam.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import (

log "github.com/sirupsen/logrus"

"github.com/opensds/multi-cloud/aksk/pkg/iam/driver/keystone"
"github.com/opensds/multi-cloud/aksk/pkg/model"
"github.com/opensds/multi-cloud/aksk/pkg/utils/config"
pb "github.com/opensds/multi-cloud/aksk/proto"
"github.com/soda/multi-cloud/aksk/pkg/iam/driver/keystone"
"github.com/soda/multi-cloud/aksk/pkg/model"
"github.com/soda/multi-cloud/aksk/pkg/utils/config"
pb "github.com/soda/multi-cloud/aksk/proto"
)

type IAMAuthenticator interface {
Expand Down
6 changes: 3 additions & 3 deletions aksk/pkg/service/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (

log "github.com/sirupsen/logrus"

"github.com/opensds/multi-cloud/aksk/pkg/iam"
"github.com/opensds/multi-cloud/aksk/pkg/model"
pb "github.com/opensds/multi-cloud/aksk/proto"
"github.com/soda/multi-cloud/aksk/pkg/iam"
"github.com/soda/multi-cloud/aksk/pkg/model"
pb "github.com/soda/multi-cloud/aksk/proto"
)

type akskService struct {
Expand Down
4 changes: 2 additions & 2 deletions api/Autobuildfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:latest

RUN mkdir -p /etc/opensds
COPY api/pkg/examples/policy.json /etc/opensds/
RUN mkdir -p /etc/soda
COPY api/pkg/examples/policy.json /etc/soda/
COPY api/api /api
ENTRYPOINT ["/api"]
28 changes: 14 additions & 14 deletions api/cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019 The OpenSDS Authors.
// Copyright 2019 The soda Authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -17,17 +17,17 @@ package main
import (
"os"

"github.com/opensds/multi-cloud/api/pkg/aksk"
"github.com/opensds/multi-cloud/api/pkg/backend"
"github.com/opensds/multi-cloud/api/pkg/block"
"github.com/opensds/multi-cloud/api/pkg/dataflow"
"github.com/opensds/multi-cloud/api/pkg/file"
"github.com/opensds/multi-cloud/api/pkg/filters/auth"
"github.com/opensds/multi-cloud/api/pkg/filters/context"
"github.com/opensds/multi-cloud/api/pkg/filters/logging"
"github.com/opensds/multi-cloud/api/pkg/filters/signature/signer"
"github.com/opensds/multi-cloud/api/pkg/s3"
"github.com/opensds/multi-cloud/api/pkg/utils/obs"
"github.com/soda/multi-cloud/api/pkg/aksk"
"github.com/soda/multi-cloud/api/pkg/backend"
"github.com/soda/multi-cloud/api/pkg/block"
"github.com/soda/multi-cloud/api/pkg/dataflow"
"github.com/soda/multi-cloud/api/pkg/file"
"github.com/soda/multi-cloud/api/pkg/filters/auth"
"github.com/soda/multi-cloud/api/pkg/filters/context"
"github.com/soda/multi-cloud/api/pkg/filters/logging"
"github.com/soda/multi-cloud/api/pkg/filters/signature/signer"
"github.com/soda/multi-cloud/api/pkg/s3"
"github.com/soda/multi-cloud/api/pkg/utils/obs"

"github.com/emicklei/go-restful"
"github.com/micro/go-micro/v2/web"
Expand Down Expand Up @@ -61,7 +61,7 @@ func main() {
if flag == "s3" {
s3ws := new(restful.WebService)
s3ws.Path("/")
s3ws.Doc("OpenSDS Multi-Cloud S3 API")
s3ws.Doc("soda Multi-Cloud S3 API")
s3ws.Produces(restful.MIME_XML)

s3ws.Filter(logging.FilterFactory())
Expand All @@ -73,7 +73,7 @@ func main() {
} else {
ws := new(restful.WebService)
ws.Path("/v1")
ws.Doc("OpenSDS Multi-Cloud API")
ws.Doc("soda Multi-Cloud API")
ws.Consumes(restful.MIME_JSON)
ws.Produces(restful.MIME_JSON)

Expand Down
Loading