WIP: Add machineconfiguration API group #620
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| reviewers: | ||
| - ashcrow | ||
| - cgwalters | ||
| - ericavonb | ||
| - kikisdeliveryservice | ||
| - runcom | ||
| - sinnykumari | ||
| - yuqi-zhang |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| package machineconfiguration | ||
|
|
||
| import ( | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
| "k8s.io/apimachinery/pkg/runtime/schema" | ||
|
|
||
| machineconfigurationv1 "github.com/openshift/api/machineconfiguration/v1" | ||
| ) | ||
|
|
||
| const ( | ||
| GroupName = "machineconfiguration.openshift.io" | ||
| ) | ||
|
|
||
| var ( | ||
| SchemeBuilder = runtime.NewSchemeBuilder(machineconfigurationv1.Install) | ||
| // Install is a function which adds every version of this group to a scheme | ||
| Install = SchemeBuilder.AddToScheme | ||
| ) | ||
|
|
||
| func Resource(resource string) schema.GroupResource { | ||
| return schema.GroupResource{Group: GroupName, Resource: resource} | ||
| } | ||
|
|
||
| func Kind(kind string) schema.GroupKind { | ||
| return schema.GroupKind{Group: GroupName, Kind: kind} | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,166 @@ | ||
| apiVersion: apiextensions.k8s.io/v1beta1 | ||
| kind: CustomResourceDefinition | ||
| metadata: | ||
| name: containerruntimeconfigs.machineconfiguration.openshift.io | ||
| labels: | ||
| "openshift.io/operator-managed": "" | ||
| spec: | ||
| group: machineconfiguration.openshift.io | ||
| names: | ||
| kind: ContainerRuntimeConfig | ||
| listKind: ContainerRuntimeConfigList | ||
| plural: containerruntimeconfigs | ||
| singular: containerruntimeconfig | ||
| shortNames: | ||
| - ctrcfg | ||
|
Contributor
There was a problem hiding this comment. is this already present in your CRD manifest today? We discourage shortnames on resources that are infrequently used by cluster-admins.
Contributor
Author
There was a problem hiding this comment. yes, already present |
||
| scope: Cluster | ||
| preserveUnknownFields: false | ||
| subresources: | ||
| status: {} | ||
| versions: | ||
| - name: v1 | ||
| served: true | ||
| storage: true | ||
| "validation": | ||
| "openAPIV3Schema": | ||
| description: ContainerRuntimeConfig describes a customized Container Runtime | ||
| configuration. | ||
| type: object | ||
| required: | ||
| - spec | ||
| properties: | ||
| apiVersion: | ||
| description: 'APIVersion defines the versioned schema of this representation | ||
| of an object. Servers should convert recognized schemas to the latest | ||
| internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' | ||
| type: string | ||
| kind: | ||
| description: 'Kind is a string value representing the REST resource this | ||
| object represents. Servers may infer this from the endpoint the client | ||
| submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' | ||
| type: string | ||
| metadata: | ||
| type: object | ||
| spec: | ||
| description: ContainerRuntimeConfigSpec defines the desired state of ContainerRuntimeConfig | ||
| type: object | ||
| properties: | ||
| containerRuntimeConfig: | ||
| description: ContainerRuntimeConfiguration defines the tuneables of | ||
| the container runtime | ||
| type: object | ||
| required: | ||
| - logSizeMax | ||
| - overlaySize | ||
| properties: | ||
| logLevel: | ||
| description: logLevel specifies the verbosity of the logs based | ||
| on the level it is set to. Options are fatal, panic, error, warn, | ||
| info, and debug. | ||
| type: string | ||
| logSizeMax: | ||
| description: logSizeMax specifies the Maximum size allowed for the | ||
| container log file. Negative numbers indicate that no size limit | ||
| is imposed. If it is positive, it must be >= 8192 to match/exceed | ||
| conmon's read buffer. | ||
| type: string | ||
| overlaySize: | ||
| description: 'overlaySize specifies the maximum size of a container | ||
| image. This flag can be used to set quota on the size of container | ||
| images. (default: 10GB)' | ||
| type: string | ||
| pidsLimit: | ||
| description: pidsLimit specifies the maximum number of processes | ||
| allowed in a container | ||
| type: integer | ||
| format: int64 | ||
| machineConfigPoolSelector: | ||
| description: A label selector is a label query over a set of resources. | ||
| The result of matchLabels and matchExpressions are ANDed. An empty | ||
| label selector matches all objects. A null label selector matches | ||
| no objects. | ||
| type: object | ||
| properties: | ||
| matchExpressions: | ||
| description: matchExpressions is a list of label selector requirements. | ||
| The requirements are ANDed. | ||
| type: array | ||
| items: | ||
| description: A label selector requirement is a selector that contains | ||
| values, a key, and an operator that relates the key and values. | ||
| type: object | ||
| required: | ||
| - key | ||
| - operator | ||
| properties: | ||
| key: | ||
| description: key is the label key that the selector applies | ||
| to. | ||
| type: string | ||
| operator: | ||
| description: operator represents a key's relationship to a | ||
| set of values. Valid operators are In, NotIn, Exists and | ||
| DoesNotExist. | ||
| type: string | ||
| values: | ||
| description: values is an array of string values. If the operator | ||
| is In or NotIn, the values array must be non-empty. If the | ||
| operator is Exists or DoesNotExist, the values array must | ||
| be empty. This array is replaced during a strategic merge | ||
| patch. | ||
| type: array | ||
| items: | ||
| type: string | ||
| matchLabels: | ||
| description: matchLabels is a map of {key,value} pairs. A single | ||
| {key,value} in the matchLabels map is equivalent to an element | ||
| of matchExpressions, whose key field is "key", the operator is | ||
| "In", and the values array contains only "value". The requirements | ||
| are ANDed. | ||
| type: object | ||
| additionalProperties: | ||
| type: string | ||
| status: | ||
| description: ContainerRuntimeConfigStatus defines the observed state of | ||
| a ContainerRuntimeConfig | ||
| type: object | ||
| properties: | ||
| conditions: | ||
| description: conditions represents the latest available observations | ||
| of current state. | ||
| type: array | ||
| items: | ||
| description: ContainerRuntimeConfigCondition defines the state of | ||
| the ContainerRuntimeConfig | ||
| type: object | ||
| required: | ||
| - lastTransitionTime | ||
| - status | ||
| - type | ||
| properties: | ||
| lastTransitionTime: | ||
| description: lastTransitionTime is the time of the last update | ||
| to the current status object. | ||
| type: string | ||
| format: date-time | ||
| nullable: true | ||
| message: | ||
| description: message provides additional information about the | ||
| current condition. This is only to be consumed by humans. | ||
| type: string | ||
| reason: | ||
| description: reason is the reason for the condition's last transition. Reasons | ||
| are PascalCase | ||
| type: string | ||
| status: | ||
| description: status of the condition, one of True, False, Unknown. | ||
| type: string | ||
| type: | ||
| description: type specifies the state of the operator's reconciliation | ||
| functionality. | ||
| type: string | ||
| observedGeneration: | ||
| description: observedGeneration represents the generation observed by | ||
| the controller. | ||
| type: integer | ||
| format: int64 | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| // +k8s:deepcopy-gen=package,register | ||
| // +k8s:defaulter-gen=TypeMeta | ||
| // +k8s:openapi-gen=true | ||
|
|
||
| // +groupName=machineconfiguration.openshift.io | ||
| // Package v1 is the v1 version of the API. | ||
| package v1 |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this group already exists and this is a straight move?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes: https://github.com/openshift/machine-config-operator/blob/master/pkg/apis/machineconfiguration.openshift.io/install.go#L9