Skip to content
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.

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

THREESCALE-11346 Backport support for Backend CRs using wss protocol #1019

Open
wants to merge 1 commit into
base: 3scale-2.14-stable
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 apis/capabilities/v1beta1/backend_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ type BackendSpec struct {
SystemName string `json:"systemName,omitempty"`

// PrivateBaseURL Private Base URL of the API
// +kubebuilder:validation:Pattern=`^https?:\/\/.*$`
// +kubebuilder:validation:Pattern=`^(https?|wss?):\/\/.*$`
PrivateBaseURL string `json:"privateBaseURL"`

// Description is a human readable text of the backend
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/capabilities.3scale.net_backends.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ spec:
type: string
privateBaseURL:
description: PrivateBaseURL Private Base URL of the API
pattern: ^https?:\/\/.*$
pattern: ^(https?|wss?):\/\/.*$
type: string
providerAccountRef:
description: ProviderAccountRef references account provider credentials
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/capabilities.3scale.net_backends.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ spec:
type: string
privateBaseURL:
description: PrivateBaseURL Private Base URL of the API
pattern: ^https?:\/\/.*$
pattern: ^(https?|wss?):\/\/.*$
type: string
providerAccountRef:
description: ProviderAccountRef references account provider credentials
Expand Down
2 changes: 1 addition & 1 deletion doc/backend-reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Generated using [github-markdown-toc](https://github.com/ekalinin/github-markdow
| **Field** | **json field**| **Type** | **Info** | **Required** |
| --- | --- | --- | --- | --- |
| Name | `name` | string | Name | Yes |
| Private Base URL | `privateBaseURL` | string | The private endpoint | Yes |
| Private Base URL | `privateBaseURL` | string | The private endpoint. Supports the http(s) and ws(s) protocols, for example `http://api.example.com` or `wss://api.example.com`. | Yes |
| System Name | `systemName` | string | Name | No |
| Description | `description` | string | Backend description message | No |
| Mapping Rules | `mappingRules` | array | See [MappingRules Spec](#MappingRuleSpec). Order in the array matters. Rules are processed as defined in the array from more prioritary to less prioritary | No |
Expand Down