Skip to content

Commit 856177b

Browse files
p0lyn0mialp0lyn0mial
committed
make update
1 parent f50532d commit 856177b

24 files changed

Lines changed: 380 additions & 338 deletions

File tree

‎openapi/generated_openapi/zz_generated.openapi.go‎

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎openapi/openapi.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33973,15 +33973,15 @@
3397333973
"type": "object",
3397433974
"properties": {
3397533975
"healthReports": {
33976-
"description": "healthReports contains all KMS plugin health reports. When omitted, no health reports are available. Each entry must have a unique combination of nodeName and keyId.",
33976+
"description": "healthReports contains all KMS plugin health reports. When omitted, no health reports are available. Each entry must have a unique combination of nodeName and keyID.",
3397733977
"type": "array",
3397833978
"items": {
3397933979
"default": {},
3398033980
"$ref": "#/definitions/com.github.openshift.api.operator.v1.KMSPluginHealthReport"
3398133981
},
3398233982
"x-kubernetes-list-map-keys": [
3398333983
"nodeName",
33984-
"keyId"
33984+
"keyID"
3398533985
],
3398633986
"x-kubernetes-list-type": "map"
3398733987
}
@@ -33991,30 +33991,30 @@
3399133991
"type": "object",
3399233992
"required": [
3399333993
"nodeName",
33994-
"keyId",
33994+
"keyID",
3399533995
"status",
3399633996
"lastCheckedTime",
33997-
"kekId"
33997+
"remoteKeyID"
3399833998
],
3399933999
"properties": {
3400034000
"detail": {
3400134001
"description": "detail contains additional error/health information for the respective KMS plugin. When omitted, no additional error or health information is provided. When set, the value must be between 1 and 1024 characters.",
3400234002
"type": "string"
3400334003
},
34004-
"kekId": {
34005-
"description": "kekId refers to the remote KEK id from KMS v2 StatusResponse.key_id. This is not a cryptographic key, but a unique representation of the KEK. The value must be between 1 and 1024 characters.",
34006-
"type": "string"
34007-
},
34008-
"keyId": {
34009-
"description": "keyId is the encryption-key-secret id (kms-{keyId}.sock), a unique identifier of the plugin on that node. This is not a cryptographic key used to encrypt/decrypt any resources. The value must be between 1 and 512 characters.",
34004+
"keyID": {
34005+
"description": "keyID is the encryption-key-secret id (kms-{keyID}.sock), a unique identifier of the plugin on that node. This is not a cryptographic key used to encrypt/decrypt any resources. The value must be between 1 and 512 characters.",
3401034006
"type": "string"
3401134007
},
3401234008
"lastCheckedTime": {
3401334009
"description": "lastCheckedTime is a timestamp of when the probe was last checked.",
3401434010
"$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time"
3401534011
},
3401634012
"nodeName": {
34017-
"description": "nodeName is the name of the node this instance of the plugin runs on. The combination of nodeName and keyId makes this health report unique. The value must be a valid Kubernetes node name: a lowercase RFC 1123 subdomain consisting of lowercase alphanumeric characters, '-' or '.', starting and ending with an alphanumeric character, and be at most 253 characters in length.",
34013+
"description": "nodeName is the name of the node this instance of the plugin runs on. The combination of nodeName and keyID makes this health report unique. The value must be a valid Kubernetes node name: a lowercase RFC 1123 subdomain consisting of lowercase alphanumeric characters, '-' or '.', starting and ending with an alphanumeric character, and be at most 253 characters in length.",
34014+
"type": "string"
34015+
},
34016+
"remoteKeyID": {
34017+
"description": "remoteKeyID refers to the remote key identifier from KMS v2 StatusResponse.key_id. This is not a cryptographic key, but a unique representation of the KEK. The value must be between 1 and 1024 characters.",
3401834018
"type": "string"
3401934019
},
3402034020
"status": {

‎operator/v1/zz_generated.crd-manifests/0000_20_kube-apiserver_01_kubeapiservers-CustomNoUpgrade.crd.yaml‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ spec:
182182
description: |-
183183
healthReports contains all KMS plugin health reports.
184184
When omitted, no health reports are available.
185-
Each entry must have a unique combination of nodeName and keyId.
185+
Each entry must have a unique combination of nodeName and keyID.
186186
items:
187187
properties:
188188
detail:
@@ -193,17 +193,9 @@ spec:
193193
maxLength: 1024
194194
minLength: 1
195195
type: string
196-
kekId:
196+
keyID:
197197
description: |-
198-
kekId refers to the remote KEK id from KMS v2 StatusResponse.key_id.
199-
This is not a cryptographic key, but a unique representation of the KEK.
200-
The value must be between 1 and 1024 characters.
201-
maxLength: 1024
202-
minLength: 1
203-
type: string
204-
keyId:
205-
description: |-
206-
keyId is the encryption-key-secret id (kms-{keyId}.sock), a unique identifier of the plugin on that node.
198+
keyID is the encryption-key-secret id (kms-{keyID}.sock), a unique identifier of the plugin on that node.
207199
This is not a cryptographic key used to encrypt/decrypt any resources.
208200
The value must be between 1 and 512 characters.
209201
maxLength: 512
@@ -217,7 +209,7 @@ spec:
217209
nodeName:
218210
description: |-
219211
nodeName is the name of the node this instance of the plugin runs on.
220-
The combination of nodeName and keyId makes this health report unique.
212+
The combination of nodeName and keyID makes this health report unique.
221213
The value must be a valid Kubernetes node name: a lowercase RFC 1123 subdomain
222214
consisting of lowercase alphanumeric characters, '-' or '.', starting and ending with
223215
an alphanumeric character, and be at most 253 characters in length.
@@ -230,6 +222,14 @@ spec:
230222
or '.', and must start and end with an alphanumeric
231223
character
232224
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
225+
remoteKeyID:
226+
description: |-
227+
remoteKeyID refers to the remote key identifier from KMS v2 StatusResponse.key_id.
228+
This is not a cryptographic key, but a unique representation of the KEK.
229+
The value must be between 1 and 1024 characters.
230+
maxLength: 1024
231+
minLength: 1
232+
type: string
233233
status:
234234
description: |-
235235
status contains a health indicator for the respective KMS plugin
@@ -239,20 +239,22 @@ spec:
239239
- Healthy
240240
- Unhealthy
241241
- Error
242+
maxLength: 512
243+
minLength: 1
242244
type: string
243245
required:
244-
- kekId
245-
- keyId
246+
- keyID
246247
- lastCheckedTime
247248
- nodeName
249+
- remoteKeyID
248250
- status
249251
type: object
250252
maxItems: 200
251253
minItems: 1
252254
type: array
253255
x-kubernetes-list-map-keys:
254256
- nodeName
255-
- keyId
257+
- keyID
256258
x-kubernetes-list-type: map
257259
type: object
258260
generations:

‎operator/v1/zz_generated.crd-manifests/0000_20_kube-apiserver_01_kubeapiservers-DevPreviewNoUpgrade.crd.yaml‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ spec:
182182
description: |-
183183
healthReports contains all KMS plugin health reports.
184184
When omitted, no health reports are available.
185-
Each entry must have a unique combination of nodeName and keyId.
185+
Each entry must have a unique combination of nodeName and keyID.
186186
items:
187187
properties:
188188
detail:
@@ -193,17 +193,9 @@ spec:
193193
maxLength: 1024
194194
minLength: 1
195195
type: string
196-
kekId:
196+
keyID:
197197
description: |-
198-
kekId refers to the remote KEK id from KMS v2 StatusResponse.key_id.
199-
This is not a cryptographic key, but a unique representation of the KEK.
200-
The value must be between 1 and 1024 characters.
201-
maxLength: 1024
202-
minLength: 1
203-
type: string
204-
keyId:
205-
description: |-
206-
keyId is the encryption-key-secret id (kms-{keyId}.sock), a unique identifier of the plugin on that node.
198+
keyID is the encryption-key-secret id (kms-{keyID}.sock), a unique identifier of the plugin on that node.
207199
This is not a cryptographic key used to encrypt/decrypt any resources.
208200
The value must be between 1 and 512 characters.
209201
maxLength: 512
@@ -217,7 +209,7 @@ spec:
217209
nodeName:
218210
description: |-
219211
nodeName is the name of the node this instance of the plugin runs on.
220-
The combination of nodeName and keyId makes this health report unique.
212+
The combination of nodeName and keyID makes this health report unique.
221213
The value must be a valid Kubernetes node name: a lowercase RFC 1123 subdomain
222214
consisting of lowercase alphanumeric characters, '-' or '.', starting and ending with
223215
an alphanumeric character, and be at most 253 characters in length.
@@ -230,6 +222,14 @@ spec:
230222
or '.', and must start and end with an alphanumeric
231223
character
232224
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
225+
remoteKeyID:
226+
description: |-
227+
remoteKeyID refers to the remote key identifier from KMS v2 StatusResponse.key_id.
228+
This is not a cryptographic key, but a unique representation of the KEK.
229+
The value must be between 1 and 1024 characters.
230+
maxLength: 1024
231+
minLength: 1
232+
type: string
233233
status:
234234
description: |-
235235
status contains a health indicator for the respective KMS plugin
@@ -239,20 +239,22 @@ spec:
239239
- Healthy
240240
- Unhealthy
241241
- Error
242+
maxLength: 512
243+
minLength: 1
242244
type: string
243245
required:
244-
- kekId
245-
- keyId
246+
- keyID
246247
- lastCheckedTime
247248
- nodeName
249+
- remoteKeyID
248250
- status
249251
type: object
250252
maxItems: 200
251253
minItems: 1
252254
type: array
253255
x-kubernetes-list-map-keys:
254256
- nodeName
255-
- keyId
257+
- keyID
256258
x-kubernetes-list-type: map
257259
type: object
258260
generations:

‎operator/v1/zz_generated.crd-manifests/0000_20_kube-apiserver_01_kubeapiservers-TechPreviewNoUpgrade.crd.yaml‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ spec:
182182
description: |-
183183
healthReports contains all KMS plugin health reports.
184184
When omitted, no health reports are available.
185-
Each entry must have a unique combination of nodeName and keyId.
185+
Each entry must have a unique combination of nodeName and keyID.
186186
items:
187187
properties:
188188
detail:
@@ -193,17 +193,9 @@ spec:
193193
maxLength: 1024
194194
minLength: 1
195195
type: string
196-
kekId:
196+
keyID:
197197
description: |-
198-
kekId refers to the remote KEK id from KMS v2 StatusResponse.key_id.
199-
This is not a cryptographic key, but a unique representation of the KEK.
200-
The value must be between 1 and 1024 characters.
201-
maxLength: 1024
202-
minLength: 1
203-
type: string
204-
keyId:
205-
description: |-
206-
keyId is the encryption-key-secret id (kms-{keyId}.sock), a unique identifier of the plugin on that node.
198+
keyID is the encryption-key-secret id (kms-{keyID}.sock), a unique identifier of the plugin on that node.
207199
This is not a cryptographic key used to encrypt/decrypt any resources.
208200
The value must be between 1 and 512 characters.
209201
maxLength: 512
@@ -217,7 +209,7 @@ spec:
217209
nodeName:
218210
description: |-
219211
nodeName is the name of the node this instance of the plugin runs on.
220-
The combination of nodeName and keyId makes this health report unique.
212+
The combination of nodeName and keyID makes this health report unique.
221213
The value must be a valid Kubernetes node name: a lowercase RFC 1123 subdomain
222214
consisting of lowercase alphanumeric characters, '-' or '.', starting and ending with
223215
an alphanumeric character, and be at most 253 characters in length.
@@ -230,6 +222,14 @@ spec:
230222
or '.', and must start and end with an alphanumeric
231223
character
232224
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
225+
remoteKeyID:
226+
description: |-
227+
remoteKeyID refers to the remote key identifier from KMS v2 StatusResponse.key_id.
228+
This is not a cryptographic key, but a unique representation of the KEK.
229+
The value must be between 1 and 1024 characters.
230+
maxLength: 1024
231+
minLength: 1
232+
type: string
233233
status:
234234
description: |-
235235
status contains a health indicator for the respective KMS plugin
@@ -239,20 +239,22 @@ spec:
239239
- Healthy
240240
- Unhealthy
241241
- Error
242+
maxLength: 512
243+
minLength: 1
242244
type: string
243245
required:
244-
- kekId
245-
- keyId
246+
- keyID
246247
- lastCheckedTime
247248
- nodeName
249+
- remoteKeyID
248250
- status
249251
type: object
250252
maxItems: 200
251253
minItems: 1
252254
type: array
253255
x-kubernetes-list-map-keys:
254256
- nodeName
255-
- keyId
257+
- keyID
256258
x-kubernetes-list-type: map
257259
type: object
258260
generations:

0 commit comments

Comments
 (0)