Skip to content

Commit a5fe17c

Browse files
committed
Remove extraneous .ObjectMeta references
1 parent aaff394 commit a5fe17c

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

pkg/crc/cluster/cert_renewal.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ func approvePendingCSRs(ctx context.Context, ocConfig oc.Config, expectedSignerN
2929
if !isPending(csr) {
3030
continue
3131
}
32-
logging.Debugf("Approving csr %s (signerName: %s)", csr.ObjectMeta.Name, expectedSignerName)
33-
_, stderr, err := ocConfig.RunOcCommand("adm", "certificate", "approve", csr.ObjectMeta.Name)
32+
logging.Debugf("Approving csr %s (signerName: %s)", csr.Name, expectedSignerName)
33+
_, stderr, err := ocConfig.RunOcCommand("adm", "certificate", "approve", csr.Name)
3434
if err != nil {
3535
return fmt.Errorf("Not able to approve csr (%v : %s)", err, stderr)
3636
}

pkg/crc/cluster/clusteroperator.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -95,28 +95,28 @@ func getStatus(ctx context.Context, lister operatorLister, selector []string) (*
9595

9696
found := false
9797
for _, c := range co.Items {
98-
if len(selector) > 0 && !slices.Contains(selector, c.ObjectMeta.Name) {
98+
if len(selector) > 0 && !slices.Contains(selector, c.Name) {
9999
continue
100100
}
101101
found = true
102102
for _, con := range c.Status.Conditions {
103103
switch con.Type {
104104
case openshiftapi.OperatorAvailable:
105105
if con.Status != openshiftapi.ConditionTrue {
106-
logging.Debug(c.ObjectMeta.Name, " operator not available, Reason: ", con.Reason)
107-
cs.unavailable = append(cs.unavailable, c.ObjectMeta.Name)
106+
logging.Debug(c.Name, " operator not available, Reason: ", con.Reason)
107+
cs.unavailable = append(cs.unavailable, c.Name)
108108
cs.Available = false
109109
}
110110
case openshiftapi.OperatorDegraded:
111111
if con.Status == openshiftapi.ConditionTrue {
112-
logging.Debug(c.ObjectMeta.Name, " operator is degraded, Reason: ", con.Reason)
113-
cs.degraded = append(cs.degraded, c.ObjectMeta.Name)
112+
logging.Debug(c.Name, " operator is degraded, Reason: ", con.Reason)
113+
cs.degraded = append(cs.degraded, c.Name)
114114
cs.Degraded = true
115115
}
116116
case openshiftapi.OperatorProgressing:
117117
if con.Status == openshiftapi.ConditionTrue {
118-
logging.Debug(c.ObjectMeta.Name, " operator is still progressing, Reason: ", con.Reason)
119-
cs.progressing = append(cs.progressing, c.ObjectMeta.Name)
118+
logging.Debug(c.Name, " operator is still progressing, Reason: ", con.Reason)
119+
cs.progressing = append(cs.progressing, c.Name)
120120
cs.Progressing = true
121121
}
122122
case openshiftapi.OperatorUpgradeable:
@@ -125,15 +125,15 @@ func getStatus(ctx context.Context, lister operatorLister, selector []string) (*
125125
continue
126126
case "Disabled": // non official status, used by insights and cluster baremetal operators
127127
if con.Status == openshiftapi.ConditionTrue {
128-
logging.Debug(c.ObjectMeta.Name, " operator is disabled, Reason: ", con.Reason)
128+
logging.Debug(c.Name, " operator is disabled, Reason: ", con.Reason)
129129
cs.Disabled = true
130130
}
131131
case "ManagementStateDegraded": // only for the network operator
132132
continue
133133
case "RecentBackup": // only for etcd operator
134134
continue
135135
default:
136-
logging.Debugf("Unexpected operator status for %s: %s", c.ObjectMeta.Name, con.Type)
136+
logging.Debugf("Unexpected operator status for %s: %s", c.Name, con.Type)
137137
}
138138
}
139139
}

0 commit comments

Comments
 (0)