Skip to content

Commit

Permalink
make update
Browse files Browse the repository at this point in the history
  • Loading branch information
@jkyros
jkyros committed Aug 9, 2023
1 parent 1a69a37 commit d84d670
Show file tree
Hide file tree
Showing 10 changed files with 1,868 additions and 34 deletions.
2 changes: 2 additions & 0 deletions machineconfiguration/v1/0000_80_containerruntimeconfig.crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ spec:
spec:
description: ContainerRuntimeConfigSpec defines the desired state of ContainerRuntimeConfig
type: object
required:
- containerRuntimeConfig
properties:
containerRuntimeConfig:
description: ContainerRuntimeConfiguration defines the tuneables of the container runtime
Expand Down
126 changes: 125 additions & 1 deletion machineconfiguration/v1/0000_80_controllerconfig.crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,47 @@ spec:
baseDomain:
description: "baseDomain is the base domain of the cluster. All managed DNS records will be sub-domains of this base. \n For example, given the base domain `openshift.example.com`, an API server DNS record may be created for `cluster-api.openshift.example.com`. \n Once set, this field cannot be changed."
type: string
platform:
description: platform holds configuration specific to the underlying infrastructure provider for DNS. When omitted, this means the user has no opinion and the platform is left to choose reasonable defaults. These defaults are subject to change over time.
type: object
required:
- type
properties:
aws:
description: aws contains DNS configuration specific to the Amazon Web Services cloud provider.
type: object
properties:
privateZoneIAMRole:
description: privateZoneIAMRole contains the ARN of an IAM role that should be assumed when performing operations on the cluster's private hosted zone specified in the cluster DNS config. When left empty, no role should be assumed.
type: string
pattern: ^arn:(aws|aws-cn|aws-us-gov):iam::[0-9]{12}:role\/.*$
type:
description: "type is the underlying infrastructure provider for the cluster. Allowed values: \"\", \"AWS\". \n Individual components may not support all platforms, and must handle unrecognized platforms with best-effort defaults."
type: string
enum:
- ""
- AWS
- Azure
- BareMetal
- GCP
- Libvirt
- OpenStack
- None
- VSphere
- oVirt
- IBMCloud
- KubeVirt
- EquinixMetal
- PowerVS
- AlibabaCloud
- Nutanix
- External
x-kubernetes-validations:
- rule: self in ['','AWS']
message: allowed values are '' and 'AWS'
x-kubernetes-validations:
- rule: 'has(self.type) && self.type == ''AWS'' ? has(self.aws) : !has(self.aws)'
message: aws configuration is required when platform is AWS, and forbidden otherwise
privateZone:
description: "privateZone is the location where all the DNS records that are only available internally to the cluster exist. \n If this field is nil, no private records should be created. \n Once set, this field cannot be changed."
type: object
Expand Down Expand Up @@ -138,13 +179,47 @@ spec:
etcdDiscoveryDomain:
description: etcdDiscoveryDomain is deprecated, use Infra.Status.EtcdDiscoveryDomain instead
type: string
imageRegistryBundleData:
description: imageRegistryBundleData is the ImageRegistryData
type: array
items:
description: ImageRegustryBundle contains information for writing image registry certificates
type: object
required:
- data
- file
properties:
data:
description: data holds the contents of the bundle that will be written to the file location
type: string
format: byte
file:
description: file holds the name of the file where the bundle will be written to disk
type: string
imageRegistryBundleUserData:
description: imageRegistryBundleUserData is Image Registry Data provided by the user
type: array
items:
description: ImageRegustryBundle contains information for writing image registry certificates
type: object
required:
- data
- file
properties:
data:
description: data holds the contents of the bundle that will be written to the file location
type: string
format: byte
file:
description: file holds the name of the file where the bundle will be written to disk
type: string
images:
description: images is map of images that are used by the controller to render templates under ./templates/
type: object
additionalProperties:
type: string
infra:
description: "Infrastructure holds cluster-wide information about Infrastructure. The canonical name is `cluster` \n Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer)."
description: infra holds the infrastructure details
type: object
required:
- spec
Expand Down Expand Up @@ -711,6 +786,27 @@ spec:
external:
description: External contains settings specific to the generic External infrastructure provider.
type: object
properties:
cloudControllerManager:
description: cloudControllerManager contains settings specific to the external Cloud Controller Manager (a.k.a. CCM or CPI). When omitted, new nodes will be not tainted and no extra initialization from the cloud controller manager is expected.
type: object
properties:
state:
description: "state determines whether or not an external Cloud Controller Manager is expected to be installed within the cluster. https://kubernetes.io/docs/tasks/administer-cluster/running-cloud-controller/#running-cloud-controller-manager \n Valid values are \"External\", \"None\" and omitted. When set to \"External\", new nodes will be tainted as uninitialized when created, preventing them from running workloads until they are initialized by the cloud controller manager. When omitted or set to \"None\", new nodes will be not tainted and no extra initialization from the cloud controller manager is expected."
type: string
enum:
- ""
- External
- None
x-kubernetes-validations:
- rule: self == oldSelf
message: state is immutable once set
x-kubernetes-validations:
- rule: (has(self.state) == has(oldSelf.state)) || (!has(oldSelf.state) && self.state != "External")
message: state may not be added or removed once set
x-kubernetes-validations:
- rule: has(self.cloudControllerManager) == has(oldSelf.cloudControllerManager)
message: cloudControllerManager may not be added or removed once set
gcp:
description: GCP contains settings specific to the Google Cloud Platform infrastructure provider.
type: object
Expand Down Expand Up @@ -1078,6 +1174,34 @@ spec:
type:
description: type specifies the state of the operator's reconciliation functionality.
type: string
controllerCertificates:
description: controllerCertificates represents the latest available observations of the automatically rotating certificates in the MCO.
type: array
items:
description: ControllerCertificate contains info about a specific cert.
type: object
required:
- bundleFile
- notAfter
- notBefore
- signer
- subject
properties:
bundleFile:
description: bundleFile is the larger bundle a cert comes from
type: string
notAfter:
description: notAfter is the upper boundary for validity
type: string
notBefore:
description: notBefore is the lower boundary for validity
type: string
signer:
description: signer is the cert Issuer
type: string
subject:
description: subject is the cert subject
type: string
observedGeneration:
description: observedGeneration represents the generation observed by the controller.
type: integer
Expand Down
20 changes: 20 additions & 0 deletions machineconfiguration/v1/0000_80_machineconfigpool.crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,26 @@ spec:
description: MachineConfigPoolStatus is the status for MachineConfigPool resource.
type: object
properties:
certExpirys:
description: certExpirys keeps track of important certificate expiration data
type: array
items:
description: ceryExpiry contains the bundle name and the expiry date
type: object
required:
- bundle
- expiry
- subject
properties:
bundle:
description: bundle is the name of the bundle in which the subject certificate resides
type: string
expiry:
description: expiry is the date after which the certificate will no longer be valid
type: string
subject:
description: subject is the subject of the certificate
type: string
conditions:
description: conditions represents the latest available observations of current state.
type: array
Expand Down
Loading

0 comments on commit d84d670

Please sign in to comment.