Skip to content

Commit 5e3264e

Browse files
committed
fix: k8s 1.18
Signed-off-by: Ashing Zheng <[email protected]>
1 parent 5c66442 commit 5e3264e

File tree

1 file changed

+20
-9
lines changed

1 file changed

+20
-9
lines changed

config/crd-nocel/apisix.apache.org_v2.yaml

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -101,28 +101,36 @@ spec:
101101
properties:
102102
access_key:
103103
description: AccessKey is the identifier used to look
104-
up the HMAC secret.
104+
up the HMAC secret. Deprecated from consumer configuration
105105
type: string
106106
algorithm:
107107
description: Algorithm specifies the hashing algorithm
108-
(e.g., "hmac-sha256").
108+
(e.g., "hmac-sha256"). Deprecated from consumer configuration
109109
type: string
110110
clock_skew:
111111
description: ClockSkew is the allowed time difference
112-
(in seconds) between client and server clocks.
112+
(in seconds) between client and server clocks. Deprecated
113+
from consumer configuration
113114
format: int64
114115
type: integer
115116
encode_uri_params:
116117
description: EncodeURIParams indicates whether URI parameters
117-
are encoded when calculating the signature.
118+
are encoded when calculating the signature. Deprecated
119+
from consumer configuration
118120
type: boolean
119121
keep_headers:
120122
description: KeepHeaders determines whether the HMAC signature
121-
headers are preserved after verification.
123+
headers are preserved after verification. Deprecated
124+
from consumer configuration
122125
type: boolean
126+
key_id:
127+
description: KeyID is the identifier used to look up the
128+
HMAC secret.
129+
type: string
123130
max_req_body:
124131
description: MaxReqBody sets the maximum size (in bytes)
125-
of the request body that can be validated.
132+
of the request body that can be validated. Deprecated
133+
from consumer configuration
126134
format: int64
127135
type: integer
128136
secret_key:
@@ -131,17 +139,20 @@ spec:
131139
type: string
132140
signed_headers:
133141
description: SignedHeaders lists the headers that must
134-
be included in the signature.
142+
be included in the signature. Deprecated from consumer
143+
configuration
135144
items:
136145
type: string
137146
type: array
138147
validate_request_body:
139148
description: ValidateRequestBody enables HMAC validation
140-
of the request body.
149+
of the request body. Deprecated from consumer configuration
141150
type: boolean
142151
required:
143-
- access_key
144152
- secret_key
153+
oneOf:
154+
- required: ["key_id", "secret_key"]
155+
- required: ["access_key", "secret_key"]
145156
type: object
146157
type: object
147158
jwtAuth:

0 commit comments

Comments
 (0)