Skip to content

Commit ac6822e

Browse files
yaron2yaron2
authored
Remove deprecated flags (#1482)
* remove deprecated flags Signed-off-by: yaron2 <[email protected]> * update Dapr version in tests Signed-off-by: yaron2 <[email protected]> --------- Signed-off-by: yaron2 <[email protected]>
1 parent f8ee63c commit ac6822e

File tree

8 files changed

+14
-14
lines changed

8 files changed

+14
-14
lines changed

‎.github/workflows/kind_e2e.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
name: E2E tests for K8s (KinD)
5151
runs-on: ubuntu-latest
5252
env:
53-
DAPR_RUNTIME_PINNED_VERSION: 1.13.5
53+
DAPR_RUNTIME_PINNED_VERSION: 1.14.4
5454
DAPR_DASHBOARD_PINNED_VERSION: 0.14.0
5555
DAPR_RUNTIME_LATEST_STABLE_VERSION:
5656
DAPR_DASHBOARD_LATEST_STABLE_VERSION:

‎.github/workflows/self_hosted_e2e.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
GOARCH: ${{ matrix.target_arch }}
3939
GOPROXY: https://proxy.golang.org
4040
ARCHIVE_OUTDIR: dist/archives
41-
DAPR_RUNTIME_PINNED_VERSION: "1.13.5"
41+
DAPR_RUNTIME_PINNED_VERSION: "1.14.4"
4242
DAPR_DASHBOARD_PINNED_VERSION: 0.14.0
4343
DAPR_RUNTIME_LATEST_STABLE_VERSION: ""
4444
DAPR_DASHBOARD_LATEST_STABLE_VERSION: ""

‎cmd/annotate.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -385,8 +385,8 @@ func init() {
385385
AnnotateCmd.Flags().StringVar(&annotateDaprImage, "dapr-image", "", "The image to use for the dapr sidecar container")
386386
AnnotateCmd.Flags().BoolVar(&annotateAppSSL, "app-ssl", false, "Enable SSL for the app")
387387
AnnotateCmd.Flags().MarkDeprecated("app-ssl", "This flag is deprecated and will be removed in a future release. Use \"app-protocol\" flag with https or grpcs instead")
388-
AnnotateCmd.Flags().IntVar(&annotateMaxRequestBodySize, "max-request-body-size", -1, "The maximum request body size to use")
389-
AnnotateCmd.Flags().IntVar(&annotateReadBufferSize, "http-read-buffer-size", -1, "The maximum size of HTTP header read buffer in kilobytes")
388+
AnnotateCmd.Flags().IntVar(&annotateMaxRequestBodySize, "max-body-size", -1, "The maximum request body size to use")
389+
AnnotateCmd.Flags().IntVar(&annotateReadBufferSize, "read-buffer-size", -1, "The maximum size of HTTP header read buffer in kilobytes")
390390
AnnotateCmd.Flags().BoolVar(&annotateHTTPStreamRequestBody, "http-stream-request-body", false, "Enable streaming request body for HTTP")
391391
AnnotateCmd.Flags().IntVar(&annotateGracefulShutdownSeconds, "graceful-shutdown-seconds", -1, "The number of seconds to wait for the app to shutdown")
392392
AnnotateCmd.Flags().BoolVar(&annotateEnableAPILogging, "enable-api-logging", false, "Enable API logging for the Dapr sidecar")

‎cmd/run.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -473,8 +473,8 @@ func init() {
473473
RunCmd.Flags().MarkDeprecated("app-ssl", "This flag is deprecated and will be removed in the future releases. Use \"app-protocol\" flag with https or grpcs values instead")
474474
RunCmd.Flags().IntVarP(&metricsPort, "metrics-port", "M", -1, "The port of metrics on dapr")
475475
RunCmd.Flags().BoolP("help", "h", false, "Print this help message")
476-
RunCmd.Flags().IntVarP(&maxRequestBodySize, "dapr-http-max-request-size", "", -1, "Max size of request body in MB")
477-
RunCmd.Flags().IntVarP(&readBufferSize, "dapr-http-read-buffer-size", "", -1, "HTTP header read buffer in KB")
476+
RunCmd.Flags().IntVarP(&maxRequestBodySize, "max-body-size", "", -1, "Max size of request body in MB")
477+
RunCmd.Flags().IntVarP(&readBufferSize, "read-buffer-size", "", -1, "HTTP header read buffer in KB")
478478
RunCmd.Flags().StringVarP(&unixDomainSocket, "unix-domain-socket", "u", "", "Path to a unix domain socket dir. If specified, Dapr API servers will use Unix Domain Sockets")
479479
RunCmd.Flags().BoolVar(&enableAppHealth, "enable-app-health-check", false, "Enable health checks for the application using the protocol defined with app-protocol")
480480
RunCmd.Flags().StringVar(&appHealthPath, "app-health-check-path", "", "Path used for health checks; HTTP only")

‎pkg/kubernetes/annotator.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ const (
5555
daprReadinessProbeThresholdKey = "dapr.io/sidecar-readiness-probe-threshold"
5656
daprImageKey = "dapr.io/sidecar-image"
5757
daprAppSSLKey = "dapr.io/app-ssl"
58-
daprMaxRequestBodySizeKey = "dapr.io/http-max-request-size"
59-
daprReadBufferSizeKey = "dapr.io/http-read-buffer-size"
58+
daprMaxRequestBodySizeKey = "dapr.io/max-body-size"
59+
daprReadBufferSizeKey = "dapr.io/read-buffer-size"
6060
daprHTTPStreamRequestBodyKey = "dapr.io/http-stream-request-body"
6161
daprGracefulShutdownSecondsKey = "dapr.io/graceful-shutdown-seconds"
6262
daprEnableAPILoggingKey = "dapr.io/enable-api-logging"

‎pkg/runexec/runexec_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,9 @@ func assertCommonArgs(t *testing.T, basicConfig *standalone.RunConfig, output *R
120120
assertArgumentEqual(t, "components-path", standalone.GetDaprComponentsPath(daprPath), output.DaprCMD.Args)
121121
assertArgumentEqual(t, "app-ssl", "", output.DaprCMD.Args)
122122
assertArgumentEqual(t, "metrics-port", "9001", output.DaprCMD.Args)
123-
assertArgumentEqual(t, "dapr-http-max-request-size", "-1", output.DaprCMD.Args)
123+
assertArgumentEqual(t, "max-body-size", "-1", output.DaprCMD.Args)
124124
assertArgumentEqual(t, "dapr-internal-grpc-port", "5050", output.DaprCMD.Args)
125-
assertArgumentEqual(t, "dapr-http-read-buffer-size", "-1", output.DaprCMD.Args)
125+
assertArgumentEqual(t, "read-buffer-size", "-1", output.DaprCMD.Args)
126126
assertArgumentEqual(t, "dapr-listen-addresses", "127.0.0.1", output.DaprCMD.Args)
127127
}
128128

‎pkg/standalone/list.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@ func List() ([]ListOutput, error) {
105105
enableMetrics = true
106106
}
107107

108-
maxRequestBodySize := getIntArg(argumentsMap, "http-max-request-size", runtime.DefaultMaxRequestBodySize)
108+
maxRequestBodySize := getIntArg(argumentsMap, "max-body-size", runtime.DefaultMaxRequestBodySize)
109109

110-
httpReadBufferSize := getIntArg(argumentsMap, "http-read-buffer-size", runtime.DefaultReadBufferSize)
110+
httpReadBufferSize := getIntArg(argumentsMap, "read-buffer-size", runtime.DefaultReadBufferSize)
111111

112112
appID := argumentsMap["--app-id"]
113113
appCmd := ""

‎pkg/standalone/run.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ type SharedRunConfig struct {
7979
ResourcesPaths []string `arg:"resources-path" yaml:"resourcesPaths"`
8080
// Speicifcally omitted from annotations as appSSL is deprecated.
8181
AppSSL bool `arg:"app-ssl" yaml:"appSSL"`
82-
MaxRequestBodySize int `arg:"dapr-http-max-request-size" annotation:"dapr.io/http-max-request-size" yaml:"daprHTTPMaxRequestSize" default:"-1"`
83-
HTTPReadBufferSize int `arg:"dapr-http-read-buffer-size" annotation:"dapr.io/http-read-buffer-size" yaml:"daprHTTPReadBufferSize" default:"-1"`
82+
MaxRequestBodySize int `arg:"max-body-size" annotation:"dapr.io/max-body-size" yaml:"maxBodySize" default:"-1"`
83+
HTTPReadBufferSize int `arg:"read-buffer-size" annotation:"dapr.io/read-buffer-size" yaml:"readBufferSize" default:"-1"`
8484
EnableAppHealth bool `arg:"enable-app-health-check" annotation:"dapr.io/enable-app-health-check" yaml:"enableAppHealthCheck"`
8585
AppHealthPath string `arg:"app-health-check-path" annotation:"dapr.io/app-health-check-path" yaml:"appHealthCheckPath"`
8686
AppHealthInterval int `arg:"app-health-probe-interval" annotation:"dapr.io/app-health-probe-interval" ifneq:"0" yaml:"appHealthProbeInterval"`

0 commit comments

Comments
 (0)