Skip to content

Fix image registry's rollout parameter #563

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 2 commits into from
Jan 10, 2020
Merged

Fix image registry's rollout parameter #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
389c961
Fix image registry's RolloutStrategy param
adambkaplan Jan 10, 2020
14f1b46
make update
adambkaplan Jan 10, 2020
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
2 changes: 1 addition & 1 deletion imageregistry/v1/00-crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ spec:
type: string
rolloutStrategy:
description: rolloutStrategy defines rollout strategy for the image
registry deployment. Valid values are RollingUpdate (default) and Recreate.
registry deployment.
type: string
pattern: ^(RollingUpdate|Recreate)$
routes:
Expand Down
2 changes: 1 addition & 1 deletion imageregistry/v1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ type ImageRegistrySpec struct {
// deployment.
// +optional
// +kubebuilder:validation:Pattern=`^(RollingUpdate|Recreate)$`
RolloutStrategy string `json:"rolloutStrategy" protobuf:"bytes,15,opt,name=rolloutStrategy"`
RolloutStrategy string `json:"rolloutStrategy,omitempty" protobuf:"bytes,15,opt,name=rolloutStrategy"`
}

// ImageRegistryStatus reports image registry operational status.
Expand Down
13 changes: 7 additions & 6 deletions operator/v1/0000_80_csi_snapshot_controller_operator_01_crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@ spec:
storage: true
validation:
openAPIV3Schema:
description: CSISnapshotController provides information to configure an operator to
manage the CSISnapshotController.
description: CSISnapshotController provides a means to configure an operator
to manage the CSI snapshots. `cluster` is the canonical name.
type: object
required:
- spec
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
Expand All @@ -36,8 +38,7 @@ spec:
metadata:
type: object
spec:
description: CSISnapshotControllerSpec is the specification of the desired behavior of
the CSISnapshotController operator.
description: spec holds user settable values for configuration
type: object
properties:
logLevel:
Expand Down Expand Up @@ -73,8 +74,8 @@ spec:
nullable: true
x-kubernetes-preserve-unknown-fields: true
status:
description: CSISnapshotControllerStatus defines the observed status of
the CSISnapshotController operator.
description: status holds observed values from the cluster. They may not
be overridden.
type: object
properties:
conditions:
Expand Down