Skip to content

Commit 6cc8ec8

Browse files
committed
Update codegen crds
1 parent 6e77866 commit 6cc8ec8

10 files changed

+105
-28
lines changed

config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_apiservers-CustomNoUpgrade.crd.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -259,22 +259,19 @@ spec:
259259
description: |-
260260
customDeployment contains configuration options when mode is CustomDeployment.
261261
This field is only valid when mode is CustomDeployment.
262-
minProperties: 1
263262
properties:
264263
internalPort:
265264
description: |-
266265
internalPort specifies the internal port used by the proxy service.
267266
Valid values are 1024-65535.
268-
This port must be specified to avoid conflicts with other workloads on the host.
267+
When not specified for CustomDeployment mode, users should ensure their chosen port
268+
does not conflict with other workloads on the host.
269269
format: int32
270270
maximum: 65535
271271
minimum: 1024
272272
type: integer
273-
required:
274-
- internalPort
275273
type: object
276274
mode:
277-
default: DefaultDeployment
278275
description: |-
279276
mode controls whether the HTTP01 challenge proxy is active and how it should be deployed.
280277
DefaultDeployment enables the proxy with default configuration.
@@ -283,6 +280,8 @@ spec:
283280
- DefaultDeployment
284281
- CustomDeployment
285282
type: string
283+
required:
284+
- mode
286285
type: object
287286
x-kubernetes-validations:
288287
- message: customDeployment is required when mode is CustomDeployment

config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_apiservers-DevPreviewNoUpgrade.crd.yaml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,45 @@ spec:
249249
forbidden otherwise
250250
rule: 'has(self.type) && self.type == ''KMS'' ? has(self.kms) :
251251
!has(self.kms)'
252+
http01ChallengeProxy:
253+
description: |-
254+
http01ChallengeProxy contains configuration for the HTTP01 challenge proxy
255+
that redirects traffic from the API endpoint on port 80 to ingress routers.
256+
This enables cert-manager to perform HTTP01 ACME challenges for API endpoint certificates.
257+
properties:
258+
customDeployment:
259+
description: |-
260+
customDeployment contains configuration options when mode is CustomDeployment.
261+
This field is only valid when mode is CustomDeployment.
262+
properties:
263+
internalPort:
264+
description: |-
265+
internalPort specifies the internal port used by the proxy service.
266+
Valid values are 1024-65535.
267+
When not specified for CustomDeployment mode, users should ensure their chosen port
268+
does not conflict with other workloads on the host.
269+
format: int32
270+
maximum: 65535
271+
minimum: 1024
272+
type: integer
273+
type: object
274+
mode:
275+
description: |-
276+
mode controls whether the HTTP01 challenge proxy is active and how it should be deployed.
277+
DefaultDeployment enables the proxy with default configuration.
278+
CustomDeployment enables the proxy with user-specified configuration.
279+
enum:
280+
- DefaultDeployment
281+
- CustomDeployment
282+
type: string
283+
required:
284+
- mode
285+
type: object
286+
x-kubernetes-validations:
287+
- message: customDeployment is required when mode is CustomDeployment
288+
and forbidden otherwise
289+
rule: 'self.mode == ''CustomDeployment'' ? has(self.customDeployment)
290+
: !has(self.customDeployment)'
252291
servingCerts:
253292
description: |-
254293
servingCert is the TLS cert info for serving secure traffic. If not specified, operator managed certificates

config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_apiservers-TechPreviewNoUpgrade.crd.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -259,22 +259,19 @@ spec:
259259
description: |-
260260
customDeployment contains configuration options when mode is CustomDeployment.
261261
This field is only valid when mode is CustomDeployment.
262-
minProperties: 1
263262
properties:
264263
internalPort:
265264
description: |-
266265
internalPort specifies the internal port used by the proxy service.
267266
Valid values are 1024-65535.
268-
This port must be specified to avoid conflicts with other workloads on the host.
267+
When not specified for CustomDeployment mode, users should ensure their chosen port
268+
does not conflict with other workloads on the host.
269269
format: int32
270270
maximum: 65535
271271
minimum: 1024
272272
type: integer
273-
required:
274-
- internalPort
275273
type: object
276274
mode:
277-
default: DefaultDeployment
278275
description: |-
279276
mode controls whether the HTTP01 challenge proxy is active and how it should be deployed.
280277
DefaultDeployment enables the proxy with default configuration.
@@ -283,6 +280,8 @@ spec:
283280
- DefaultDeployment
284281
- CustomDeployment
285282
type: string
283+
required:
284+
- mode
286285
type: object
287286
x-kubernetes-validations:
288287
- message: customDeployment is required when mode is CustomDeployment

config/v1/zz_generated.featuregated-crd-manifests/apiservers.config.openshift.io/HTTP01ChallengeProxy.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -185,22 +185,19 @@ spec:
185185
description: |-
186186
customDeployment contains configuration options when mode is CustomDeployment.
187187
This field is only valid when mode is CustomDeployment.
188-
minProperties: 1
189188
properties:
190189
internalPort:
191190
description: |-
192191
internalPort specifies the internal port used by the proxy service.
193192
Valid values are 1024-65535.
194-
This port must be specified to avoid conflicts with other workloads on the host.
193+
When not specified for CustomDeployment mode, users should ensure their chosen port
194+
does not conflict with other workloads on the host.
195195
format: int32
196196
maximum: 65535
197197
minimum: 1024
198198
type: integer
199-
required:
200-
- internalPort
201199
type: object
202200
mode:
203-
default: DefaultDeployment
204201
description: |-
205202
mode controls whether the HTTP01 challenge proxy is active and how it should be deployed.
206203
DefaultDeployment enables the proxy with default configuration.
@@ -209,6 +206,8 @@ spec:
209206
- DefaultDeployment
210207
- CustomDeployment
211208
type: string
209+
required:
210+
- mode
212211
type: object
213212
x-kubernetes-validations:
214213
- message: customDeployment is required when mode is CustomDeployment

config/v1/zz_generated.swagger_doc_generated.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

openapi/generated_openapi/zz_generated.openapi.go

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

openapi/openapi.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4133,6 +4133,7 @@
41334133
},
41344134
"http01ChallengeProxy": {
41354135
"description": "http01ChallengeProxy contains configuration for the HTTP01 challenge proxy that redirects traffic from the API endpoint on port 80 to ingress routers. This enables cert-manager to perform HTTP01 ACME challenges for API endpoint certificates.",
4136+
"default": {},
41364137
"$ref": "#/definitions/com.github.openshift.api.config.v1.HTTP01ChallengeProxySpec"
41374138
},
41384139
"servingCerts": {
@@ -6903,10 +6904,12 @@
69036904
},
69046905
"com.github.openshift.api.config.v1.HTTP01ChallengeProxySpec": {
69056906
"type": "object",
6907+
"required": [
6908+
"mode"
6909+
],
69066910
"properties": {
69076911
"customDeployment": {
69086912
"description": "customDeployment contains configuration options when mode is CustomDeployment. This field is only valid when mode is CustomDeployment.",
6909-
"default": {},
69106913
"$ref": "#/definitions/com.github.openshift.api.config.v1.HTTP01ChallengeProxyCustomDeploymentSpec"
69116914
},
69126915
"mode": {

payload-manifests/crds/0000_10_config-operator_01_apiservers-CustomNoUpgrade.crd.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -259,22 +259,19 @@ spec:
259259
description: |-
260260
customDeployment contains configuration options when mode is CustomDeployment.
261261
This field is only valid when mode is CustomDeployment.
262-
minProperties: 1
263262
properties:
264263
internalPort:
265264
description: |-
266265
internalPort specifies the internal port used by the proxy service.
267266
Valid values are 1024-65535.
268-
This port must be specified to avoid conflicts with other workloads on the host.
267+
When not specified for CustomDeployment mode, users should ensure their chosen port
268+
does not conflict with other workloads on the host.
269269
format: int32
270270
maximum: 65535
271271
minimum: 1024
272272
type: integer
273-
required:
274-
- internalPort
275273
type: object
276274
mode:
277-
default: DefaultDeployment
278275
description: |-
279276
mode controls whether the HTTP01 challenge proxy is active and how it should be deployed.
280277
DefaultDeployment enables the proxy with default configuration.
@@ -283,6 +280,8 @@ spec:
283280
- DefaultDeployment
284281
- CustomDeployment
285282
type: string
283+
required:
284+
- mode
286285
type: object
287286
x-kubernetes-validations:
288287
- message: customDeployment is required when mode is CustomDeployment

payload-manifests/crds/0000_10_config-operator_01_apiservers-DevPreviewNoUpgrade.crd.yaml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,45 @@ spec:
249249
forbidden otherwise
250250
rule: 'has(self.type) && self.type == ''KMS'' ? has(self.kms) :
251251
!has(self.kms)'
252+
http01ChallengeProxy:
253+
description: |-
254+
http01ChallengeProxy contains configuration for the HTTP01 challenge proxy
255+
that redirects traffic from the API endpoint on port 80 to ingress routers.
256+
This enables cert-manager to perform HTTP01 ACME challenges for API endpoint certificates.
257+
properties:
258+
customDeployment:
259+
description: |-
260+
customDeployment contains configuration options when mode is CustomDeployment.
261+
This field is only valid when mode is CustomDeployment.
262+
properties:
263+
internalPort:
264+
description: |-
265+
internalPort specifies the internal port used by the proxy service.
266+
Valid values are 1024-65535.
267+
When not specified for CustomDeployment mode, users should ensure their chosen port
268+
does not conflict with other workloads on the host.
269+
format: int32
270+
maximum: 65535
271+
minimum: 1024
272+
type: integer
273+
type: object
274+
mode:
275+
description: |-
276+
mode controls whether the HTTP01 challenge proxy is active and how it should be deployed.
277+
DefaultDeployment enables the proxy with default configuration.
278+
CustomDeployment enables the proxy with user-specified configuration.
279+
enum:
280+
- DefaultDeployment
281+
- CustomDeployment
282+
type: string
283+
required:
284+
- mode
285+
type: object
286+
x-kubernetes-validations:
287+
- message: customDeployment is required when mode is CustomDeployment
288+
and forbidden otherwise
289+
rule: 'self.mode == ''CustomDeployment'' ? has(self.customDeployment)
290+
: !has(self.customDeployment)'
252291
servingCerts:
253292
description: |-
254293
servingCert is the TLS cert info for serving secure traffic. If not specified, operator managed certificates

payload-manifests/crds/0000_10_config-operator_01_apiservers-TechPreviewNoUpgrade.crd.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -259,22 +259,19 @@ spec:
259259
description: |-
260260
customDeployment contains configuration options when mode is CustomDeployment.
261261
This field is only valid when mode is CustomDeployment.
262-
minProperties: 1
263262
properties:
264263
internalPort:
265264
description: |-
266265
internalPort specifies the internal port used by the proxy service.
267266
Valid values are 1024-65535.
268-
This port must be specified to avoid conflicts with other workloads on the host.
267+
When not specified for CustomDeployment mode, users should ensure their chosen port
268+
does not conflict with other workloads on the host.
269269
format: int32
270270
maximum: 65535
271271
minimum: 1024
272272
type: integer
273-
required:
274-
- internalPort
275273
type: object
276274
mode:
277-
default: DefaultDeployment
278275
description: |-
279276
mode controls whether the HTTP01 challenge proxy is active and how it should be deployed.
280277
DefaultDeployment enables the proxy with default configuration.
@@ -283,6 +280,8 @@ spec:
283280
- DefaultDeployment
284281
- CustomDeployment
285282
type: string
283+
required:
284+
- mode
286285
type: object
287286
x-kubernetes-validations:
288287
- message: customDeployment is required when mode is CustomDeployment

0 commit comments

Comments
 (0)