Skip to content

Commit e8154b1

Browse files
committed
ran make update
1 parent 75f8fdb commit e8154b1

File tree

36 files changed

+23395
-105
lines changed

36 files changed

+23395
-105
lines changed

config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-OKD.crd.yaml

Lines changed: 755 additions & 0 deletions
Large diffs are not rendered by default.

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

Lines changed: 438 additions & 0 deletions
Large diffs are not rendered by default.

config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_authentications-Hypershift-OKD.crd.yaml

Lines changed: 719 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 187 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,187 @@
1+
apiVersion: apiextensions.k8s.io/v1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
annotations:
5+
api-approved.openshift.io: https://github.com/openshift/api/pull/470
6+
api.openshift.io/merged-by-featuregates: "true"
7+
include.release.openshift.io/self-managed-high-availability: "true"
8+
release.openshift.io/bootstrap-required: "true"
9+
release.openshift.io/feature-set: OKD
10+
name: authentications.config.openshift.io
11+
spec:
12+
group: config.openshift.io
13+
names:
14+
kind: Authentication
15+
listKind: AuthenticationList
16+
plural: authentications
17+
singular: authentication
18+
scope: Cluster
19+
versions:
20+
- name: v1
21+
schema:
22+
openAPIV3Schema:
23+
description: |-
24+
Authentication specifies cluster-wide settings for authentication (like OAuth and
25+
webhook token authenticators). The canonical name of an instance is `cluster`.
26+
27+
Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).
28+
properties:
29+
apiVersion:
30+
description: |-
31+
APIVersion defines the versioned schema of this representation of an object.
32+
Servers should convert recognized schemas to the latest internal value, and
33+
may reject unrecognized values.
34+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
35+
type: string
36+
kind:
37+
description: |-
38+
Kind is a string value representing the REST resource this object represents.
39+
Servers may infer this from the endpoint the client submits requests to.
40+
Cannot be updated.
41+
In CamelCase.
42+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
43+
type: string
44+
metadata:
45+
type: object
46+
spec:
47+
description: spec holds user settable values for configuration
48+
properties:
49+
oauthMetadata:
50+
description: |-
51+
oauthMetadata contains the discovery endpoint data for OAuth 2.0
52+
Authorization Server Metadata for an external OAuth server.
53+
This discovery document can be viewed from its served location:
54+
oc get --raw '/.well-known/oauth-authorization-server'
55+
For further details, see the IETF Draft:
56+
https://tools.ietf.org/html/draft-ietf-oauth-discovery-04#section-2
57+
If oauthMetadata.name is non-empty, this value has precedence
58+
over any metadata reference stored in status.
59+
The key "oauthMetadata" is used to locate the data.
60+
If specified and the config map or expected key is not found, no metadata is served.
61+
If the specified metadata is not valid, no metadata is served.
62+
The namespace for this config map is openshift-config.
63+
properties:
64+
name:
65+
description: name is the metadata.name of the referenced config
66+
map
67+
type: string
68+
required:
69+
- name
70+
type: object
71+
serviceAccountIssuer:
72+
description: |-
73+
serviceAccountIssuer is the identifier of the bound service account token
74+
issuer.
75+
The default is https://kubernetes.default.svc
76+
WARNING: Updating this field will not result in immediate invalidation of all bound tokens with the
77+
previous issuer value. Instead, the tokens issued by previous service account issuer will continue to
78+
be trusted for a time period chosen by the platform (currently set to 24h).
79+
This time period is subject to change over time.
80+
This allows internal components to transition to use new service account issuer without service distruption.
81+
type: string
82+
type:
83+
description: |-
84+
type identifies the cluster managed, user facing authentication mode in use.
85+
Specifically, it manages the component that responds to login attempts.
86+
The default is IntegratedOAuth.
87+
enum:
88+
- ""
89+
- None
90+
- IntegratedOAuth
91+
type: string
92+
webhookTokenAuthenticator:
93+
description: |-
94+
webhookTokenAuthenticator configures a remote token reviewer.
95+
These remote authentication webhooks can be used to verify bearer tokens
96+
via the tokenreviews.authentication.k8s.io REST API. This is required to
97+
honor bearer tokens that are provisioned by an external authentication service.
98+
99+
Can only be set if "Type" is set to "None".
100+
properties:
101+
kubeConfig:
102+
description: |-
103+
kubeConfig references a secret that contains kube config file data which
104+
describes how to access the remote webhook service.
105+
The namespace for the referenced secret is openshift-config.
106+
107+
For further details, see:
108+
109+
https://kubernetes.io/docs/reference/access-authn-authz/authentication/#webhook-token-authentication
110+
111+
The key "kubeConfig" is used to locate the data.
112+
If the secret or expected key is not found, the webhook is not honored.
113+
If the specified kube config data is not valid, the webhook is not honored.
114+
properties:
115+
name:
116+
description: name is the metadata.name of the referenced secret
117+
type: string
118+
required:
119+
- name
120+
type: object
121+
required:
122+
- kubeConfig
123+
type: object
124+
webhookTokenAuthenticators:
125+
description: webhookTokenAuthenticators is DEPRECATED, setting it
126+
has no effect.
127+
items:
128+
description: |-
129+
deprecatedWebhookTokenAuthenticator holds the necessary configuration options for a remote token authenticator.
130+
It's the same as WebhookTokenAuthenticator but it's missing the 'required' validation on KubeConfig field.
131+
properties:
132+
kubeConfig:
133+
description: |-
134+
kubeConfig contains kube config file data which describes how to access the remote webhook service.
135+
For further details, see:
136+
https://kubernetes.io/docs/reference/access-authn-authz/authentication/#webhook-token-authentication
137+
The key "kubeConfig" is used to locate the data.
138+
If the secret or expected key is not found, the webhook is not honored.
139+
If the specified kube config data is not valid, the webhook is not honored.
140+
The namespace for this secret is determined by the point of use.
141+
properties:
142+
name:
143+
description: name is the metadata.name of the referenced
144+
secret
145+
type: string
146+
required:
147+
- name
148+
type: object
149+
type: object
150+
type: array
151+
x-kubernetes-list-type: atomic
152+
type: object
153+
status:
154+
description: status holds observed values from the cluster. They may not
155+
be overridden.
156+
properties:
157+
integratedOAuthMetadata:
158+
description: |-
159+
integratedOAuthMetadata contains the discovery endpoint data for OAuth 2.0
160+
Authorization Server Metadata for the in-cluster integrated OAuth server.
161+
This discovery document can be viewed from its served location:
162+
oc get --raw '/.well-known/oauth-authorization-server'
163+
For further details, see the IETF Draft:
164+
https://tools.ietf.org/html/draft-ietf-oauth-discovery-04#section-2
165+
This contains the observed value based on cluster state.
166+
An explicitly set value in spec.oauthMetadata has precedence over this field.
167+
This field has no meaning if authentication spec.type is not set to IntegratedOAuth.
168+
The key "oauthMetadata" is used to locate the data.
169+
If the config map or expected key is not found, no metadata is served.
170+
If the specified metadata is not valid, no metadata is served.
171+
The namespace for this config map is openshift-config-managed.
172+
properties:
173+
name:
174+
description: name is the metadata.name of the referenced config
175+
map
176+
type: string
177+
required:
178+
- name
179+
type: object
180+
type: object
181+
required:
182+
- spec
183+
type: object
184+
served: true
185+
storage: true
186+
subresources:
187+
status: {}

config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_featuregates.crd.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ spec:
7979
- CustomNoUpgrade
8080
- DevPreviewNoUpgrade
8181
- TechPreviewNoUpgrade
82+
- OKD
8283
- ""
8384
type: string
8485
x-kubernetes-validations:
@@ -91,6 +92,8 @@ spec:
9192
- message: DevPreviewNoUpgrade may not be changed
9293
rule: 'oldSelf == ''DevPreviewNoUpgrade'' ? self == ''DevPreviewNoUpgrade''
9394
: true'
95+
- message: OKD may not be changed
96+
rule: 'oldSelf == ''OKD'' ? self == ''OKD'' : true'
9497
type: object
9598
x-kubernetes-validations:
9699
- message: .spec.featureSet cannot be removed
Lines changed: 183 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,183 @@
1+
apiVersion: apiextensions.k8s.io/v1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
annotations:
5+
api-approved.openshift.io: https://github.com/openshift/api/pull/470
6+
api.openshift.io/merged-by-featuregates: "true"
7+
include.release.openshift.io/ibm-cloud-managed: "true"
8+
include.release.openshift.io/self-managed-high-availability: "true"
9+
release.openshift.io/bootstrap-required: "true"
10+
release.openshift.io/feature-set: OKD
11+
name: images.config.openshift.io
12+
spec:
13+
group: config.openshift.io
14+
names:
15+
kind: Image
16+
listKind: ImageList
17+
plural: images
18+
singular: image
19+
scope: Cluster
20+
versions:
21+
- name: v1
22+
schema:
23+
openAPIV3Schema:
24+
description: |-
25+
Image governs policies related to imagestream imports and runtime configuration
26+
for external registries. It allows cluster admins to configure which registries
27+
OpenShift is allowed to import images from, extra CA trust bundles for external
28+
registries, and policies to block or allow registry hostnames.
29+
When exposing OpenShift's image registry to the public, this also lets cluster
30+
admins specify the external hostname.
31+
32+
Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).
33+
properties:
34+
apiVersion:
35+
description: |-
36+
APIVersion defines the versioned schema of this representation of an object.
37+
Servers should convert recognized schemas to the latest internal value, and
38+
may reject unrecognized values.
39+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
40+
type: string
41+
kind:
42+
description: |-
43+
Kind is a string value representing the REST resource this object represents.
44+
Servers may infer this from the endpoint the client submits requests to.
45+
Cannot be updated.
46+
In CamelCase.
47+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
48+
type: string
49+
metadata:
50+
type: object
51+
spec:
52+
description: spec holds user settable values for configuration
53+
properties:
54+
additionalTrustedCA:
55+
description: |-
56+
additionalTrustedCA is a reference to a ConfigMap containing additional CAs that
57+
should be trusted during imagestream import, pod image pull, build image pull, and
58+
imageregistry pullthrough.
59+
The namespace for this config map is openshift-config.
60+
properties:
61+
name:
62+
description: name is the metadata.name of the referenced config
63+
map
64+
type: string
65+
required:
66+
- name
67+
type: object
68+
allowedRegistriesForImport:
69+
description: |-
70+
allowedRegistriesForImport limits the container image registries that normal users may import
71+
images from. Set this list to the registries that you trust to contain valid Docker
72+
images and that you want applications to be able to import from. Users with
73+
permission to create Images or ImageStreamMappings via the API are not affected by
74+
this policy - typically only administrators or system integrations will have those
75+
permissions.
76+
items:
77+
description: |-
78+
RegistryLocation contains a location of the registry specified by the registry domain
79+
name. The domain name might include wildcards, like '*' or '??'.
80+
properties:
81+
domainName:
82+
description: |-
83+
domainName specifies a domain name for the registry
84+
In case the registry use non-standard (80 or 443) port, the port should be included
85+
in the domain name as well.
86+
type: string
87+
insecure:
88+
description: |-
89+
insecure indicates whether the registry is secure (https) or insecure (http)
90+
By default (if not specified) the registry is assumed as secure.
91+
type: boolean
92+
type: object
93+
type: array
94+
x-kubernetes-list-type: atomic
95+
externalRegistryHostnames:
96+
description: |-
97+
externalRegistryHostnames provides the hostnames for the default external image
98+
registry. The external hostname should be set only when the image registry
99+
is exposed externally. The first value is used in 'publicDockerImageRepository'
100+
field in ImageStreams. The value must be in "hostname[:port]" format.
101+
items:
102+
type: string
103+
type: array
104+
x-kubernetes-list-type: atomic
105+
registrySources:
106+
description: |-
107+
registrySources contains configuration that determines how the container runtime
108+
should treat individual registries when accessing images for builds+pods. (e.g.
109+
whether or not to allow insecure access). It does not contain configuration for the
110+
internal cluster registry.
111+
properties:
112+
allowedRegistries:
113+
description: |-
114+
allowedRegistries are the only registries permitted for image pull and push actions. All other registries are denied.
115+
116+
Only one of BlockedRegistries or AllowedRegistries may be set.
117+
items:
118+
type: string
119+
type: array
120+
x-kubernetes-list-type: atomic
121+
blockedRegistries:
122+
description: |-
123+
blockedRegistries cannot be used for image pull and push actions. All other registries are permitted.
124+
125+
Only one of BlockedRegistries or AllowedRegistries may be set.
126+
items:
127+
type: string
128+
type: array
129+
x-kubernetes-list-type: atomic
130+
containerRuntimeSearchRegistries:
131+
description: |-
132+
containerRuntimeSearchRegistries are registries that will be searched when pulling images that do not have fully qualified
133+
domains in their pull specs. Registries will be searched in the order provided in the list.
134+
Note: this search list only works with the container runtime, i.e CRI-O. Will NOT work with builds or imagestream imports.
135+
format: hostname
136+
items:
137+
type: string
138+
minItems: 1
139+
type: array
140+
x-kubernetes-list-type: set
141+
insecureRegistries:
142+
description: insecureRegistries are registries which do not have
143+
a valid TLS certificates or only support HTTP connections.
144+
items:
145+
type: string
146+
type: array
147+
x-kubernetes-list-type: atomic
148+
type: object
149+
x-kubernetes-validations:
150+
- message: Only one of blockedRegistries or allowedRegistries may
151+
be set
152+
rule: 'has(self.blockedRegistries) ? !has(self.allowedRegistries)
153+
: true'
154+
type: object
155+
status:
156+
description: status holds observed values from the cluster. They may not
157+
be overridden.
158+
properties:
159+
externalRegistryHostnames:
160+
description: |-
161+
externalRegistryHostnames provides the hostnames for the default external image
162+
registry. The external hostname should be set only when the image registry
163+
is exposed externally. The first value is used in 'publicDockerImageRepository'
164+
field in ImageStreams. The value must be in "hostname[:port]" format.
165+
items:
166+
type: string
167+
type: array
168+
x-kubernetes-list-type: atomic
169+
internalRegistryHostname:
170+
description: |-
171+
internalRegistryHostname sets the hostname for the default internal image
172+
registry. The value must be in "hostname[:port]" format.
173+
This value is set by the image registry operator which controls the internal registry
174+
hostname.
175+
type: string
176+
type: object
177+
required:
178+
- spec
179+
type: object
180+
served: true
181+
storage: true
182+
subresources:
183+
status: {}

0 commit comments

Comments
 (0)