-
Notifications
You must be signed in to change notification settings - Fork 28
Expose Routes externally with front door #1031
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
Conversation
Skipping CI for Draft Pull Request. |
controllers/operator/routes.go
Outdated
@@ -588,6 +588,9 @@ func (r *AuthenticationReconciler) getClusterAddress(authCR *operatorv1alpha1.Au | |||
clusterInfoConfigMap := &corev1.ConfigMap{} | |||
|
|||
clusterAddressFieldName := "cluster_address" | |||
if authCR.Spec.Config.ZenFrontDoor && ctrlcommon.ClusterHasZenExtensionGroupVersion(&r.DiscoveryClient) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Any reason of using cluster_address_auth
instead of cluster_address
for ZenFrontDoor ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
cluster_address_auth
has essentially meant "the host that is delegated to us from elsewhere" since it was introduced for ZenExtension reasons. Then we made [cluster_address
and cluster_address_auth
] always the same value, so maybe it matters less. And, in an ideal world, I'd get rid of all of these redundant values and have less to track. Unfortunately, I have no idea who or what is looking at which fields when, so this is being done mostly as a hedge against that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I suppose the next question is why am I not using the function that's defined 150 lines earlier that is a more readable shorthand for the imperative conditional here? Probably because I was tired. 🙃 Given this has passed internal validations, I'll go ahead and start cleaning this branch up.
controllers/operator/configmap.go
Outdated
@@ -834,7 +834,7 @@ func (r *AuthenticationReconciler) generateCNCFClusterInfo(ctx context.Context, | |||
clusterAddress := strings.Join([]string{strings.Join([]string{"cp-console", authCR.Namespace}, "-"), domainName}, ".") | |||
clusterEndpoint := "https://" + clusterAddress | |||
clusterAddressAuth := clusterAddress | |||
if authCR.Spec.Config.ZenFrontDoor && ctrlcommon.ClusterHasZenExtensionGroupVersion(&r.DiscoveryClient) { | |||
if shouldUseCPDHost(authCR, &r.DiscoveryClient) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I just happened to notice this could be replaced by the function I had defined in routes.go, so I went ahead and did that so that it's being reused where appropriate.
Ah, right. Test changes. Need to work those out. |
/retest |
Putting this on hold until next release. |
/retest |
Originating issue: [IBMPrivateCloud/roadmap#66643](https://github.ibm.com/IBMPrivateCloud/roadmap/issues/66643) Signed-off-by: Rob Hundley <[email protected]>
Signed-off-by: Rob Hundley <[email protected]>
Signed-off-by: Rob Hundley <[email protected]>
Signed-off-by: Rob Hundley <[email protected]>
Signed-off-by: Rob Hundley <[email protected]>
Signed-off-by: Rob Hundley <[email protected]>
Signed-off-by: Rob Hundley <[email protected]>
Signed-off-by: Rob Hundley <[email protected]>
Signed-off-by: Rob Hundley <[email protected]>
Signed-off-by: Rob Hundley <[email protected]>
Signed-off-by: Rob Hundley <[email protected]>
Signed-off-by: Rob Hundley <[email protected]>
Signed-off-by: Rob Hundley <[email protected]>
Signed-off-by: Rob Hundley <[email protected]>
Signed-off-by: Rob Hundley <[email protected]>
Signed-off-by: Rob Hundley <[email protected]>
Signed-off-by: Rob Hundley <[email protected]>
Signed-off-by: Rob Hundley <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: rwhundley, Tirumalavasa The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Originating issue: IBMPrivateCloud/roadmap#66643