Skip to content

Commit 338fe37

Browse files
yaron2yaron2
authored
Merge pull request #1557 from JoshVanL/merge-1.16-master
Merge 1.16 master
2 parents 7176ed0 + f369ffb commit 338fe37

File tree

25 files changed

+327
-187
lines changed

25 files changed

+327
-187
lines changed

‎.github/workflows/dapr_cli.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,29 +39,29 @@ jobs:
3939
WIX_BIN_PATH: 'C:/Program Files (x86)/WiX Toolset v3.11/bin'
4040
strategy:
4141
matrix:
42-
os: [ubuntu-latest, windows-latest, macOS-latest, macOS-latest-large]
42+
os: [ubuntu-latest, windows-latest, macOS-14, macOS-14-large]
4343
target_arch: [arm, arm64, amd64]
4444
include:
4545
- os: ubuntu-latest
4646
target_os: linux
4747
- os: windows-latest
4848
target_os: windows
49-
- os: macOS-latest
49+
- os: macOS-14
5050
target_os: darwin
51-
- os: macOS-latest-large
51+
- os: macOS-14-large
5252
target_os: darwin
5353
exclude:
5454
- os: windows-latest
5555
target_arch: arm
5656
- os: windows-latest
5757
target_arch: arm64
58-
- os: macOS-latest
58+
- os: macOS-14
5959
target_arch: arm
60-
- os: macOS-latest
60+
- os: macOS-14
6161
target_arch: amd64
62-
- os: macOS-latest-large
62+
- os: macOS-14-large
6363
target_arch: arm
64-
- os: macOS-latest-large
64+
- os: macOS-14-large
6565
target_arch: arm64
6666
steps:
6767
- name: Prepare Go's bin location - MacOS

‎.github/workflows/kind_e2e.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ jobs:
5050
name: E2E tests for K8s (KinD)
5151
runs-on: ubuntu-latest
5252
env:
53-
DAPR_RUNTIME_PINNED_VERSION: 1.14.4
54-
DAPR_DASHBOARD_PINNED_VERSION: 0.14.0
53+
DAPR_RUNTIME_PINNED_VERSION: 1.16.0
54+
DAPR_DASHBOARD_PINNED_VERSION: 0.15.0
5555
DAPR_RUNTIME_LATEST_STABLE_VERSION:
5656
DAPR_DASHBOARD_LATEST_STABLE_VERSION:
5757
strategy:

‎.github/workflows/self_hosted_e2e.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ jobs:
3838
GOARCH: ${{ matrix.target_arch }}
3939
GOPROXY: https://proxy.golang.org
4040
ARCHIVE_OUTDIR: dist/archives
41-
DAPR_RUNTIME_PINNED_VERSION: "1.14.4"
42-
DAPR_DASHBOARD_PINNED_VERSION: 0.14.0
41+
DAPR_RUNTIME_PINNED_VERSION: "1.16.0"
42+
DAPR_DASHBOARD_PINNED_VERSION: 0.15.0
4343
DAPR_RUNTIME_LATEST_STABLE_VERSION: ""
4444
DAPR_DASHBOARD_LATEST_STABLE_VERSION: ""
4545
GOLANG_PROTOBUF_REGISTRATION_CONFLICT: warn
@@ -49,13 +49,13 @@ jobs:
4949
fail-fast: false # Keep running if one leg fails.
5050
matrix:
5151
# See https://github.com/actions/runner-images
52-
os: [macos-latest-large, ubuntu-latest, windows-latest]
52+
os: [macos-14-large, ubuntu-latest, windows-latest]
5353
target_arch: [amd64]
5454
dapr_install_mode: [slim, complete]
5555
include:
5656
- os: ubuntu-latest
5757
target_os: linux
58-
- os: macos-latest-large
58+
- os: macos-14-large
5959
target_os: darwin
6060
- os: windows-latest
6161
target_os: windows
@@ -64,7 +64,7 @@ jobs:
6464
dapr_install_mode: complete
6565
steps:
6666
- name: Prepare Go's bin location - MacOS
67-
if: matrix.os == 'macos-latest-large'
67+
if: matrix.os == 'macos-14-large'
6868
run: |
6969
export PATH=$HOME/bin:$PATH
7070
echo "$HOME/bin" >> $GITHUB_PATH
@@ -80,7 +80,7 @@ jobs:
8080
go-version-file: "go.mod"
8181
- name: Install podman - MacOS
8282
timeout-minutes: 15
83-
if: matrix.os == 'macos-latest-large' && matrix.dapr_install_mode == 'complete'
83+
if: matrix.os == 'macos-14-large' && matrix.dapr_install_mode == 'complete'
8484
run: |
8585
# Install podman
8686
curl -sL -o podman.pkg https://github.com/containers/podman/releases/download/v${{ env.PODMAN_VERSION }}/podman-installer-macos-amd64.pkg
@@ -130,7 +130,7 @@ jobs:
130130
echo "DAPR_DASHBOARD_LATEST_STABLE_VERSION=$LATEST_STABLE_DASHBOARD_VERSION" >> $GITHUB_ENV
131131
shell: bash
132132
- name: Set the test timeout - MacOS
133-
if: matrix.os == 'macos-latest-large'
133+
if: matrix.os == 'macos-14-large'
134134
run: echo "E2E_SH_TEST_TIMEOUT=30m" >> $GITHUB_ENV
135135
- name: Run E2E tests with GHCR
136136
# runs every 6hrs

‎cmd/run.go‎

Lines changed: 48 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -189,26 +189,42 @@ dapr run --run-file /path/to/directory -k
189189
}
190190

191191
sharedRunConfig := &standalone.SharedRunConfig{
192-
ConfigFile: configFile,
193-
EnableProfiling: enableProfiling,
194-
LogLevel: logLevel,
195-
MaxConcurrency: maxConcurrency,
196-
AppProtocol: protocol,
197-
PlacementHostAddr: viper.GetString("placement-host-address"),
198-
ComponentsPath: componentsPath,
199-
ResourcesPaths: resourcesPaths,
200-
AppSSL: appSSL,
201-
MaxRequestBodySize: maxRequestBodySize,
202-
HTTPReadBufferSize: readBufferSize,
203-
EnableAppHealth: enableAppHealth,
204-
AppHealthPath: appHealthPath,
205-
AppHealthInterval: appHealthInterval,
206-
AppHealthTimeout: appHealthTimeout,
207-
AppHealthThreshold: appHealthThreshold,
208-
EnableAPILogging: enableAPILogging,
209-
APIListenAddresses: apiListenAddresses,
210-
SchedulerHostAddress: schedulerHostAddress,
211-
DaprdInstallPath: daprRuntimePath,
192+
ConfigFile: configFile,
193+
EnableProfiling: enableProfiling,
194+
LogLevel: logLevel,
195+
MaxConcurrency: maxConcurrency,
196+
AppProtocol: protocol,
197+
ComponentsPath: componentsPath,
198+
ResourcesPaths: resourcesPaths,
199+
AppSSL: appSSL,
200+
MaxRequestBodySize: maxRequestBodySize,
201+
HTTPReadBufferSize: readBufferSize,
202+
EnableAppHealth: enableAppHealth,
203+
AppHealthPath: appHealthPath,
204+
AppHealthInterval: appHealthInterval,
205+
AppHealthTimeout: appHealthTimeout,
206+
AppHealthThreshold: appHealthThreshold,
207+
EnableAPILogging: enableAPILogging,
208+
APIListenAddresses: apiListenAddresses,
209+
DaprdInstallPath: daprRuntimePath,
210+
}
211+
212+
// placement-host-address flag handling: only set pointer if flag was explicitly changed
213+
if cmd.Flags().Changed("placement-host-address") {
214+
val := viper.GetString("placement-host-address")
215+
sharedRunConfig.PlacementHostAddr = &val // may be empty => disable
216+
}
217+
218+
// scheduler-host-address defaulting/handling
219+
if cmd.Flags().Changed("scheduler-host-address") {
220+
val := schedulerHostAddress
221+
sharedRunConfig.SchedulerHostAddress = &val // may be empty => disable
222+
} else {
223+
// Apply version-based defaulting used previously
224+
addr := validateSchedulerHostAddress(daprVer.RuntimeVersion, schedulerHostAddress)
225+
if addr != "" {
226+
sharedRunConfig.SchedulerHostAddress = &addr
227+
}
212228
}
213229
output, err := runExec.NewOutput(&standalone.RunConfig{
214230
AppID: appID,
@@ -487,8 +503,8 @@ func init() {
487503
// TODO: Remove below line once the flag is removed in the future releases.
488504
// By marking this as deprecated, the flag will be hidden from the help menu, but will continue to work. It will show a warning message when used.
489505
RunCmd.Flags().MarkDeprecated("components-path", "This flag is deprecated and will be removed in the future releases. Use \"resources-path\" flag instead")
490-
RunCmd.Flags().String("placement-host-address", "localhost", "The address of the placement service. Format is either <hostname> for default port or <hostname>:<port> for custom port")
491-
RunCmd.Flags().StringVarP(&schedulerHostAddress, "scheduler-host-address", "", "localhost", "The address of the scheduler service. Format is either <hostname> for default port or <hostname>:<port> for custom port")
506+
RunCmd.Flags().String("placement-host-address", "localhost", "The address of the placement service. Format is either <hostname> for default port or <hostname>:<port> for custom port. Set to an empty string to disable placement")
507+
RunCmd.Flags().StringVarP(&schedulerHostAddress, "scheduler-host-address", "", "localhost", "The address of the scheduler service. Format is either <hostname> for default port or <hostname>:<port> for custom port. Set to an empty string to disable scheduler")
492508
// TODO: Remove below flag once the flag is removed in runtime in future release.
493509
RunCmd.Flags().BoolVar(&appSSL, "app-ssl", false, "Enable https when Dapr invokes the application")
494510
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")
@@ -529,7 +545,15 @@ func executeRun(runTemplateName, runFilePath string, apps []runfileconfig.App) (
529545
// Set defaults if zero value provided in config yaml.
530546
app.RunConfig.SetDefaultFromSchema()
531547

532-
app.RunConfig.SchedulerHostAddress = validateSchedulerHostAddress(daprVer.RuntimeVersion, app.RunConfig.SchedulerHostAddress)
548+
// Adjust scheduler host address defaults for run-file apps (pointer-aware)
549+
var schedIn string
550+
if app.RunConfig.SchedulerHostAddress != nil {
551+
schedIn = *app.RunConfig.SchedulerHostAddress
552+
}
553+
schedOut := validateSchedulerHostAddress(daprVer.RuntimeVersion, schedIn)
554+
if schedOut != "" {
555+
app.RunConfig.SchedulerHostAddress = &schedOut
556+
}
533557

534558
// Validate validates the configs and modifies the ports to free ports, appId etc.
535559
err := app.RunConfig.Validate()
@@ -1012,7 +1036,7 @@ func putAppProcessIDInMeta(runE *runExec.RunExec) {
10121036
func putAppCommandInMeta(runConfig standalone.RunConfig, runE *runExec.RunExec) {
10131037
appCommand := strings.Join(runConfig.Command, " ")
10141038
print.StatusEvent(runE.DaprCMD.OutputWriter, print.LogInfo, "Updating metadata for app command: %s", appCommand)
1015-
err := metadata.Put(runE.DaprHTTPPort, "appCommand", appCommand, runE.AppID, runConfig.UnixDomainSocket)
1039+
err := metadata.Put(runE.DaprHTTPPort, "appCommand", appCommand, runE.AppID, unixDomainSocket)
10161040
if err != nil {
10171041
print.StatusEvent(runE.DaprCMD.OutputWriter, print.LogWarning, "Could not update sidecar metadata for appCommand: %s", err.Error())
10181042
return

‎go.mod‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
module github.com/dapr/cli
22

3-
go 1.24.5
3+
go 1.24.7
44

55
require (
66
github.com/Masterminds/semver v1.5.0
77
github.com/Masterminds/semver/v3 v3.3.0
88
github.com/Pallinder/sillyname-go v0.0.0-20130730142914-97aeae9e6ba1
99
github.com/briandowns/spinner v1.19.0
10-
github.com/dapr/dapr v1.16.0-rc.3
11-
github.com/dapr/go-sdk v1.11.0
12-
github.com/dapr/kit v0.15.3-0.20250717140748-8b780b4d81c5
10+
github.com/dapr/dapr v1.16.0
11+
github.com/dapr/go-sdk v1.13.0
12+
github.com/dapr/kit v0.16.1
1313
github.com/docker/docker v25.0.6+incompatible
1414
github.com/evanphx/json-patch/v5 v5.9.0
1515
github.com/fatih/color v1.17.0
@@ -73,8 +73,8 @@ require (
7373
github.com/containerd/log v0.1.0 // indirect
7474
github.com/containerd/platforms v0.2.1 // indirect
7575
github.com/cyphar/filepath-securejoin v0.3.6 // indirect
76-
github.com/dapr/components-contrib v1.15.1-0.20250725163610-adc76bd6ec85 // indirect
77-
github.com/dapr/durabletask-go v0.7.3-0.20250711135247-7a35af6fe0e5 // indirect
76+
github.com/dapr/components-contrib v1.16.0 // indirect
77+
github.com/dapr/durabletask-go v0.10.0 // indirect
7878
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
7979
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
8080
github.com/distribution/reference v0.6.0 // indirect
@@ -205,14 +205,14 @@ require (
205205
go.opencensus.io v0.24.0 // indirect
206206
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
207207
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
208-
go.opentelemetry.io/otel v1.35.0 // indirect
208+
go.opentelemetry.io/otel v1.36.0 // indirect
209209
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
210210
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0 // indirect
211211
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.35.0 // indirect
212212
go.opentelemetry.io/otel/exporters/zipkin v1.34.0 // indirect
213-
go.opentelemetry.io/otel/metric v1.35.0 // indirect
213+
go.opentelemetry.io/otel/metric v1.36.0 // indirect
214214
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
215-
go.opentelemetry.io/otel/trace v1.35.0 // indirect
215+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
216216
go.opentelemetry.io/proto/otlp v1.6.0 // indirect
217217
go.uber.org/multierr v1.11.0 // indirect
218218
golang.org/x/crypto v0.39.0 // indirect

‎go.sum‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -148,16 +148,16 @@ github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
148148
github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
149149
github.com/cyphar/filepath-securejoin v0.3.6 h1:4d9N5ykBnSp5Xn2JkhocYDkOpURL/18CYMpo6xB9uWM=
150150
github.com/cyphar/filepath-securejoin v0.3.6/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
151-
github.com/dapr/components-contrib v1.15.1-0.20250725163610-adc76bd6ec85 h1:eSCTYjRM8oRMWMXCXLxAQRCli03FNVUFbS00IF4h+zQ=
152-
github.com/dapr/components-contrib v1.15.1-0.20250725163610-adc76bd6ec85/go.mod h1:GfreXwMaOEn1ISA8lPtlLQCb8lzI4Ux/4TlYPE/OHfU=
153-
github.com/dapr/dapr v1.16.0-rc.3 h1:D99V20GOhb+bZXH1PngME+wgzIZCcBFOvmaP7DOZxGo=
154-
github.com/dapr/dapr v1.16.0-rc.3/go.mod h1:uyKnxMohSg87LSFzZ/oyuiGSo0+qkzeR0eXncPyIV9c=
155-
github.com/dapr/durabletask-go v0.7.3-0.20250711135247-7a35af6fe0e5 h1:l8oBGwcfCwqvSYDZwla0A2fhENmXFc1Wk4lR0VEq+is=
156-
github.com/dapr/durabletask-go v0.7.3-0.20250711135247-7a35af6fe0e5/go.mod h1:0Ts4rXp74JyG19gDWPcwNo5V6NBZzhARzHF5XynmA7Q=
157-
github.com/dapr/go-sdk v1.11.0 h1:clANpOQd6MsfvSa6snaX8MVk6eRx26Vsj5GxGdQ6mpE=
158-
github.com/dapr/go-sdk v1.11.0/go.mod h1:btZ/tX8eYnx0fg3HiJUku8J5QBRXHsp3kAB1BUiTxXY=
159-
github.com/dapr/kit v0.15.3-0.20250717140748-8b780b4d81c5 h1:Q26gmPxs6WnnBYoudOlznPHsmrbTawcYEpHg4VoB7v8=
160-
github.com/dapr/kit v0.15.3-0.20250717140748-8b780b4d81c5/go.mod h1:40ZWs5P6xfYf7O59XgwqZkIyDldTIXlhTQhGop8QoSM=
151+
github.com/dapr/components-contrib v1.16.0 h1:kUif6UyxtRz6tXnkuIjbx6z+VLMfc6y+SIYa9T7J3eA=
152+
github.com/dapr/components-contrib v1.16.0/go.mod h1:1AufCWqZwBj//UkyS7FesOEmp5/E6Xgy1tyCn8peiR4=
153+
github.com/dapr/dapr v1.16.0 h1:la2WLZM8Myr2Pq3cyrFjHKWDSPYLzGZCs3p502TwBjI=
154+
github.com/dapr/dapr v1.16.0/go.mod h1:ln/mxvNOeqklaDmic4ppsxmnjl2D/oZGKaJy24IwaEY=
155+
github.com/dapr/durabletask-go v0.10.0 h1:vfIivPl4JYd55xZTslDwhA6p6F8ipcNxBtMaupxArr8=
156+
github.com/dapr/durabletask-go v0.10.0/go.mod h1:0Ts4rXp74JyG19gDWPcwNo5V6NBZzhARzHF5XynmA7Q=
157+
github.com/dapr/go-sdk v1.13.0 h1:Qw2BmUonClQ9yK/rrEEaFL1PyDgq616RrvYj0CT67Lk=
158+
github.com/dapr/go-sdk v1.13.0/go.mod h1:RsffVNZitDApmQqoS68tNKGMXDZUjTviAbKZupJSzts=
159+
github.com/dapr/kit v0.16.1 h1:MqLAhHVg8trPy2WJChMZFU7ToeondvxcNHYVvMDiVf4=
160+
github.com/dapr/kit v0.16.1/go.mod h1:40ZWs5P6xfYf7O59XgwqZkIyDldTIXlhTQhGop8QoSM=
161161
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
162162
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
163163
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
@@ -684,8 +684,8 @@ go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJyS
684684
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
685685
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 h1:sbiXRNDSWJOTobXh5HyQKjq6wUC5tNybqjIqDpAY4CU=
686686
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ=
687-
go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ=
688-
go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y=
687+
go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg=
688+
go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E=
689689
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 h1:1fTNlAIJZGWLP5FVu0fikVry1IsiUnXjf7QFvoNN3Xw=
690690
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0/go.mod h1:zjPK58DtkqQFn+YUMbx0M2XV3QgKU0gS9LeGohREyK4=
691691
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0 h1:m639+BofXTvcY1q8CGs4ItwQarYtJPOWmVobfM1HpVI=
@@ -694,14 +694,14 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.35.0 h1:xJ2qH
694694
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.35.0/go.mod h1:u5BF1xyjstDowA1R5QAO9JHzqK+ublenEW/dyqTjBVk=
695695
go.opentelemetry.io/otel/exporters/zipkin v1.34.0 h1:GSjCkoYqsnvUMCjxF18j2tCWH8fhGZYjH3iYgechPTI=
696696
go.opentelemetry.io/otel/exporters/zipkin v1.34.0/go.mod h1:h830hluwAqgSNnZbxL2rJhmAlE7/0SF9esoHVLU04Gc=
697-
go.opentelemetry.io/otel/metric v1.35.0 h1:0znxYu2SNyuMSQT4Y9WDWej0VpcsxkuklLa4/siN90M=
698-
go.opentelemetry.io/otel/metric v1.35.0/go.mod h1:nKVFgxBZ2fReX6IlyW28MgZojkoAkJGaE8CpgeAU3oE=
697+
go.opentelemetry.io/otel/metric v1.36.0 h1:MoWPKVhQvJ+eeXWHFBOPoBOi20jh6Iq2CcCREuTYufE=
698+
go.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs=
699699
go.opentelemetry.io/otel/sdk v1.35.0 h1:iPctf8iprVySXSKJffSS79eOjl9pvxV9ZqOWT0QejKY=
700700
go.opentelemetry.io/otel/sdk v1.35.0/go.mod h1:+ga1bZliga3DxJ3CQGg3updiaAJoNECOgJREo9KHGQg=
701701
go.opentelemetry.io/otel/sdk/metric v1.35.0 h1:1RriWBmCKgkeHEhM7a2uMjMUfP7MsOF5JpUCaEqEI9o=
702702
go.opentelemetry.io/otel/sdk/metric v1.35.0/go.mod h1:is6XYCUMpcKi+ZsOvfluY5YstFnhW0BidkR+gL+qN+w=
703-
go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt/xgMs=
704-
go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc=
703+
go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w=
704+
go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA=
705705
go.opentelemetry.io/proto/otlp v1.6.0 h1:jQjP+AQyTf+Fe7OKj/MfkDrmK4MNVtw2NpXsf9fefDI=
706706
go.opentelemetry.io/proto/otlp v1.6.0/go.mod h1:cicgGehlFuNdgZkcALOCh3VE6K/u2tAjzlRhDwmVpZc=
707707
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=

‎pkg/kubernetes/kubernetes.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ func Init(config InitConfiguration) error {
101101
redisChartVals := []string{
102102
"image.tag=" + redisVersion,
103103
"replica.replicaCount=0",
104+
"image.repository=bitnamilegacy/redis",
104105
}
105106

106107
err = installThirdPartyWithConsole(redisReleaseName, redisChartName, bitnamiStableVersion, bitnamiHelmRepo, "Dapr Redis", redisChartVals, config)

‎pkg/kubernetes/renew_certificate.go‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929

3030
"github.com/dapr/cli/pkg/print"
3131
"github.com/dapr/cli/utils"
32-
"github.com/dapr/dapr/pkg/sentry/server/ca"
32+
"github.com/dapr/dapr/pkg/sentry/server/ca/bundle"
3333
)
3434

3535
type RenewCertificateParams struct {
@@ -196,7 +196,12 @@ func GenerateNewCertificates(validUntil time.Duration, privateKeyFile string) ([
196196
}
197197
}
198198

199-
bundle, err := ca.GenerateBundle(rootKey, "cluster.local", allowedClockSkew, &validUntil)
199+
bundle, err := bundle.GenerateX509(bundle.OptionsX509{
200+
X509RootKey: rootKey,
201+
TrustDomain: "cluster.local",
202+
AllowedClockSkew: allowedClockSkew,
203+
OverrideCATTL: &validUntil,
204+
})
200205
if err != nil {
201206
return nil, nil, nil, err
202207
}

0 commit comments

Comments
 (0)