Skip to content

Commit d12f4b4

Browse files
prafull01prafull01
authored
Add human readble timestamp format in operator logs (#1114)
1 parent 5a36c88 commit d12f4b4

File tree

11 files changed

+49
-6
lines changed

11 files changed

+49
-6
lines changed

‎cmd/cockroach-operator/BUILD.bazel‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ go_library(
4646
"@io_k8s_sigs_controller_runtime//pkg/log/zap:go_default_library",
4747
"@io_k8s_sigs_controller_runtime//pkg/metrics/server:go_default_library",
4848
"@io_k8s_sigs_controller_runtime//pkg/webhook:go_default_library",
49+
"@org_uber_go_zap//zapcore:go_default_library",
4950
],
5051
)
5152

@@ -120,3 +121,9 @@ filegroup(
120121
tags = ["automanaged"],
121122
visibility = ["//visibility:public"],
122123
)
124+
125+
go_binary(
126+
name = "cockroach-operator",
127+
embed = [":go_default_library"],
128+
visibility = ["//visibility:public"],
129+
)

‎cmd/cockroach-operator/main.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3434
"sigs.k8s.io/controller-runtime/pkg/metrics/server"
3535
"sigs.k8s.io/controller-runtime/pkg/webhook"
36+
"go.uber.org/zap/zapcore"
3637
)
3738

3839
const (
@@ -57,7 +58,9 @@ func main() {
5758
var err error
5859

5960
// use zap logging cli options
60-
opts := zap.Options{}
61+
opts := zap.Options{
62+
TimeEncoder: zapcore.RFC3339TimeEncoder,
63+
}
6164
opts.BindFlags(flag.CommandLine)
6265

6366
flag.StringVar(&metricsAddr, "metrics-addr", ":8080", "The address the metric endpoint binds to.")

‎config/manager/patches/image.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,8 @@ spec:
278278
value: cockroachdb/cockroach:v24.1.18
279279
- name: RELATED_IMAGE_COCKROACH_v24_1_19
280280
value: cockroachdb/cockroach:v24.1.19
281+
- name: RELATED_IMAGE_COCKROACH_v24_1_20
282+
value: cockroachdb/cockroach:v24.1.20
281283
- name: RELATED_IMAGE_COCKROACH_v24_2_0
282284
value: cockroachdb/cockroach:v24.2.0
283285
- name: RELATED_IMAGE_COCKROACH_v24_2_2
@@ -338,7 +340,11 @@ spec:
338340
value: cockroachdb/cockroach:v25.1.6
339341
- name: RELATED_IMAGE_COCKROACH_v25_1_7
340342
value: cockroachdb/cockroach:v25.1.7
343+
- name: RELATED_IMAGE_COCKROACH_v25_1_8
344+
value: cockroachdb/cockroach:v25.1.8
341345
- name: RELATED_IMAGE_COCKROACH_v25_2_0
342346
value: cockroachdb/cockroach:v25.2.0
343347
- name: RELATED_IMAGE_COCKROACH_v25_2_1
344348
value: cockroachdb/cockroach:v25.2.1
349+
- name: RELATED_IMAGE_COCKROACH_v25_2_2
350+
value: cockroachdb/cockroach:v25.2.2

‎config/manifests/bases/cockroach-operator.clusterserviceversion.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,8 @@ spec:
451451
name: RELATED_IMAGE_COCKROACH_v24_1_18
452452
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:68fe64fe3e112288ccfc2a7dffd69b9b2786a5da3d3bdedd6addf41659d460c9
453453
name: RELATED_IMAGE_COCKROACH_v24_1_19
454+
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1a6e2fe24ad52913e2160f85b9fe665a4e4c4d79b164b4b899f69dd9d92f999e
455+
name: RELATED_IMAGE_COCKROACH_v24_1_20
454456
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cad60044ad6573bd80b65e892a9ec0510dbe4fcbbfc6b51010ecf419f56f1024
455457
name: RELATED_IMAGE_COCKROACH_v24_2_0
456458
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:08cec123813304ab03bd66d72a09949667a874a42320bedafda391ebcdb2e56c
@@ -511,10 +513,14 @@ spec:
511513
name: RELATED_IMAGE_COCKROACH_v25_1_6
512514
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cc20270212f01fc231ff788e20b0476b8228c440bfc40430c0836d5eb702a042
513515
name: RELATED_IMAGE_COCKROACH_v25_1_7
516+
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e18d73af3257c8cdf00245f2f718b56667524c1cc69d3db28e9b868a539ae16f
517+
name: RELATED_IMAGE_COCKROACH_v25_1_8
514518
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:c74cf927a2b2c5098ad74ad0880996f8b042186a9911d888a231ef5b9e2a0715
515519
name: RELATED_IMAGE_COCKROACH_v25_2_0
516520
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:3b78a4d3864e16d270979d9d7756012abf09e6cdb7f1eb4832f6497c26281099
517521
name: RELATED_IMAGE_COCKROACH_v25_2_1
522+
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f42fa22aac3cc41ce72e144a72530ffbee765a392b24593dafd06cc098f8410b
523+
name: RELATED_IMAGE_COCKROACH_v25_2_2
518524
- image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER
519525
name: RELATED_IMAGE_COCKROACH_OPERATOR
520526
version: 0.0.0

‎config/manifests/patches/deployment_patch.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,8 @@ spec:
287287
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:8f1f2fd1aca914a1ef007117c85ac944055bbfb873a468a7374d239ef20b065e
288288
- name: RELATED_IMAGE_COCKROACH_v24_1_19
289289
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:68fe64fe3e112288ccfc2a7dffd69b9b2786a5da3d3bdedd6addf41659d460c9
290+
- name: RELATED_IMAGE_COCKROACH_v24_1_20
291+
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1a6e2fe24ad52913e2160f85b9fe665a4e4c4d79b164b4b899f69dd9d92f999e
290292
- name: RELATED_IMAGE_COCKROACH_v24_2_0
291293
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cad60044ad6573bd80b65e892a9ec0510dbe4fcbbfc6b51010ecf419f56f1024
292294
- name: RELATED_IMAGE_COCKROACH_v24_2_2
@@ -347,10 +349,14 @@ spec:
347349
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e8f26fd132affbaeb8ef6b1807a646c83b301e5dc334a592dfb2cf8dc3dbaf10
348350
- name: RELATED_IMAGE_COCKROACH_v25_1_7
349351
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cc20270212f01fc231ff788e20b0476b8228c440bfc40430c0836d5eb702a042
352+
- name: RELATED_IMAGE_COCKROACH_v25_1_8
353+
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e18d73af3257c8cdf00245f2f718b56667524c1cc69d3db28e9b868a539ae16f
350354
- name: RELATED_IMAGE_COCKROACH_v25_2_0
351355
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:c74cf927a2b2c5098ad74ad0880996f8b042186a9911d888a231ef5b9e2a0715
352356
- name: RELATED_IMAGE_COCKROACH_v25_2_1
353357
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:3b78a4d3864e16d270979d9d7756012abf09e6cdb7f1eb4832f6497c26281099
358+
- name: RELATED_IMAGE_COCKROACH_v25_2_2
359+
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f42fa22aac3cc41ce72e144a72530ffbee765a392b24593dafd06cc098f8410b
354360
- name: RELATED_IMAGE_COCKROACH_OPERATOR
355361
value: RH_COCKROACH_OP_IMAGE_PLACEHOLDER
356362
image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER

‎config/samples/crdb-tls-example.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ kind: CrdbCluster
1919
metadata:
2020
name: crdb-tls-example
2121
spec:
22-
cockroachDBVersion: v25.2.1
22+
cockroachDBVersion: v25.2.2
2323
dataStore:
2424
pvc:
2525
spec:

‎crdb-versions.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,9 @@ CrdbVersions:
400400
- image: cockroachdb/cockroach:v24.1.19
401401
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:68fe64fe3e112288ccfc2a7dffd69b9b2786a5da3d3bdedd6addf41659d460c9
402402
tag: v24.1.19
403+
- image: cockroachdb/cockroach:v24.1.20
404+
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1a6e2fe24ad52913e2160f85b9fe665a4e4c4d79b164b4b899f69dd9d92f999e
405+
tag: v24.1.20
403406
- image: cockroachdb/cockroach:v24.2.0
404407
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cad60044ad6573bd80b65e892a9ec0510dbe4fcbbfc6b51010ecf419f56f1024
405408
tag: v24.2.0
@@ -490,9 +493,15 @@ CrdbVersions:
490493
- image: cockroachdb/cockroach:v25.1.7
491494
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cc20270212f01fc231ff788e20b0476b8228c440bfc40430c0836d5eb702a042
492495
tag: v25.1.7
496+
- image: cockroachdb/cockroach:v25.1.8
497+
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e18d73af3257c8cdf00245f2f718b56667524c1cc69d3db28e9b868a539ae16f
498+
tag: v25.1.8
493499
- image: cockroachdb/cockroach:v25.2.0
494500
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:c74cf927a2b2c5098ad74ad0880996f8b042186a9911d888a231ef5b9e2a0715
495501
tag: v25.2.0
496502
- image: cockroachdb/cockroach:v25.2.1
497503
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:3b78a4d3864e16d270979d9d7756012abf09e6cdb7f1eb4832f6497c26281099
498504
tag: v25.2.1
505+
- image: cockroachdb/cockroach:v25.2.2
506+
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f42fa22aac3cc41ce72e144a72530ffbee765a392b24593dafd06cc098f8410b
507+
tag: v25.2.2

‎examples/client-secure-operator.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
serviceAccountName: cockroachdb-sa
2424
containers:
2525
- name: cockroachdb-client-secure
26-
image: cockroachdb/cockroach:v25.2.1
26+
image: cockroachdb/cockroach:v25.2.2
2727
imagePullPolicy: IfNotPresent
2828
volumeMounts:
2929
- name: client-certs

‎examples/example.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ spec:
4040
memory: 8Gi
4141
tlsEnabled: true
4242
# You can set either a version of the db or a specific image name
43-
# cockroachDBVersion: v25.2.1
43+
# cockroachDBVersion: v25.2.2
4444
image:
45-
name: cockroachdb/cockroach:v25.2.1
45+
name: cockroachdb/cockroach:v25.2.2
4646
# nodes refers to the number of crdb pods that are created
4747
# via the statefulset
4848
nodes: 3

‎examples/smoketest.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@ spec:
3939
memory: 300Mi
4040
tlsEnabled: true
4141
image:
42-
name: cockroachdb/cockroach:v25.2.1
42+
name: cockroachdb/cockroach:v25.2.2
4343
nodes: 3

0 commit comments

Comments
 (0)