Merge branch 'master' of https://github.com/sodafoundation/api into t…

…est_vg
sodafoundation · Jul 17, 2020 · 50c2624 · 50c2624
2 parents dd805c7 + 7d8aebb
commit 50c2624
Show file tree

Hide file tree

Showing 14 changed files with 235 additions and 234 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -32,6 +32,8 @@ matrix:
 
 
 install:
+  # TODO: Remove once source code is fixed for sodafoundation
+  - ln -s $GOPATH/src/sodafoundation $GOPATH/src/opensds
   # Build OpenSDS Controller source code
   - make osdsapiserver
   - make osdsctl

diff --git a/Makefile b/Makefile
@@ -50,7 +50,7 @@ metricexporter:
 
 docker: build
 	cp $(BUILD_DIR)/bin/osdsapiserver ./cmd/osdsapiserver
-	docker build cmd/osdsapiserver -t opensdsio/opensds-apiserver:latest
+	docker build cmd/osdsapiserver -t sodafoundation/apiserver:latest
 
 test: build
 	install/CI/test

diff --git a/cmd/osdsapiserver/Autobuildfile b/cmd/osdsapiserver/Autobuildfile
@@ -1,7 +1,7 @@
 # Docker build usage:
-# 	docker build . -t opensdsio/opensds-apiserver:latest
+# 	docker build . -t sodafoundation/apiserver:latest
 # Docker run usage:
-# 	docker run -d --net=host -v /etc/opensds:/etc/opensds opensdsio/opensds-apiserver:latest
+# 	docker run -d --net=host -v /etc/opensds:/etc/opensds sodafoundation/apiserver:latest
 
 FROM ubuntu:16.04
 MAINTAINER Leon Wang <[email protected]>

diff --git a/cmd/osdsapiserver/Dockerfile b/cmd/osdsapiserver/Dockerfile
@@ -1,10 +1,9 @@
 # Docker build usage:
-# 	docker build . -t opensdsio/opensds-apiserver:latest
+# 	docker build . -t sodafoundation/apiserver:latest
 # Docker run usage:
-# 	docker run -d --net=host -v /etc/opensds:/etc/opensds opensdsio/opensds-apiserver:latest
+# 	docker run -d --net=host -v /etc/opensds:/etc/opensds sodafoundation/apiserver:latest
 
 FROM ubuntu:16.04
-MAINTAINER Leon Wang <[email protected]>
 
 COPY osdsapiserver /usr/bin
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   osdsapiserver:
-    image: 'opensdsio/opensds-apiserver:latest'
+    image: 'sodafoundation/apiserver:latest'
     tty: true
     network_mode: "host"
     volumes:
@@ -12,7 +12,7 @@ services:
     restart: on-failure
     command: /bin/bash -c '/usr/bin/osdsapiserver -logtostderr'
   osdslet:
-    image: 'opensdsio/opensds-controller:latest'
+    image: 'sodafoundation/controller:latest'
     tty: true
     network_mode: "host"
     volumes:
@@ -22,7 +22,7 @@ services:
     restart: on-failure
     command: /bin/bash -c '/usr/bin/osdslet -logtostderr'
   osdsdock:
-    image: 'opensdsio/opensds-dock:latest'
+    image: 'sodafoundation/dock:latest'
     tty: true
     privileged: true
     volumes:
@@ -52,7 +52,7 @@ services:
     privileged: true
     restart: on-failure
   osdsdashboard:
-    image: 'opensdsio/dashboard:latest'
+    image: 'sodafoundation/dashboard:latest'
     tty: true
     network_mode: "host"
     restart: on-failure

diff --git a/install/devsds/install.sh b/install/devsds/install.sh
@@ -163,7 +163,7 @@ else
 fi
 
 echo
-echo "Execute commands blow to set up ENVs which are needed by OpenSDS CLI:"
+echo "Execute commands below to set up ENVs which are needed by SODA CLI:"
 echo "------------------------------------------------------------------"
 echo "export OPENSDS_AUTH_STRATEGY=$OPENSDS_AUTH_STRATEGY"
 echo "export OPENSDS_ENDPOINT=http://localhost:50040"

diff --git a/install/devsds/lib/opensds.sh b/install/devsds/lib/opensds.sh
@@ -88,11 +88,11 @@ osds::opensds::install(){
 
     export OPENSDS_AUTH_STRATEGY=$OPENSDS_AUTH_STRATEGY
     export OPENSDS_ENDPOINT=http://localhost:50040
-    build/out/bin/osdsctl profile create '{"name": "default_block", "description": "default policy", "storageType": "block"}'
-    build/out/bin/osdsctl profile create '{"name": "default_file", "description": "default policy", "storageType": "file", "provisioningProperties":{"ioConnectivity": {"accessProtocol": "NFS"},"DataStorage":{"StorageAccessCapability":["Read","Write","Execute"]}}}'
+    ${OPENSDS_DIR}/build/out/bin/osdsctl profile create '{"name": "default_block", "description": "default policy", "storageType": "block"}'
+    ${OPENSDS_DIR}/build/out/bin/osdsctl profile create '{"name": "default_file", "description": "default policy", "storageType": "file", "provisioningProperties":{"ioConnectivity": {"accessProtocol": "NFS"},"DataStorage":{"StorageAccessCapability":["Read","Write","Execute"]}}}'
 
     if [ $? == 0 ]; then
-        osds::echo_summary devsds installed successfully !!
+        osds::echo_summary devsds installed successfully !! 
     fi
 )
 }

diff --git a/install/kubernetes/opensds-all.yaml b/install/kubernetes/opensds-all.yaml
@@ -48,7 +48,7 @@ spec:
     spec:
       containers:
       - name: apiserver
-        image: opensdsio/opensds-apiserver:latest
+        image: sodafoundation/apiserver:latest
         imagePullPolicy: IfNotPresent
         command: ["bin/sh"]
         args: ["-c", "/usr/bin/osdsapiserver -logtostderr"]
@@ -99,7 +99,7 @@ spec:
     spec:
       containers:
       - name: controller
-        image: opensdsio/opensds-controller:latest
+        image: sodafoundation/controller:latest
         imagePullPolicy: IfNotPresent
         command: ["bin/sh"]
         args: ["-c", "/usr/bin/osdslet -logtostderr"]
@@ -155,7 +155,7 @@ spec:
             capabilities:
               add: ["SYS_ADMIN"]
             allowPrivilegeEscalation: true
-          image: opensdsio/opensds-dock:latest
+          image: sodafoundation/dock:latest
           imagePullPolicy: IfNotPresent
           command: ["bin/sh"]
           args: ["-c", "/usr/sbin/tgtd; /usr/bin/osdsdock -logtostderr"]
@@ -249,7 +249,7 @@ spec:
     spec:
       containers:
       - name: dashboard
-        image: opensdsio/dashboard:latest
+        image: sodafoundation/dashboard:latest
         env:
         - name: OPENSDS_AUTH_URL
           value: http://authchecker.opensds.svc.cluster.local/identity

diff --git a/install/kubernetes/opensds-apiserver-v1.yaml b/install/kubernetes/opensds-apiserver-v1.yaml
@@ -33,7 +33,7 @@ spec:
     spec:
       containers:
       - name: apiserver
-        image: opensdsio/opensds-apiserver:latest
+        image: sodafoundation/apiserver:latest
         imagePullPolicy: IfNotPresent
         command: ["bin/sh"]
         args: ["-c", "/usr/bin/osdsapiserver -logtostderr"]

diff --git a/install/kubernetes/opensds-apiserver-v1beta.yaml b/install/kubernetes/opensds-apiserver-v1beta.yaml
@@ -33,7 +33,7 @@ spec:
     spec:
       containers:
       - name: apiserver
-        image: opensdsio/opensds-apiserver:latest
+        image: sodafoundation/apiserver:latest
         imagePullPolicy: IfNotPresent
         command: ["bin/sh"]
         args: ["-c", "/usr/bin/osdsapiserver -logtostderr"]

diff --git a/install/kubernetes/opensds-controller-v1.yaml b/install/kubernetes/opensds-controller-v1.yaml
@@ -33,7 +33,7 @@ spec:
     spec:
       containers:
       - name: controller
-        image: opensdsio/opensds-controller:latest
+        image: sodafoundation/controller:latest
         imagePullPolicy: IfNotPresent
         command: ["bin/sh"]
         args: ["-c", "/usr/bin/osdslet -logtostderr"]

diff --git a/install/kubernetes/opensds-internal.yaml b/install/kubernetes/opensds-internal.yaml
@@ -48,7 +48,7 @@ spec:
     spec:
       containers:
       - name: apiserver
-        image: opensdsio/opensds-apiserver:latest
+        image: sodafoundation/apiserver:latest
         imagePullPolicy: IfNotPresent
         command: ["bin/sh"]
         args: ["-c", "/usr/bin/osdsapiserver -logtostderr"]
@@ -99,7 +99,7 @@ spec:
     spec:
       containers:
       - name: controller
-        image: opensdsio/opensds-controller:latest
+        image: sodafoundation/controller:latest
         imagePullPolicy: IfNotPresent
         command: ["bin/sh"]
         args: ["-c", "/usr/bin/osdslet -logtostderr"]
@@ -155,7 +155,7 @@ spec:
             capabilities:
               add: ["SYS_ADMIN"]
             allowPrivilegeEscalation: true
-          image: opensdsio/opensds-dock:latest
+          image: sodafoundation/dock:latest
           imagePullPolicy: IfNotPresent
           command: ["bin/sh"]
           args: ["-c", "/usr/sbin/tgtd; /usr/bin/osdsdock -logtostderr"]
@@ -249,7 +249,7 @@ spec:
     spec:
       containers:
       - name: dashboard
-        image: opensdsio/dashboard:latest
+        image: sodafoundation/dashboard:latest
         env:
         - name: OPENSDS_AUTH_URL
           value: http://authchecker.opensds.svc.cluster.local/identity

diff --git a/openapi-spec/swagger.yaml b/openapi-spec/swagger.yaml
@@ -6,7 +6,7 @@ info:
   termsOfService: 'https://www.linuxfoundation.org/terms'
   contact:
     name: SODA Support
-    url: 'https://opensds.slack.com'
+    url: 'https://sodafoundation.io/slack'
     email: [email protected]
   license:
     name: Apache 2.0