Skip to content

Revert "Validate URLs from the CR file and additional unit tests for ocp tag" #164

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
benjaminapetersen wants to merge 1 commit into from
Closed

Revert "Validate URLs from the CR file and additional unit tests for ocp tag" #164

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
16 changes: 0 additions & 16 deletions examples/cr-console.operator.config.yaml
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions hack/test-unit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,3 @@ do
os::log::info "Testing ${PACKAGE}"
go test $PACKAGE
done

OCP_PACKAGES_TO_TEST=(
"github.com/openshift/console-operator/pkg/console/subresource/configmap"
"github.com/openshift/console-operator/pkg/console/subresource/deployment"
"github.com/openshift/console-operator/pkg/console/subresource/oauthclient"
"github.com/openshift/console-operator/pkg/console/subresource/route"
"github.com/openshift/console-operator/pkg/console/subresource/secret"
"github.com/openshift/console-operator/pkg/console/subresource/service"
"github.com/openshift/console-operator/pkg/console/subresource/util"
"github.com/openshift/console-operator/pkg/console/version"
)

for PACKAGE in "${OCP_PACKAGES_TO_TEST[@]}"
do
os::log::info "Testing with tag ocp ${PACKAGE}"
go test -tags "ocp" $PACKAGE
done
32 changes: 3 additions & 29 deletions manifests/00-crd-operator-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,32 +13,6 @@ spec:
subresources:
status: {}
versions:
- name: v1
served: true
storage: true
validation:
openAPIV3Schema:
properties:
spec:
properties:
managementState:
pattern: ^(Managed|Unmanaged|Removed|Forced)$
type: string
description: managementState indicates whether and how the operator
should manage the component
authentication:
properties:
logoutRedirect:
pattern: ^((https):\/\/?)[^\s()<>]+(?:\([\w\d]+\)|([^[:punct:]\s]|\/?))$
type: string
description: Logout Redirect must be a valid URL
customization:
properties:
documentationBaseURL:
pattern: ^((https):\/\/?)[^\s()<>]+(?:\([\w\d]+\)|([^[:punct:]\s]|\/?))\/$
type: string
description: Document base URL must be a valid URL that ends in a trailing slash
brand:
pattern: ^(ocp|origin|okd|dedicated|online|azure)$
type: string
description: Brand must be be one of six values - azure|dedicated|ocp|okd|online|origin
- name: v1
served: true
storage: true
8 changes: 4 additions & 4 deletions pkg/console/subresource/configmap/configmap_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ clusterInfo:
consoleBaseAddress: https://` + host + `
consoleBasePath: ""
customization:
branding: ` + DEFAULT_BRAND + `
documentationBaseURL: ` + DEFAULT_DOC_URL + `
branding: okd
documentationBaseURL: https://docs.okd.io/4.0/
servingInfo:
bindAddress: https://0.0.0.0:8443
certFile: /var/serving-cert/tls.crt
Expand Down Expand Up @@ -171,8 +171,8 @@ func TestNewYamlConfig(t *testing.T) {
args: args{
host: host,
logoutRedirect: "",
brand: DEFAULT_BRAND,
docURL: DEFAULT_DOC_URL,
brand: "okd",
docURL: "https://docs.okd.io/4.0/",
},
want: exampleYaml,
},
Expand Down