Skip to content

Bug 1808118: Add OperatorSpec object to image registry config #640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Aug 24, 2020
Merged

Bug 1808118: Add OperatorSpec object to image registry config #640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 32 additions & 5 deletions imageregistry/v1/00-crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,15 +628,21 @@ spec:
description: httpSecret is the value needed by the registry to secure
uploads, generated by default.
type: string
logLevel:
description: "logLevel is an intent based logging for an overall component.
\ It does not give fine grained control, but it is a simple way to
manage coarse grained logging choices that operators have to interpret
for their operands. \n Valid values are: \"Normal\", \"Debug\", \"Trace\",
\"TraceAll\". Defaults to \"Normal\"."
type: string
default: Normal
logging:
description: logging determines the level of logging enabled in the
registry.
description: logging is deprecated, use logLevel instead.
type: integer
format: int64
managementState:
description: managementState indicates whether the registry instance
represented by this config instance is under operator management or
not. Valid values are Managed, Unmanaged, and Removed.
description: managementState indicates whether and how the operator
should manage the component
type: string
pattern: ^(Managed|Unmanaged|Force|Removed)$
nodeSelector:
Expand All @@ -645,6 +651,19 @@ spec:
type: object
additionalProperties:
type: string
observedConfig:
description: observedConfig holds a sparse config that controller has
observed from the cluster state. It exists in spec because it is
an input to the level for the operator
type: object
nullable: true
x-kubernetes-preserve-unknown-fields: true
operatorLogLevel:
description: operatorLogLevel is an intent based logging for the operator
itself. It does not give fine grained control, but it is a simple
way to manage coarse grained logging choices that operators have to
interpret for themselves.
type: string
proxy:
description: proxy defines the proxy to be used when calling master
api, upstream registries, etc.
Expand Down Expand Up @@ -981,6 +1000,14 @@ spec:
If the operator is Exists, the value should be empty, otherwise
just a regular string.
type: string
unsupportedConfigOverrides:
description: 'unsupportedConfigOverrides holds a sparse config that
will override any previously set options. It only needs to be the
fields to override it will end up overlaying in the following order:
1. hardcoded defaults 2. observedConfig 3. unsupportedConfigOverrides'
type: object
nullable: true
x-kubernetes-preserve-unknown-fields: true
status:
description: ImageRegistryStatus reports image registry operational status.
type: object
Expand Down
6 changes: 4 additions & 2 deletions imageregistry/v1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ type Config struct {

// ImageRegistrySpec defines the specs for the running registry.
type ImageRegistrySpec struct {
// operatorSpec allows operator specific configuration to be made.
operatorv1.OperatorSpec `json:",inline"`
// managementState indicates whether the registry instance represented
// by this config instance is under operator management or not. Valid
// values are Managed, Unmanaged, and Removed.
Expand Down Expand Up @@ -78,8 +80,8 @@ type ImageRegistrySpec struct {
Routes []ImageRegistryConfigRoute `json:"routes,omitempty"`
// replicas determines the number of registry instances to run.
Replicas int32 `json:"replicas"`
// logging determines the level of logging enabled in the registry.
LogLevel int64 `json:"logging"`
// logging is deprecated, use logLevel instead.
Logging int64 `json:"logging"`
// resources defines the resource requests+limits for the registry pod.
// +optional
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
Expand Down
1 change: 1 addition & 0 deletions imageregistry/v1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion imageregistry/v1/zz_generated.swagger_doc_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.