Skip to content

Commit 7bf3e46

Browse files
committed
fix: r
Signed-off-by: Ashing Zheng <[email protected]>
1 parent 1d4aacd commit 7bf3e46

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

internal/manager/controllers.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func setupControllers(ctx context.Context, mgr manager.Manager, pro provider.Pro
111111
Updater: updater,
112112
})
113113
} else {
114-
setupLog.Info("Skipping GatewayClass controller setup, API not found in cluster", "api", "gateway.networking.k8s.io/v1.GatewayClass")
114+
setupLog.Info("Skipping GatewayClass controller setup, API not found in cluster", "api", utils.FormatGVK(&gatewayv1.GatewayClass{}))
115115
}
116116

117117
if utils.HasAPIResource(mgr, &gatewayv1.Gateway{}) {
@@ -123,7 +123,7 @@ func setupControllers(ctx context.Context, mgr manager.Manager, pro provider.Pro
123123
Updater: updater,
124124
})
125125
} else {
126-
setupLog.Info("Skipping Gateway controller setup, API not found in cluster", "api", "gateway.networking.k8s.io/v1.Gateway")
126+
setupLog.Info("Skipping Gateway controller setup, API not found in cluster", "api", utils.FormatGVK(&gatewayv1.Gateway{}))
127127
}
128128

129129
if utils.HasAPIResource(mgr, &gatewayv1.HTTPRoute{}) {
@@ -136,7 +136,7 @@ func setupControllers(ctx context.Context, mgr manager.Manager, pro provider.Pro
136136
Readier: readier,
137137
})
138138
} else {
139-
setupLog.Info("Skipping HTTPRoute controller setup, API not found in cluster", "api", "gateway.networking.k8s.io/v1.HTTPRoute")
139+
setupLog.Info("Skipping HTTPRoute controller setup, API not found in cluster", "api", utils.FormatGVK(&gatewayv1.HTTPRoute{}))
140140
}
141141

142142
// Core Kubernetes Controllers - always register these
@@ -167,7 +167,7 @@ func setupControllers(ctx context.Context, mgr manager.Manager, pro provider.Pro
167167
Readier: readier,
168168
})
169169
} else {
170-
setupLog.Info("Skipping Consumer controller setup, API not found in cluster", "api", "apisix.apache.org/v1alpha1.Consumer")
170+
setupLog.Info("Skipping Consumer controller setup, API not found in cluster", "api", utils.FormatGVK(&v1alpha1.Consumer{}))
171171
}
172172

173173
controllers = append(controllers, &controller.GatewayProxyController{

pkg/utils/cluster.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,8 @@ func HasAPIResourceWithLogger(mgr ctrl.Manager, obj client.Object, logger logr.L
7070
logger.Info("API resource kind not found in group/version")
7171
return false
7272
}
73+
74+
func FormatGVK(obj client.Object) string {
75+
gvk := types.GvkOf(obj)
76+
return gvk.GroupVersion().String() + "." + gvk.Kind
77+
}

0 commit comments

Comments
 (0)