Skip to content

Update CRD manifests due to the Href field validation update #321

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

Closed
jhadvig wants to merge 1 commit into from
Closed

Update CRD manifests due to the Href field validation update #321

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
42 changes: 21 additions & 21 deletions manifests/00-crd-consoleclidownloads.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,36 @@ metadata:
(CLI) downloads.
spec:
scope: Cluster
preserveUnknownField: false
group: console.openshift.io
versions:
- name: v1
served: true
storage: true
- name: v1
served: true
storage: true
names:
plural: consoleclidownloads
singular: consoleclidownload
kind: ConsoleCLIDownload
listKind: ConsoleCLIDownloadList
additionalPrinterColumns:
- name: Display name
type: string
JSONPath: .spec.displayName
- name: Age
type: string
JSONPath: .metadata.creationTimestamp
- name: Description
type: string
JSONPath: .spec.description
- name: Display name
type: string
JSONPath: .spec.displayName
- name: Age
type: string
JSONPath: .metadata.creationTimestamp
- name: Description
type: string
JSONPath: .spec.description
subresources:
status: {}
validation:
openAPIV3Schema:
"validation":
"openAPIV3Schema":
description: ConsoleCLIDownload is an extension for configuring openshift web
console command line interface (CLI) downloads.
type: object
required:
- spec
- spec
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
Expand All @@ -49,15 +50,14 @@ spec:
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:
description: Standard object's metadata.
type: object
spec:
description: ConsoleCLIDownloadSpec is the desired cli download configuration.
type: object
required:
- description
- displayName
- links
- description
- displayName
- links
properties:
description:
description: description is the description of the CLI download (can
Expand All @@ -73,13 +73,13 @@ spec:
items:
type: object
required:
- href
- href
properties:
href:
description: href is the absolute secure URL for the link (must
use https)
type: string
pattern: ^https://([\w-]+.)+[\w-]+(/[\w- ./?%&=])?$
pattern: ^https://
text:
description: text is the display text for the link
type: string
50 changes: 25 additions & 25 deletions manifests/00-crd-consolelinks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,38 +7,39 @@ metadata:
description: Extension for customizing OpenShift web console links
spec:
scope: Cluster
preserveUnknownField: false
group: console.openshift.io
versions:
- name: v1
served: true
storage: true
- name: v1
served: true
storage: true
names:
plural: consolelinks
singular: consolelink
kind: ConsoleLink
listKind: ConsoleLinkList
additionalPrinterColumns:
- name: Text
type: string
JSONPath: .spec.text
- name: URL
type: string
JSONPath: .spec.href
- name: Menu
type: string
JSONPath: .spec.menu
- name: Age
type: date
JSONPath: .metadata.creationTimestamp
- name: Text
type: string
JSONPath: .spec.text
- name: URL
type: string
JSONPath: .spec.href
- name: Menu
type: string
JSONPath: .spec.menu
- name: Age
type: date
JSONPath: .metadata.creationTimestamp
subresources:
status: {}
validation:
openAPIV3Schema:
"validation":
"openAPIV3Schema":
description: ConsoleLink is an extension for customizing OpenShift web console
links.
type: object
required:
- spec
- spec
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
Expand All @@ -51,23 +52,22 @@ spec:
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:
description: Standard object's metadata.
type: object
spec:
description: ConsoleLinkSpec is the desired console link configuration.
type: object
required:
- href
- location
- text
- href
- location
- text
properties:
applicationMenu:
description: applicationMenu holds information about section and icon
used for the link in the application menu, and it is applicable only
when location is set to ApplicationMenu.
type: object
required:
- section
- section
properties:
imageURL:
description: imageUrl is the URL for the icon used in front of the
Expand All @@ -86,7 +86,7 @@ spec:
description: href is the absolute secure URL for the link (must use
https)
type: string
pattern: ^https://([\w-]+.)+[\w-]+(/[\w- ./?%&=])?$
pattern: ^https://
location:
description: location determines which location in the console the link
will be appended to (ApplicationMenu, HelpMenu, UserMenu, NamespaceDashboard).
Expand All @@ -99,7 +99,7 @@ spec:
link will appear in all namespaces.
type: object
required:
- namespaces
- namespaces
properties:
namespaces:
description: namespaces is an array of namespace names in which
Expand Down
40 changes: 20 additions & 20 deletions manifests/00-crd-consolenotifications.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,35 +7,36 @@ metadata:
description: Extension for configuring openshift web console notifications.
spec:
scope: Cluster
preserveUnknownField: false
group: console.openshift.io
versions:
- name: v1
served: true
storage: true
- name: v1
served: true
storage: true
names:
plural: consolenotifications
singular: consolenotification
kind: ConsoleNotification
listKind: ConsoleNotificationList
additionalPrinterColumns:
- name: Text
type: string
JSONPath: .spec.text
- name: Location
type: string
JSONPath: .spec.location
- name: Age
type: date
JSONPath: .metadata.creationTimestamp
- name: Text
type: string
JSONPath: .spec.text
- name: Location
type: string
JSONPath: .spec.location
- name: Age
type: date
JSONPath: .metadata.creationTimestamp
subresources:
status: {}
validation:
openAPIV3Schema:
"validation":
"openAPIV3Schema":
description: ConsoleNotification is the extension for configuring openshift
web console notifications.
type: object
required:
- spec
- spec
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
Expand All @@ -48,14 +49,13 @@ spec:
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:
description: Standard object's metadata.
type: object
spec:
description: ConsoleNotificationSpec is the desired console notification
configuration.
type: object
required:
- text
- text
properties:
backgroundColor:
description: backgroundColor is the color of the background for the
Expand All @@ -69,14 +69,14 @@ spec:
description: link is an object that holds notification link details.
type: object
required:
- href
- text
- href
- text
properties:
href:
description: href is the absolute secure URL for the link (must
use https)
type: string
pattern: ^https://([\w-]+.)+[\w-]+(/[\w- ./?%&=])?$
pattern: ^https://
text:
description: text is the display text for the link
type: string
Expand Down