dapr
/
kubernetes-operator
mirror of https://github.com/dapr/kubernetes-operator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #159 from lburgazzoli/dapr-1.13.3 

chore(deps): bump dapr to v1.13.3
This commit is contained in:
Luca Burgazzoli 2024-05-28 12:14:42 +02:00 committed by GitHub
parent cabcd0c946 f4f08afabc
commit 71ceeb9012
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -22,7 +22,7 @@ LOCALBIN := $(PROJECT_PATH)/bin
HELM_CHART_REPO ?= https://dapr.github.io/helm-charts
HELM_CHART ?= dapr
HELM_CHART_VERSION ?= 1.13.2
HELM_CHART_VERSION ?= 1.13.3
HELM_CHART_URL ?= https://raw.githubusercontent.com/dapr/helm-charts/master/dapr-$(HELM_CHART_VERSION).tgz
OPENSHIFT_VERSIONS ?= v4.12
@ -123,15 +123,15 @@ vet: ## Run go vet against code.
.PHONY: test
test: manifests generate fmt vet ## Run tests.
go test -ldflags="$(GOLDFLAGS)" -v ./pkg/... ./internal/...
DAPR_HELM_CHART_VERSION="$(HELM_CHART_VERSION)" go test -ldflags="$(GOLDFLAGS)" -v ./pkg/... ./internal/...
.PHONY: test/e2e/operator
test/e2e/operator: manifests generate fmt vet ## Run e2e operator tests.
go test -ldflags="$(GOLDFLAGS)" -p 1 -v ./test/e2e/operator/...
DAPR_HELM_CHART_VERSION="$(HELM_CHART_VERSION)" go test -ldflags="$(GOLDFLAGS)" -p 1 -v ./test/e2e/operator/...
.PHONY: test/e2e/olm
test/e2e/olm: ## Run e2e catalog tests.
go test -ldflags="$(GOLDFLAGS)" -p 1 -v ./test/e2e/olm/...
DAPR_HELM_CHART_VERSION="$(HELM_CHART_VERSION)" go test -ldflags="$(GOLDFLAGS)" -p 1 -v ./test/e2e/olm/...
.PHONY: test/e2e/app

2
go.mod
View File

@ -45,7 +45,7 @@ require (
github.com/containerd/containerd v1.7.12 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/dapr/dapr v1.13.0 // indirect
github.com/dapr/dapr v1.13.3 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/docker/cli v24.0.6+incompatible // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect

4
go.sum
View File

@ -67,8 +67,8 @@ github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
github.com/dapr/dapr v1.13.0 h1:yExu47iCyqBSghAGVjgVjica4NfFd0dVlPXQTpQWR98=
github.com/dapr/dapr v1.13.0/go.mod h1:VFjFGrLb84k5pjmWNn9reI5D28OQifdUbBdymXxbZDc=
github.com/dapr/dapr v1.13.3 h1:LJec44e5eRCugthRCvP8VRUi4B0MHW72lBEWCaVhXaM=
github.com/dapr/dapr v1.13.3/go.mod h1:0Yb0r3YViI4/D5yXV5nSYjRlEOarlXBeO089lW08VXE=
github.com/dapr/go-sdk v1.10.1 h1:g6mM2RXyGkrzsqWFfCy8rw+UAt1edQEgRaQXT+XP4PE=
github.com/dapr/go-sdk v1.10.1/go.mod h1:lPjyF/xubh35fbdNdKkxBbFxFNCmta4zmvsk0JxuUG0=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

4
helm-charts/dapr/Chart.yaml
View File

@ -1,5 +1,5 @@
apiVersion: v1
appVersion: 1.13.2
appVersion: 1.13.3
description: A Helm chart for Dapr on Kubernetes
name: dapr
version: 1.13.2
version: 1.13.3

2
helm-charts/dapr/charts/dapr_config/Chart.yaml
View File

@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: A Helm chart for Dapr configuration
name: dapr_config
version: 1.13.2
version: 1.13.3

2
helm-charts/dapr/charts/dapr_operator/Chart.yaml
View File

@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: A Helm chart for Dapr Kubernetes Operator
name: dapr_operator
version: 1.13.2
version: 1.13.3

2
helm-charts/dapr/charts/dapr_placement/Chart.yaml
View File

@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: A Helm chart for Dapr Kubernetes placement
name: dapr_placement
version: 1.13.2
version: 1.13.3

2
helm-charts/dapr/charts/dapr_rbac/Chart.yaml
View File

@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: A Helm chart for Dapr Kubernetes RBAC components
name: dapr_rbac
version: 1.13.2
version: 1.13.3

2
helm-charts/dapr/charts/dapr_sentry/Chart.yaml
View File

@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: A Helm chart for Dapr Sentry
name: dapr_sentry
version: 1.13.2
version: 1.13.3

2
helm-charts/dapr/charts/dapr_sidecar_injector/Chart.yaml
View File

@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: A Helm chart for the Dapr sidecar injector
name: dapr_sidecar_injector
version: 1.13.2
version: 1.13.3

2
helm-charts/dapr/values.yaml
View File

@ -1,6 +1,6 @@
global:
registry: ghcr.io/dapr
tag: '1.13.2'
tag: '1.13.3'
dnsSuffix: ".cluster.local"
logAsJson: false
imagePullPolicy: IfNotPresent

11
test/e2e/operator/dapr_instance_test.go
View File

@ -2,6 +2,7 @@ package operator
import (
"encoding/json"
"os"
"testing"
"github.com/lburgazzoli/gomega-matchers/pkg/matchers/jq"
@ -48,7 +49,7 @@ func TestDaprInstanceDeployWithDefaults(t *testing.T) {
WithTransform(json.Marshal, And(
jq.Match(`.status.chart.name == "dapr"`),
jq.Match(`.status.chart.repo == "embedded"`),
jq.Match(`.status.chart.version == "1.13.2"`),
jq.Match(`.status.chart.version == "`+os.Getenv("DAPR_HELM_CHART_VERSION")+`"`),
)),
)
}
@ -60,7 +61,7 @@ func TestDaprInstanceDeployWithCustomChart(t *testing.T) {
test,
daprAc.DaprInstanceSpec().
WithChart(daprAc.ChartSpec().
WithVersion("1.13.0")).
WithVersion("1.13.2")).
WithValues(nil),
)
@ -81,7 +82,7 @@ func TestDaprInstanceDeployWithCustomChart(t *testing.T) {
WithTransform(json.Marshal, And(
jq.Match(`.status.chart.name == "dapr"`),
jq.Match(`.status.chart.repo == "https://dapr.github.io/helm-charts"`),
jq.Match(`.status.chart.version == "1.13.0"`),
jq.Match(`.status.chart.version == "1.13.2"`),
)),
)
}
@ -118,7 +119,7 @@ func TestDaprInstanceDeployWithCustomSidecarImage(t *testing.T) {
WithTransform(json.Marshal, And(
jq.Match(`.status.chart.name == "dapr"`),
jq.Match(`.status.chart.repo == "embedded"`),
jq.Match(`.status.chart.version == "1.13.2"`),
jq.Match(`.status.chart.version == "`+os.Getenv("DAPR_HELM_CHART_VERSION")+`"`),
)),
)
@ -163,7 +164,7 @@ func TestDaprInstanceDeployWithApp(t *testing.T) {
WithTransform(json.Marshal, And(
jq.Match(`.status.chart.name == "dapr"`),
jq.Match(`.status.chart.repo == "embedded"`),
jq.Match(`.status.chart.version == "1.13.2"`),
jq.Match(`.status.chart.version == "`+os.Getenv("DAPR_HELM_CHART_VERSION")+`"`),
)),
)