Skip to content

pkg/controllers: Use library-go's IngressURI helper #358

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

Merged
openshift-merge-robot merged 1 commit into from
Oct 12, 2020
Merged

pkg/controllers: Use library-go's IngressURI helper #358

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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/openshift/api v0.0.0-20200930075302-db52bc4ef99f
github.com/openshift/build-machinery-go v0.0.0-20200917070002-f171684f77ab
github.com/openshift/client-go v0.0.0-20200929181438-91d71ef2122c
github.com/openshift/library-go v0.0.0-20200930190915-f7cb85f605db
github.com/openshift/library-go v0.0.0-20201006230840-f360b9835cc8
github.com/spf13/cobra v1.0.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.4.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,8 +360,8 @@ github.com/openshift/client-go v0.0.0-20200827190008-3062137373b5 h1:E6WhVL5p3rf
github.com/openshift/client-go v0.0.0-20200827190008-3062137373b5/go.mod h1:5rGmrkQ8DJEUXA+AR3rEjfH+HFyg4/apY9iCQFgvPfE=
github.com/openshift/client-go v0.0.0-20200929181438-91d71ef2122c h1:DQTWW8DGRN7fu5qwEPcbdP9hAxXi7dm5cvi0hrdR3UE=
github.com/openshift/client-go v0.0.0-20200929181438-91d71ef2122c/go.mod h1:MwESrlhzumQGcGtPCpz/WjDrlvhu1fMNlLBcNYjO0fY=
github.com/openshift/library-go v0.0.0-20200930190915-f7cb85f605db h1:9exsUh1WRQ2U+ZeIuX50Qb+oHAZXkcTL07A3FJhfc/A=
github.com/openshift/library-go v0.0.0-20200930190915-f7cb85f605db/go.mod h1:NI6xOQGuTnLXeHW8Z2glKSFhF7X+YxlAlqlBMaK0zEM=
github.com/openshift/library-go v0.0.0-20201006230840-f360b9835cc8 h1:WoTAxt198VLaxZyr1QTnItIfz/g1bb9PA7B8CnCMXE0=
github.com/openshift/library-go v0.0.0-20201006230840-f360b9835cc8/go.mod h1:NI6xOQGuTnLXeHW8Z2glKSFhF7X+YxlAlqlBMaK0zEM=
github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
Expand Down
24 changes: 3 additions & 21 deletions pkg/controllers/common/route.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,20 @@ import (
"net/http"
"os"

"github.com/davecgh/go-spew/spew"
corev1 "k8s.io/api/core/v1"
"k8s.io/klog/v2"

configv1 "github.com/openshift/api/config/v1"
operatorv1 "github.com/openshift/api/operator/v1"
routev1 "github.com/openshift/api/route/v1"
routev1lister "github.com/openshift/client-go/route/listers/route/v1"
"github.com/openshift/library-go/pkg/route/routeapihelpers"

"github.com/openshift/cluster-authentication-operator/pkg/transport"
)

func CheckRouteHealthy(route *routev1.Route, routerSecret *corev1.Secret, systemCABundle []byte, ingress *configv1.Ingress, conditionPrefix string) []operatorv1.OperatorCondition {
if !RouteHasCanonicalHost(route, route.Spec.Host) {
msg := spew.Sdump(route.Status.Ingress)
if len(route.Status.Ingress) == 0 {
msg = "route status ingress is empty"
}
if _, _, err := routeapihelpers.IngressURI(route, route.Spec.Host); err != nil {
return []operatorv1.OperatorCondition{
{
Type: conditionPrefix + "Progressing",
Expand All @@ -37,7 +33,7 @@ func CheckRouteHealthy(route *routev1.Route, routerSecret *corev1.Secret, system
Type: conditionPrefix + "Available",
Status: operatorv1.ConditionFalse,
Reason: "RouteNotReady",
Message: fmt.Sprintf("Route is not available at canonical host %s: %+v", route.Spec.Host, msg),
Message: err.Error(),
},
}
}
Expand Down Expand Up @@ -148,20 +144,6 @@ func GetOAuthServerRoute(routeLister routev1lister.RouteLister, conditionPrefix
return route, nil
}

func RouteHasCanonicalHost(route *routev1.Route, canonicalHost string) bool {
for _, ingress := range route.Status.Ingress {
if ingress.Host != canonicalHost {
continue
}
for _, condition := range ingress.Conditions {
if condition.Type == routev1.RouteAdmitted && condition.Status == corev1.ConditionTrue {
return true
}
}
}
return false
}

func routerSecretToCA(route *routev1.Route, routerSecret *corev1.Secret, ingress *configv1.Ingress) []byte {
var caData []byte

Expand Down
10 changes: 3 additions & 7 deletions pkg/controllers/deployment/deployment_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"strings"
"time"

"github.com/davecgh/go-spew/spew"
appsv1 "k8s.io/api/apps/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up @@ -37,6 +36,7 @@ import (
"github.com/openshift/library-go/pkg/operator/resource/resourceapply"
"github.com/openshift/library-go/pkg/operator/resource/resourcemerge"
"github.com/openshift/library-go/pkg/operator/v1helpers"
"github.com/openshift/library-go/pkg/route/routeapihelpers"

"github.com/openshift/cluster-authentication-operator/pkg/controllers/common"
)
Expand Down Expand Up @@ -236,17 +236,13 @@ func (c *deploymentController) getCanonicalRoute(ingressConfigDomain string) (*r
}

expectedHost := "oauth-openshift." + ingressConfigDomain
if !common.RouteHasCanonicalHost(route, expectedHost) {
msg := spew.Sdump(route.Status.Ingress)
if len(route.Status.Ingress) == 0 {
msg = "route status ingress is empty"
}
if _, _, err := routeapihelpers.IngressURI(route, expectedHost); err != nil {
return nil, []operatorv1.OperatorCondition{
{
Type: "OAuthServerRouteDegraded",
Status: operatorv1.ConditionTrue,
Reason: "InvalidCanonicalHost",
Message: fmt.Sprintf("Route is not available at canonical host %s: %+v", expectedHost, msg),
Message: err.Error(),
},
}
}
Expand Down
13 changes: 4 additions & 9 deletions pkg/controllers/metadata/metadata_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"strings"
"time"

"github.com/davecgh/go-spew/spew"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/equality"
"k8s.io/apimachinery/pkg/api/errors"
Expand All @@ -25,13 +24,13 @@ import (
configv1listers "github.com/openshift/client-go/config/listers/config/v1"
routeclient "github.com/openshift/client-go/route/clientset/versioned/typed/route/v1"
routeinformer "github.com/openshift/client-go/route/informers/externalversions"
"github.com/openshift/cluster-authentication-operator/pkg/controllers/common"
"github.com/openshift/library-go/pkg/controller/factory"
"github.com/openshift/library-go/pkg/operator/events"
"github.com/openshift/library-go/pkg/operator/resource/resourceapply"
"github.com/openshift/library-go/pkg/operator/resource/resourcemerge"
"github.com/openshift/library-go/pkg/operator/v1helpers"

"github.com/openshift/cluster-authentication-operator/pkg/controllers/common"
"github.com/openshift/library-go/pkg/route/routeapihelpers"
)

// knownConditionNames lists all condition types used by this controller.
Expand Down Expand Up @@ -163,17 +162,13 @@ func (c *metadataController) handleRoute(ctx context.Context, ingress *configv1.
}
}

if ok := common.RouteHasCanonicalHost(route, expectedRoute.Spec.Host); !ok {
msg := spew.Sdump(route.Status.Ingress)
if len(route.Status.Ingress) == 0 {
msg = "route status ingress is empty"
}
if _, _, err := routeapihelpers.IngressURI(route, expectedRoute.Spec.Host); err != nil {
// be careful not to print route.spec as it many contain secrets
return []operatorv1.OperatorCondition{{
Type: "RouteDegraded",
Status: operatorv1.ConditionTrue,
Reason: "InvalidCanonicalHost",
Message: fmt.Sprintf("Route is not available at canonical host %s: %+v", expectedRoute.Spec.Host, msg),
Message: err.Error(),
}}
}

Expand Down
17 changes: 7 additions & 10 deletions test/library/waits.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import (
"k8s.io/apimachinery/pkg/util/wait"

configv1 "github.com/openshift/api/config/v1"
routev1 "github.com/openshift/api/route/v1"
configv1client "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
routev1client "github.com/openshift/client-go/route/clientset/versioned/typed/route/v1"
"github.com/openshift/library-go/pkg/config/clusteroperator/v1helpers"
"github.com/openshift/library-go/pkg/operator/resource/retry"
"github.com/openshift/library-go/pkg/route/routeapihelpers"
)

func WaitForClusterOperatorAvailableNotProgressingNotDegraded(t *testing.T, client configv1client.ConfigV1Interface, name string) error {
Expand Down Expand Up @@ -89,16 +89,13 @@ func WaitForRouteAdmitted(t *testing.T, client routev1client.RouteV1Interface, n
t.Logf("route.Get(%s/%s) error: %v", ns, name, err)
return false, nil
}
for _, i := range route.Status.Ingress {
for _, c := range i.Conditions {
if c.Type == routev1.RouteAdmitted && c.Status == "True" {
admittedURL = i.Host
return true, nil
}
}
if _, ingress, err := routeapihelpers.IngressURI(route, ""); err != nil {
t.Log(err)
return false, nil
} else {
admittedURL = ingress.Host
}

return false, nil
return true, nil
})

return admittedURL, err
Expand Down
44 changes: 44 additions & 0 deletions vendor/github.com/openshift/library-go/pkg/route/routeapihelpers/routeapihelpers.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ github.com/openshift/client-go/route/informers/externalversions/internalinterfac
github.com/openshift/client-go/route/informers/externalversions/route
github.com/openshift/client-go/route/informers/externalversions/route/v1
github.com/openshift/client-go/route/listers/route/v1
# github.com/openshift/library-go v0.0.0-20200930190915-f7cb85f605db
# github.com/openshift/library-go v0.0.0-20201006230840-f360b9835cc8
## explicit
github.com/openshift/library-go/pkg/apps/deployment
github.com/openshift/library-go/pkg/assets
Expand Down Expand Up @@ -253,6 +253,7 @@ github.com/openshift/library-go/pkg/operator/staticresourcecontroller
github.com/openshift/library-go/pkg/operator/status
github.com/openshift/library-go/pkg/operator/unsupportedconfigoverridescontroller
github.com/openshift/library-go/pkg/operator/v1helpers
github.com/openshift/library-go/pkg/route/routeapihelpers
github.com/openshift/library-go/pkg/serviceability
github.com/openshift/library-go/test/library
github.com/openshift/library-go/test/library/encryption
Expand Down