Merge branch 'master' into mountinfo

.github/workflows/on-pr-label.yml

@@ -0,0 +1,22 @@
+name: Message Slack for stale PRs
+
+on:
+  pull_request_target:
+    types: [labeled]
+
+jobs:
+  build:
+    if: contains(github.event.pull_request.labels.*.name, 'stage/in-review-stale')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send custom JSON data to Slack workflow
+        id: slack
+        uses: slackapi/[email protected]
+        with:
+          payload: |
+            {
+              "pr_name": "${{ github.event.pull_request.title }}",
+              "pr_link": "${{ github.event.pull_request.html_url }}"
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

.github/workflows/on-pr-merged.yml

@@ -30,6 +30,31 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           repo-token-user-login: 'github-actions[bot]' # The user.login for temporary GitHub tokens
           allow-repeats: false
+  cherry_pick_release_9_8:
+    runs-on: ubuntu-latest
+    name: Cherry pick into release-9.8
+    if: contains(github.event.pull_request.labels.*.name, 'cherry-pick/release-9.8') && (github.event.pull_request.merged == true)
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Cherry pick into release-9.8
+        uses: ggriffiths/[email protected]
+        with:
+          branch: release-9.8
+          labels: |
+            cherry-pick
+      - name: Failure message
+        if: ${{ failure() }}
+        uses: mshick/add-pr-comment@v1
+        with:
+          message: |
+            This pull request cannot be automatically cherry-picked to the target release branch.
+            This is likely due to a merge conflict. Please cherry-pick this change yourself and handle the merge conflict.
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          repo-token-user-login: 'github-actions[bot]' # The user.login for temporary GitHub tokens
+          allow-repeats: false
   cherry_pick_release_9_7:
     runs-on: ubuntu-latest
     name: Cherry pick into release-9.7

Makefile

@@ -429,14 +429,17 @@ mockgen:
 	mockgen -destination=api/mock/mock_node.go -package=mock github.com/libopenstorage/openstorage/api OpenStorageNodeServer,OpenStorageNodeClient
 	mockgen -destination=api/mock/mock_diags.go -package=mock github.com/libopenstorage/openstorage/api OpenStorageDiagsServer,OpenStorageDiagsClient
 	mockgen -destination=api/mock/mock_volume.go -package=mock github.com/libopenstorage/openstorage/api OpenStorageVolumeServer,OpenStorageVolumeClient
-	mockgen -destination=api/mock/mock_watch.go -package=mock github.com/libopenstorage/openstorage/api OpenStorageWatchServer,OpenStorageWatchClient
+	mockgen -destination=api/mock/mock_watch.go -package=mock github.com/libopenstorage/openstorage/api OpenStorageWatchServer,OpenStorageWatchClient,OpenStorageWatch_WatchClient,OpenStorageWatch_WatchServer
 	mockgen -destination=api/mock/mock_bucket.go -package=mock github.com/libopenstorage/openstorage/api OpenStorageBucketServer,OpenStorageBucketClient
+	mockgen -destination=api/mock/mock_cloud_backup.go -package=mock github.com/libopenstorage/openstorage/api OpenStorageCloudBackupServer,OpenStorageCloudBackupClient
 	mockgen -destination=cluster/mock/cluster.mock.go -package=mock github.com/libopenstorage/openstorage/cluster Cluster
 	mockgen -destination=api/mock/mock_fstrim.go -package=mock github.com/libopenstorage/openstorage/api OpenStorageFilesystemTrimServer,OpenStorageFilesystemTrimClient
 	mockgen -destination=api/mock/mock_fscheck.go -package=mock github.com/libopenstorage/openstorage/api OpenStorageFilesystemCheckServer,OpenStorageFilesystemCheckClient
 	mockgen -destination=api/server/mock/mock_schedops_k8s.go -package=mock github.com/portworx/sched-ops/k8s/core Ops
 	mockgen -destination=volume/drivers/mock/driver.mock.go -package=mock github.com/libopenstorage/openstorage/volume VolumeDriver
 	mockgen -destination=bucket/drivers/mock/bucket_driver.mock.go -package=mock github.com/libopenstorage/openstorage/bucket BucketDriver
+	mockgen -destination=pkg/loadbalancer/mock/balancer.go -package=mock github.com/libopenstorage/openstorage/pkg/loadbalancer Balancer
+
 
 osd-tests: install
 	./hack/csi-sanity-test.sh
@@ -453,5 +456,6 @@ pr-verify: vet fmt sdk-check-version
 	git diff $(find . -name "*.pb.*go" -o -name "api.swagger.json" | grep -v vendor) | wc -l | grep "^0"
 	hack/check-api-version.sh
 	git grep -rw GPL vendor | grep LICENSE | egrep -v "yaml.v2" | wc -l | grep "^0"
-
+	hack/check-registered-rest.sh
+
 pr-test: osd-tests docker-test e2e

SDK_CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## Releases
 
+### v0.166.0 - (09/01/2023)
+
+* Add pool rebalance schedule related APIs
+
+### v0.165.0 - (08/30/2023)
+
+* Add CloudDriveType field to StorageResource
+
+### v0.164.0 - (07/17/2023)
+
+* Add serverSideEncryption field to aws credentials
+
 ### v0.163.0 - (07/13/2023)
 
 * Add mode field to SdkStorageRebalanceRequest
@@ -47,7 +59,7 @@
 
 ### v0.153.0 - (11/09/2022)
 
-* Add api for autofstrim push and pop 
+* Add api for autofstrim push and pop
 
 ### v0.152.0 - (10/26/2022)
 
@@ -63,11 +75,11 @@
 
 ### v0.149.0 - (8/4/2022)
 
-* Add NFS Credential support 
+* Add NFS Credential support
 
 ### v0.148.0 - (8/2/2022)
 
-* Update SDK cloudBackup delete API 
+* Update SDK cloudBackup delete API
 
 ### v0.147.0 - (7/29/2022)
 

api/api.go

@@ -112,6 +112,7 @@ const (
 	SpecIoThrottleRdBW                      = "io_throttle_rd_bw"
 	SpecIoThrottleWrBW                      = "io_throttle_wr_bw"
 	SpecReadahead                           = "readahead"
+	SpecWinshare                            = "winshare"
 )
 
 // OptionKey specifies a set of recognized query params.
@@ -157,6 +158,8 @@ const (
 	OptCredSecretKey = "CredSecretKey"
 	// OptCredBucket is the optional bucket name
 	OptCredBucket = "CredBucket"
+	// OptCredSSE for s3 sse flag
+	OptCredSSE = "CredSSE"
 	// OptCredGoogleProjectID projectID for google cloud
 	OptCredGoogleProjectID = "CredProjectID"
 	// OptCredGoogleJsonKey for google cloud
@@ -1470,3 +1473,21 @@ func (s *ProxySpec) GetPureFullVolumeName() string {
 func GetAllEnumInfo() []protoimpl.EnumInfo {
 	return file_api_api_proto_enumTypes
 }
+
+// Constants defined for proxy mounts
+const (
+	// OptProxyCaller is an option to pass NodeID of the client requesting a sharedv4
+	// mount from the server
+	OptProxyCaller = "caller"
+	// OptProxyCallerIP is an option to pass NodeIP of the client requesting a sharedv4
+	// mount from the server
+	OptProxyCallerIP = "caller_ip"
+	// OptMountID is an option to pass mount path of the client requesting a sharedv4
+	// mount from the server
+	OptMountID = "mountID"
+)
+
+const (
+	// SharedVolExportPrefix is the export path where shared volumes are mounted
+	SharedVolExportPrefix = "/var/lib/osd/pxns"
+)