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.

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

[JANSA] Fix oidcAuthIntrospectionURL/oidcClientSecret description #609

Merged
merged 1 commit into from
Aug 10, 2020
Merged

[JANSA] Fix oidcAuthIntrospectionURL/oidcClientSecret description #609

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
8 changes: 4 additions & 4 deletions manageiq-operator/deploy/crds/manageiq.org_manageiqs_crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,9 @@ spec:
type: string
oidcAuthIntrospectionURL:
description: URL for OIDC authentication introspection Only used with
the openid-connect authentication type
the openid-connect authentication type. If not specified, the operator
will attempt to fetch its value from the "token_introspection_endpoint"
field in the Provider metadata at the OIDCProviderURL provided.
type: string
oidcCaCertSecret:
description: Secret containing the trusted CA certificate file(s) for
Expand All @@ -169,9 +171,7 @@ spec:
type: string
oidcClientSecret:
description: Secret name containing the OIDC client id and secret Only
used with the openid-connect authentication type. If not specified,
the operator will attempt to fetch its value from the "token_introspection_endpoint"
field in the Provider metadata at the OIDCProviderURL provided.
used with the openid-connect authentication type
type: string
oidcProviderURL:
description: URL for the OIDC provider Only used with the openid-connect
Expand Down
8 changes: 4 additions & 4 deletions manageiq-operator/deploy/olm-catalog/manageiq-operator/0.0.1/manageiq.org_manageiqs_crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,9 @@ spec:
type: string
oidcAuthIntrospectionURL:
description: URL for OIDC authentication introspection Only used with
the openid-connect authentication type
the openid-connect authentication type. If not specified, the operator
will attempt to fetch its value from the "token_introspection_endpoint"
field in the Provider metadata at the OIDCProviderURL provided.
type: string
oidcCaCertSecret:
description: Secret containing the trusted CA certificate file(s) for
Expand All @@ -169,9 +171,7 @@ spec:
type: string
oidcClientSecret:
description: Secret name containing the OIDC client id and secret Only
used with the openid-connect authentication type. If not specified,
the operator will attempt to fetch its value from the "token_introspection_endpoint"
field in the Provider metadata at the OIDCProviderURL provided.
used with the openid-connect authentication type
type: string
oidcProviderURL:
description: URL for the OIDC provider Only used with the openid-connect
Expand Down
8 changes: 4 additions & 4 deletions manageiq-operator/pkg/apis/manageiq/v1alpha1/manageiq_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,15 @@ type ManageIQSpec struct {
// +optional
OIDCCACertSecret string `json:"oidcCaCertSecret"`
// URL for OIDC authentication introspection
// Only used with the openid-connect authentication type
// +optional
OIDCOAuthIntrospectionURL string `json:"oidcAuthIntrospectionURL"`
// Secret name containing the OIDC client id and secret
// Only used with the openid-connect authentication type.
// If not specified, the operator will attempt to fetch its value from the
// "token_introspection_endpoint" field in the Provider metadata at the
// OIDCProviderURL provided.
// +optional
OIDCOAuthIntrospectionURL string `json:"oidcAuthIntrospectionURL"`
// Secret name containing the OIDC client id and secret
// Only used with the openid-connect authentication type
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is there a diff here ?

Copy link
Contributor Author

@simaishi simaishi Aug 10, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because #582 updated the description at wrong places.

In the original PR for master branch (#571), oidcAuthIntrospectionURL wad updated. But in the Jansa specific PR (#582), oidcClientSecret was updated instead.

So this PR is putting back oidcClientSecret to what it was before #582 and also updating oidcAuthIntrospectionURL to what it should be now.

I noticed this because backporting #606 to jansa branch conflicted.

// +optional
OIDCClientSecret string `json:"oidcClientSecret"`
// Secret containing the httpd configuration files
// Mutually exclusive with the OIDCClientSecret and OIDCProviderURL if using openid-connect
Expand Down