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

Jump to bottom

OCPBUGS-33762: Hardcode resource groups/kinds for now #1773

Merged
merged 2 commits into from
May 22, 2024
Merged

OCPBUGS-33762: Hardcode resource groups/kinds for now #1773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27e9057
update status: minor code cleanups
petr-muller May 18, 2024
fad39d2
OCPBUGS-33762: Hardcode resource groups/kinds for now
petr-muller May 18, 2024
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 pkg/cli/admin/upgrade/status/alerts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
configv1 "github.com/openshift/api/config/v1"
)

// Alerts that will be included in the health upgrade evaluation, even if they were triggered before the upgrade began.
// AllowedAlerts will be included in the health upgrade evaluation, even if they were triggered before the upgrade began.
type AllowedAlerts map[string]struct{}

var allowedAlerts AllowedAlerts = map[string]struct{}{
Expand Down Expand Up @@ -42,7 +42,7 @@ type Alert struct {
PartialResponseStrategy string `json:"partialResponseStrategy,omitempty"`
}

// Stores alert data returned by thanos
// AlertData stores alert data returned by thanos
type AlertData struct {
Status string `json:"status"`
Data Data `json:"data"`
Expand All @@ -53,8 +53,8 @@ type Data struct {
}

func parseAlertDataToInsights(alertData AlertData, startedAt time.Time) []updateInsight {
var alerts []Alert = alertData.Data.Alerts
var updateInsights []updateInsight = []updateInsight{}
var alerts = alertData.Data.Alerts
var updateInsights []updateInsight

for _, alert := range alerts {
if startedAt.After(alert.ActiveAt) && !allowedAlerts.Contains(alert.Labels.AlertName) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/admin/upgrade/status/alerts_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ func TestParseAlertDataToInsightsWithData(t *testing.T) {
},
},
startedAt: now,
expectedInsights: []updateInsight{},
expectedInsights: nil,
},
}

Expand Down
8 changes: 5 additions & 3 deletions pkg/cli/admin/upgrade/status/controlplane.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ const (
// clusterStatusFailing is set on the ClusterVersion status when a cluster
// cannot reach the desired state.
clusterStatusFailing = v1.ClusterStatusConditionType("Failing")

clusterVersionKind string = "ClusterVersion"
clusterOperatorKind string = "ClusterOperator"
)

type operators struct {
Expand Down Expand Up @@ -75,7 +78,7 @@ const (
)

func coInsights(name string, available *v1.ClusterOperatorStatusCondition, degraded *v1.ClusterOperatorStatusCondition, evaluated time.Time) []updateInsight {
coGroupKind := scopeGroupKind{group: v1.GroupName, kind: "ClusterOperator"}
coGroupKind := scopeGroupKind{group: v1.GroupName, kind: clusterOperatorKind}
var insights []updateInsight
if available != nil && available.Status == v1.ConditionFalse && evaluated.After(available.LastTransitionTime.Time.Add(unavailableWarningThreshold)) {
insight := updateInsight{
Expand Down Expand Up @@ -128,8 +131,7 @@ func assessControlPlaneStatus(cv *v1.ClusterVersion, operators []v1.ClusterOpera
var insights []updateInsight

targetVersion := cv.Status.Desired.Version
cvGvk := cv.GroupVersionKind()
cvGroupKind := scopeGroupKind{group: cvGvk.Group, kind: cvGvk.Kind}
cvGroupKind := scopeGroupKind{group: v1.GroupName, kind: clusterVersionKind}
cvScope := scopeResource{kind: cvGroupKind, name: cv.Name}

if c := findClusterOperatorStatusCondition(cv.Status.Conditions, clusterStatusFailing); c == nil {
Expand Down
10 changes: 6 additions & 4 deletions pkg/cli/admin/upgrade/status/workerpool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ const (
nodeAssessmentExcluded
nodeAssessmentOutdated
nodeAssessmentCompleted

nodeKind string = "Node"
mcpKind string = "MachineConfigPool"
)

func (assessment nodeAssessment) String() string {
Expand Down Expand Up @@ -337,8 +340,7 @@ func nodeInsights(pool mcfgv1.MachineConfigPool, node corev1.Node, reason string
if pool.Name == "master" {
scope = scopeTypeControlPlane
}
nodeGvk := node.GroupVersionKind()
nodeGroupKind := scopeGroupKind{group: nodeGvk.Group, kind: nodeGvk.Kind}
nodeGroupKind := scopeGroupKind{kind: nodeKind}
if isUnavailable && !isUpdating {
insights = append(insights, updateInsight{
startedAt: time.Time{},
Expand Down Expand Up @@ -449,12 +451,12 @@ func machineConfigPoolInsights(poolDisplay poolDisplayData, pool mcfgv1.MachineC
// TODO: Only generate this insight if the pool has some work remaining that will not finish
// Depends on how MCO actually works: will it stop updating a node that already started e.g. draining?)
if poolDisplay.NodesOverview.Excluded > 0 && pool.Spec.Paused {
poolGvk := pool.GroupVersionKind()

insights = append(insights, updateInsight{
startedAt: time.Time{},
scope: updateInsightScope{
scopeType: scopeTypeWorkerPool,
resources: []scopeResource{{kind: scopeGroupKind{group: poolGvk.Group, kind: poolGvk.Kind}, name: pool.Name}},
resources: []scopeResource{{kind: scopeGroupKind{group: mcfgv1.GroupName, kind: mcpKind}, name: pool.Name}},
},
impact: updateInsightImpact{
level: warningImpactLevel,
Expand Down