Skip to content

Commit fd15bd6

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #12696 from k8s-infra-cherrypick-robot/cherry-pick-12694-to-release-1.11
[release-1.11] 🌱 Log version and git commit on controller start
2 parents 649afe4 + 4c055d3 commit fd15bd6

File tree

5 files changed

+25
-21
lines changed

5 files changed

+25
-21
lines changed

‎bootstrap/kubeadm/main.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,26 +195,27 @@ func InitFlags(fs *pflag.FlagSet) {
195195
// +kubebuilder:rbac:groups=bootstrap.cluster.x-k8s.io,resources=kubeadmconfigtemplates,verbs=get;list;watch;patch;update
196196

197197
func main() {
198-
setupLog.Info(fmt.Sprintf("Version: %+v", version.Get().String()))
199-
200198
InitFlags(pflag.CommandLine)
201199
pflag.CommandLine.SetNormalizeFunc(cliflag.WordSepNormalizeFunc)
202200
pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
203201
// Set log level 2 as default.
204202
if err := pflag.CommandLine.Set("v", "2"); err != nil {
205-
setupLog.Error(err, "failed to set default log level")
203+
fmt.Printf("Failed to set default log level: %v\n", err)
206204
os.Exit(1)
207205
}
208206
pflag.Parse()
209207

210208
if err := logsv1.ValidateAndApply(logOptions, nil); err != nil {
211-
setupLog.Error(err, "unable to start manager")
209+
fmt.Printf("Unable to start manager: %v\n", err)
212210
os.Exit(1)
213211
}
214212

215213
// klog.Background will automatically use the right logger.
216214
ctrl.SetLogger(klog.Background())
217215

216+
// Note: setupLog can only be used after ctrl.SetLogger was called
217+
setupLog.Info(fmt.Sprintf("Version: %s (git commit: %s)", version.Get().String(), version.Get().GitCommit))
218+
218219
restConfig := ctrl.GetConfigOrDie()
219220
restConfig.QPS = restConfigQPS
220221
restConfig.Burst = restConfigBurst

‎controlplane/kubeadm/main.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,26 +211,27 @@ func InitFlags(fs *pflag.FlagSet) {
211211
// +kubebuilder:rbac:groups=apiextensions.k8s.io,resources=customresourcedefinitions;customresourcedefinitions/status,verbs=update;patch,resourceNames=kubeadmcontrolplanes.controlplane.cluster.x-k8s.io;kubeadmcontrolplanetemplates.controlplane.cluster.x-k8s.io
212212

213213
func main() {
214-
setupLog.Info(fmt.Sprintf("Version: %+v", version.Get().String()))
215-
216214
InitFlags(pflag.CommandLine)
217215
pflag.CommandLine.SetNormalizeFunc(cliflag.WordSepNormalizeFunc)
218216
pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
219217
// Set log level 2 as default.
220218
if err := pflag.CommandLine.Set("v", "2"); err != nil {
221-
setupLog.Error(err, "failed to set default log level")
219+
fmt.Printf("Failed to set default log level: %v\n", err)
222220
os.Exit(1)
223221
}
224222
pflag.Parse()
225223

226224
if err := logsv1.ValidateAndApply(logOptions, nil); err != nil {
227-
setupLog.Error(err, "unable to start manager")
225+
fmt.Printf("Unable to start manager: %v\n", err)
228226
os.Exit(1)
229227
}
230228

231229
// klog.Background will automatically use the right logger.
232230
ctrl.SetLogger(klog.Background())
233231

232+
// Note: setupLog can only be used after ctrl.SetLogger was called
233+
setupLog.Info(fmt.Sprintf("Version: %s (git commit: %s)", version.Get().String(), version.Get().GitCommit))
234+
234235
restConfig := ctrl.GetConfigOrDie()
235236
restConfig.QPS = restConfigQPS
236237
restConfig.Burst = restConfigBurst

‎main.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -302,26 +302,27 @@ func InitFlags(fs *pflag.FlagSet) {
302302
// +kubebuilder:rbac:groups=cluster.x-k8s.io,resources=machinedrainrules,verbs=get;list;watch;patch;update
303303

304304
func main() {
305-
setupLog.Info(fmt.Sprintf("Version: %+v", version.Get().String()))
306-
307305
InitFlags(pflag.CommandLine)
308306
pflag.CommandLine.SetNormalizeFunc(cliflag.WordSepNormalizeFunc)
309307
pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
310308
// Set log level 2 as default.
311309
if err := pflag.CommandLine.Set("v", "2"); err != nil {
312-
setupLog.Error(err, "Failed to set default log level")
310+
fmt.Printf("Failed to set default log level: %v\n", err)
313311
os.Exit(1)
314312
}
315313
pflag.Parse()
316314

317315
if err := logsv1.ValidateAndApply(logOptions, nil); err != nil {
318-
setupLog.Error(err, "Unable to start manager")
316+
fmt.Printf("Unable to start manager: %v\n", err)
319317
os.Exit(1)
320318
}
321319

322320
// klog.Background will automatically use the right logger.
323321
ctrl.SetLogger(klog.Background())
324322

323+
// Note: setupLog can only be used after ctrl.SetLogger was called
324+
setupLog.Info(fmt.Sprintf("Version: %s (git commit: %s)", version.Get().String(), version.Get().GitCommit))
325+
325326
restConfig := ctrl.GetConfigOrDie()
326327
restConfig.QPS = restConfigQPS
327328
restConfig.Burst = restConfigBurst

‎test/extension/main.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,15 +162,12 @@ func InitFlags(fs *pflag.FlagSet) {
162162
// +kubebuilder:rbac:groups=authorization.k8s.io,resources=subjectaccessreviews,verbs=create
163163

164164
func main() {
165-
setupLog.Info(fmt.Sprintf("Version: %+v", version.Get().String()))
166-
167-
// Initialize and parse command line flags.
168165
InitFlags(pflag.CommandLine)
169166
pflag.CommandLine.SetNormalizeFunc(cliflag.WordSepNormalizeFunc)
170167
pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
171168
// Set log level 2 as default.
172169
if err := pflag.CommandLine.Set("v", "2"); err != nil {
173-
setupLog.Error(err, "Failed to set default log level")
170+
fmt.Printf("Failed to set default log level: %v\n", err)
174171
os.Exit(1)
175172
}
176173
pflag.Parse()
@@ -179,7 +176,7 @@ func main() {
179176
// so klog will automatically use the right logger.
180177
// NOTE: klog is the log of choice of component-base machinery.
181178
if err := logsv1.ValidateAndApply(logOptions, nil); err != nil {
182-
setupLog.Error(err, "Unable to start extension")
179+
fmt.Printf("Unable to start manager: %v\n", err)
183180
os.Exit(1)
184181
}
185182

@@ -189,6 +186,9 @@ func main() {
189186
// requiring an addition log parameter in all the functions).
190187
ctrl.SetLogger(klog.Background())
191188

189+
// Note: setupLog can only be used after ctrl.SetLogger was called
190+
setupLog.Info(fmt.Sprintf("Version: %s (git commit: %s)", version.Get().String(), version.Get().GitCommit))
191+
192192
restConfig := ctrl.GetConfigOrDie()
193193
restConfig.QPS = restConfigQPS
194194
restConfig.Burst = restConfigBurst

‎test/infrastructure/docker/main.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,6 @@ func InitFlags(fs *pflag.FlagSet) {
210210
// +kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=devclustertemplates;devmachinetemplates,verbs=get;list;watch;patch;update
211211

212212
func main() {
213-
setupLog.Info(fmt.Sprintf("Version: %+v", version.Get().String()))
214-
215213
if _, err := os.ReadDir("/tmp/"); err != nil {
216214
setupLog.Error(err, "Unable to start manager")
217215
os.Exit(1)
@@ -222,19 +220,22 @@ func main() {
222220
pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
223221
// Set log level 2 as default.
224222
if err := pflag.CommandLine.Set("v", "2"); err != nil {
225-
setupLog.Error(err, "Failed to set default log level")
223+
fmt.Printf("Failed to set default log level: %v\n", err)
226224
os.Exit(1)
227225
}
228226
pflag.Parse()
229227

230228
if err := logsv1.ValidateAndApply(logOptions, nil); err != nil {
231-
setupLog.Error(err, "Unable to start manager")
229+
fmt.Printf("Unable to start manager: %v\n", err)
232230
os.Exit(1)
233231
}
234232

235233
// klog.Background will automatically use the right logger.
236234
ctrl.SetLogger(klog.Background())
237235

236+
// Note: setupLog can only be used after ctrl.SetLogger was called
237+
setupLog.Info(fmt.Sprintf("Version: %s (git commit: %s)", version.Get().String(), version.Get().GitCommit))
238+
238239
restConfig := ctrl.GetConfigOrDie()
239240
restConfig.QPS = restConfigQPS
240241
restConfig.Burst = restConfigBurst

0 commit comments

Comments
 (0)