Skip to content

Commit 8e13369

Browse files
salaboysalaboy
authored
Merge pull request #37 from lburgazzoli/dapr-1.12.0
"Update to dapr 1.12 and fix for GO-2023-2102"
2 parents 1b91c10 + af255c1 commit 8e13369

40 files changed

+571
-274
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ LOCALBIN := $(PROJECT_PATH)/bin
2222

2323
HELM_CHART_REPO ?= https://dapr.github.io/helm-charts
2424
HELM_CHART ?= dapr
25-
HELM_CHART_VERSION ?= 1.11.3
25+
HELM_CHART_VERSION ?= 1.12.0
2626
HELM_CHART_URL ?= https://raw.githubusercontent.com/dapr/helm-charts/master/dapr-$(HELM_CHART_VERSION).tgz
2727

2828
## Tool Versions

‎config/crd/dapr/components.yaml‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ spec:
1212
- name: v1alpha1
1313
schema:
1414
openAPIV3Schema:
15-
description: Component describes an Dapr component type
15+
description: Component describes an Dapr component type.
1616
properties:
1717
apiVersion:
1818
description: 'APIVersion defines the versioned schema of this representation
1919
of an object. Servers should convert recognized schemas to the latest
2020
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
2121
type: string
2222
auth:
23-
description: Auth represents authentication details for the component
23+
description: Auth represents authentication details for the component.
2424
properties:
2525
secretStore:
2626
type: string
@@ -39,32 +39,38 @@ spec:
3939
type: string
4040
type: array
4141
spec:
42-
description: ComponentSpec is the spec for a component
42+
description: ComponentSpec is the spec for a component.
4343
properties:
44-
initTimeout:
45-
type: string
4644
ignoreErrors:
4745
type: boolean
46+
initTimeout:
47+
type: string
4848
metadata:
4949
items:
50-
description: MetadataItem is a name/value pair for a metadata
50+
description: NameValuePair is a name/value pair.
5151
properties:
52+
envRef:
53+
description: EnvRef is the name of an environmental variable
54+
to read the value from.
55+
type: string
5256
name:
57+
description: Name of the property.
5358
type: string
5459
secretKeyRef:
55-
description: SecretKeyRef is a reference to a secret holding
56-
the value for the metadata item. Name is the secret name,
57-
and key is the field in the secret.
60+
description: SecretKeyRef is the reference of a value in a secret
61+
store component.
5862
properties:
5963
key:
64+
description: Field in the secret.
6065
type: string
6166
name:
67+
description: Secret name.
6268
type: string
6369
required:
64-
- key
6570
- name
6671
type: object
6772
value:
73+
description: Value of the property, in plaintext.
6874
x-kubernetes-preserve-unknown-fields: true
6975
required:
7076
- name

‎config/crd/dapr/configuration.yaml‎

Lines changed: 43 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.9.2
7+
controller-gen.kubebuilder.io/version: v0.11.3
88
creationTimestamp: null
99
name: configurations.dapr.io
1010
labels:
@@ -224,13 +224,20 @@ spec:
224224
description: Configure API logging.
225225
properties:
226226
enabled:
227-
description: Default value for enabling API logging. Sidecars can always override this by setting `--enable-api-logging` to true or false explicitly. The default value is false.
227+
description: Default value for enabling API logging. Sidecars
228+
can always override this by setting `--enable-api-logging`
229+
to true or false explicitly. The default value is false.
228230
type: boolean
229231
obfuscateURLs:
230-
description: 'When enabled, obfuscates the values of URLs in HTTP API logs, logging the route name rather than the full path being invoked, which could contain PII. Default: false. This option has no effect if API logging is disabled.'
232+
description: 'When enabled, obfuscates the values of URLs
233+
in HTTP API logs, logging the route name rather than the
234+
full path being invoked, which could contain PII. Default:
235+
false. This option has no effect if API logging is disabled.'
231236
type: boolean
232237
omitHealthChecks:
233-
description: 'If true, health checks are not reported in API logs. Default: false. This option has no effect if API logging is disabled.'
238+
description: 'If true, health checks are not reported in API
239+
logs. Default: false. This option has no effect if API logging
240+
is disabled.'
234241
type: boolean
235242
type: object
236243
type: object
@@ -315,8 +322,34 @@ spec:
315322
properties:
316323
allowedClockSkew:
317324
type: string
325+
controlPlaneTrustDomain:
326+
type: string
318327
enabled:
319328
type: boolean
329+
sentryAddress:
330+
type: string
331+
tokenValidators:
332+
description: Additional token validators to use. When Dapr is
333+
running in Kubernetes mode, this is in addition to the built-in
334+
"kubernetes" validator. In self-hosted mode, enabling a custom
335+
validator will disable the built-in "insecure" validator.
336+
items:
337+
description: ValidatorSpec contains additional token validators
338+
to use.
339+
properties:
340+
name:
341+
description: Name of the validator
342+
enum:
343+
- jwks
344+
type: string
345+
options:
346+
description: Options for the validator, if any
347+
type: object
348+
x-kubernetes-preserve-unknown-fields: true
349+
required:
350+
- name
351+
type: object
352+
type: array
320353
workloadCertTTL:
321354
type: string
322355
required:
@@ -397,6 +430,12 @@ spec:
397430
required:
398431
- samplingRate
399432
type: object
433+
wasm:
434+
description: WasmSpec describes the security profile for all Dapr Wasm components.
435+
properties:
436+
strictSandbox:
437+
type: boolean
438+
type: object
400439
type: object
401440
type: object
402441
served: true

‎config/crd/dapr/httpendpoints.yaml‎

Lines changed: 98 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,14 @@ spec:
1818
- name: v1alpha1
1919
schema:
2020
openAPIV3Schema:
21-
description: HTTPEndpoint describes a Dapr HTTPEndpoint type for external service invocation. This endpoint can be external to Dapr, or external to the environment.
21+
description: HTTPEndpoint describes a Dapr HTTPEndpoint type for external
22+
service invocation. This endpoint can be external to Dapr, or external to
23+
the environment.
2224
properties:
2325
apiVersion:
24-
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
26+
description: 'APIVersion defines the versioned schema of this representation
27+
of an object. Servers should convert recognized schemas to the latest
28+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
2529
type: string
2630
auth:
2731
description: Auth represents authentication details for the component.
@@ -32,7 +36,9 @@ spec:
3236
- secretStore
3337
type: object
3438
kind:
35-
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
39+
description: 'Kind is a string value representing the REST resource this
40+
object represents. Servers may infer this from the endpoint the client
41+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
3642
type: string
3743
metadata:
3844
type: object
@@ -41,28 +47,113 @@ spec:
4147
type: string
4248
type: array
4349
spec:
44-
description: HTTPEndpointSpec describes an access specification for allowing external service invocations.
50+
description: HTTPEndpointSpec describes an access specification for allowing
51+
external service invocations.
4552
properties:
4653
baseUrl:
4754
type: string
55+
clientTLS:
56+
description: TLS describes how to build client or server TLS configurations.
57+
properties:
58+
certificate:
59+
description: TLSDocument describes and in-line or pointer to a
60+
document to build a TLS configuration.
61+
properties:
62+
secretKeyRef:
63+
description: SecretKeyRef is the reference of a value in a
64+
secret store component.
65+
properties:
66+
key:
67+
description: Field in the secret.
68+
type: string
69+
name:
70+
description: Secret name.
71+
type: string
72+
required:
73+
- name
74+
type: object
75+
value:
76+
description: Value of the property, in plaintext.
77+
x-kubernetes-preserve-unknown-fields: true
78+
type: object
79+
privateKey:
80+
description: TLSDocument describes and in-line or pointer to a
81+
document to build a TLS configuration.
82+
properties:
83+
secretKeyRef:
84+
description: SecretKeyRef is the reference of a value in a
85+
secret store component.
86+
properties:
87+
key:
88+
description: Field in the secret.
89+
type: string
90+
name:
91+
description: Secret name.
92+
type: string
93+
required:
94+
- name
95+
type: object
96+
value:
97+
description: Value of the property, in plaintext.
98+
x-kubernetes-preserve-unknown-fields: true
99+
type: object
100+
renegotiation:
101+
default: Never
102+
description: Renegotiation sets the underlying tls negotiation
103+
strategy for an http channel.
104+
enum:
105+
- Never
106+
- OnceAsClient
107+
- FreelyAsClient
108+
type: string
109+
rootCA:
110+
description: TLSDocument describes and in-line or pointer to a
111+
document to build a TLS configuration.
112+
properties:
113+
secretKeyRef:
114+
description: SecretKeyRef is the reference of a value in a
115+
secret store component.
116+
properties:
117+
key:
118+
description: Field in the secret.
119+
type: string
120+
name:
121+
description: Secret name.
122+
type: string
123+
required:
124+
- name
125+
type: object
126+
value:
127+
description: Value of the property, in plaintext.
128+
x-kubernetes-preserve-unknown-fields: true
129+
type: object
130+
type: object
48131
headers:
49132
items:
50-
description: Header is the name/value pair for a header specification.
133+
description: NameValuePair is a name/value pair.
51134
properties:
135+
envRef:
136+
description: EnvRef is the name of an environmental variable
137+
to read the value from.
138+
type: string
52139
name:
140+
description: Name of the property.
53141
type: string
54142
secretKeyRef:
55-
description: SecretKeyRef is a reference to a secret holding the value for the metadata item. Name is the secret name, and key is the field in the secret.
143+
description: SecretKeyRef is the reference of a value in a secret
144+
store component.
56145
properties:
57146
key:
147+
description: Field in the secret.
58148
type: string
59149
name:
150+
description: Secret name.
60151
type: string
61152
required:
62-
- key
63153
- name
64154
type: object
65155
value:
156+
description: Value of the property, in plaintext.
66157
x-kubernetes-preserve-unknown-fields: true
67158
required:
68159
- name

‎config/crd/dapr/subscription.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ spec:
5454
deadLetterTopic:
5555
type: string
5656
bulkSubscribe:
57-
description: Represents bulk subscribe properies
57+
description: Represents bulk subscribe properties
5858
properties:
59-
enabled:
59+
enabled:
6060
type: boolean
6161
maxMessagesCount:
6262
type: integer
@@ -144,9 +144,9 @@ spec:
144144
description: The optional dead letter queue for this topic to send events to.
145145
type: string
146146
bulkSubscribe:
147-
description: Represents bulk subscribe properies
147+
description: Represents bulk subscribe properties
148148
properties:
149-
enabled:
149+
enabled:
150150
type: boolean
151151
maxMessagesCount:
152152
type: integer

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,13 @@ require (
129129
go.starlark.net v0.0.0-20230814145427-12f4cb8177e4 // indirect
130130
go.uber.org/multierr v1.11.0 // indirect
131131
go.uber.org/zap v1.25.0 // indirect
132-
golang.org/x/crypto v0.13.0 // indirect
132+
golang.org/x/crypto v0.14.0 // indirect
133133
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
134-
golang.org/x/net v0.15.0 // indirect
134+
golang.org/x/net v0.17.0 // indirect
135135
golang.org/x/oauth2 v0.12.0 // indirect
136136
golang.org/x/sync v0.3.0 // indirect
137-
golang.org/x/sys v0.12.0 // indirect
138-
golang.org/x/term v0.12.0 // indirect
137+
golang.org/x/sys v0.13.0 // indirect
138+
golang.org/x/term v0.13.0 // indirect
139139
golang.org/x/text v0.13.0 // indirect
140140
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
141141
google.golang.org/appengine v1.6.8 // indirect

0 commit comments

Comments
 (0)