Added commity id to promote radix job, Removed not supported FileCach…

…e blobfuse option (#958)

charts/radix-operator/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: radix-operator
-version: 1.23.9
-appVersion: 1.43.9
+version: 1.23.10
+appVersion: 1.43.10
 kubeVersion: ">=1.24.0"
 description: Radix Operator
 keywords:

charts/radix-operator/templates/radixapplication.yaml

@@ -742,11 +742,6 @@ spec:
                                           description: Enable streaming mode. Default
                                             true.
                                           type: boolean
-                                        fileCaching:
-                                          description: Optional. File name based caching.
-                                            Default is false which specifies file
-                                            handle based caching.
-                                          type: boolean
                                         maxBlocksPerFile:
                                           description: Optional. The maximum number
                                             of blocks to be cached in memory.
@@ -1599,11 +1594,6 @@ spec:
                                           description: Enable streaming mode. Default
                                             true.
                                           type: boolean
-                                        fileCaching:
-                                          description: Optional. File name based caching.
-                                            Default is false which specifies file
-                                            handle based caching.
-                                          type: boolean
                                         maxBlocksPerFile:
                                           description: Optional. The maximum number
                                             of blocks to be cached in memory.

json-schema/radixapplication.json

@@ -725,10 +725,6 @@
                                     "description": "Enable streaming mode. Default true.",
                                     "type": "boolean"
                                   },
-                                  "fileCaching": {
-                                    "description": "Optional. File name based caching. Default is false which specifies file handle based caching.",
-                                    "type": "boolean"
-                                  },
                                   "maxBlocksPerFile": {
                                     "description": "Optional. The maximum number of blocks to be cached in memory.",
                                     "format": "int64",
@@ -1616,10 +1612,6 @@
                                     "description": "Enable streaming mode. Default true.",
                                     "type": "boolean"
                                   },
-                                  "fileCaching": {
-                                    "description": "Optional. File name based caching. Default is false which specifies file handle based caching.",
-                                    "type": "boolean"
-                                  },
                                   "maxBlocksPerFile": {
                                     "description": "Optional. The maximum number of blocks to be cached in memory.",
                                     "format": "int64",

pkg/apis/deployment/volumemount.go

@@ -53,7 +53,6 @@ const (
 	csiStorageClassStreamingMaxBuffersMountOption       = "max-buffers"                                     // The total number of buffers to be cached in memory (in MB).
 	csiStorageClassStreamingBlockSizeMountOption        = "block-size-mb"                                   // The size of each block to be cached in memory (in MB).
 	csiStorageClassStreamingBufferSizeMountOption       = "buffer-size-mb"                                  // The size of each buffer to be cached in memory (in MB).
-	csiStorageClassStreamingFileCachingMountOption      = "file-caching"                                    // File name based caching. Default is false which specifies file handle based caching.
 	csiStorageClassProtocolParameter                    = "protocol"                                        // Protocol
 	csiStorageClassProtocolParameterFuse                = "fuse"                                            // Protocol "blobfuse"
 	csiStorageClassProtocolParameterFuse2               = "fuse2"                                           // Protocol "blobfuse2"
@@ -624,9 +623,6 @@ func getStreamingMountOptions(streaming *radixv1.RadixVolumeMountStreaming) []st
 	if streaming.MaxBlocksPerFile != nil {
 		mountOptions = append(mountOptions, fmt.Sprintf("--%s=%v", csiStorageClassStreamingMaxBlocksPerFileMountOption, *streaming.MaxBlocksPerFile))
 	}
-	if streaming.FileCaching != nil {
-		mountOptions = append(mountOptions, fmt.Sprintf("--%s=%v", csiStorageClassStreamingFileCachingMountOption, *streaming.FileCaching))
-	}
 	return mountOptions
 }
 

pkg/apis/deployment/volumemount_test.go

@@ -3,10 +3,11 @@ package deployment
 import (
 	"context"
 	"fmt"
-	"github.com/equinor/radix-common/utils/pointers"
 	"strings"
 	"testing"
 
+	"github.com/equinor/radix-common/utils/pointers"
+
 	"github.com/equinor/radix-operator/pkg/apis/kube"
 	v1 "github.com/equinor/radix-operator/pkg/apis/radix/v1"
 	"github.com/equinor/radix-operator/pkg/apis/utils"
@@ -1068,7 +1069,6 @@ func (suite *VolumeMountTestSuite) Test_CreateOrUpdateCsiAzureResources() {
 							BufferSize:       pointers.Ptr(uint64(103)),
 							MaxBuffers:       pointers.Ptr(uint64(104)),
 							MaxBlocksPerFile: pointers.Ptr(uint64(105)),
-							FileCaching:      pointers.Ptr(true),
 						}
 					}),
 				},
@@ -1096,7 +1096,6 @@ func (suite *VolumeMountTestSuite) Test_CreateOrUpdateCsiAzureResources() {
 							"--buffer-size-mb=103",
 							"--max-buffers=104",
 							"--max-blocks-per-file=105",
-							"--file-caching=true",
 							"--use-adls=false",
 						}
 					}),
@@ -1122,7 +1121,6 @@ func (suite *VolumeMountTestSuite) Test_CreateOrUpdateCsiAzureResources() {
 							BufferSize:       pointers.Ptr(uint64(103)),
 							MaxBuffers:       pointers.Ptr(uint64(104)),
 							MaxBlocksPerFile: pointers.Ptr(uint64(105)),
-							FileCaching:      pointers.Ptr(true),
 						}
 					}),
 				},

pkg/apis/radix/v1/radixapptypes.go

@@ -852,9 +852,6 @@ type RadixVolumeMountStreaming struct {
 	// +kubebuilder:validation:Minimum=1
 	// +optional
 	MaxBlocksPerFile *uint64 `json:"maxBlocksPerFile,omitempty"`
-	// Optional. File name based caching. Default is false which specifies file handle based caching.
-	// +optional
-	FileCaching *bool `json:"fileCaching,omitempty"`
 }
 
 // MountType Holds types of mount

pkg/apis/radix/v1/radixjobtypes.go

@@ -103,12 +103,17 @@ type RadixPromoteSpec struct {
 	// Environment name, from which the Radix deployment is being promoted
 	//
 	// required: true
-
 	FromEnvironment string `json:"fromEnvironment" yaml:"fromEnvironment"`
+
 	// Environment name, to which the Radix deployment is being promoted
 	//
 	// required: true
 	ToEnvironment string `json:"toEnvironment" yaml:"toEnvironment"`
+
+	// CommitID of the promoted deployment
+	//
+	// required: false
+	CommitID string `json:"commitID" yaml:"commitID"`
 }
 
 // RadixDeploySpec is the spec for a deploy job