Fix nil pointer dereference when setting sync timestamp

cblecker · cblecker · commit f19240a47447 · 2019-08-28T11:00:24.000-07:00
diff --git a/pkg/controller/velero/s3.go b/pkg/controller/velero/s3.go
@@ -6,6 +6,7 @@ import (
 
 	veleroCR "github.com/openshift/managed-velero-operator/pkg/apis/managed/v1alpha1"
 	"github.com/openshift/managed-velero-operator/pkg/s3"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/go-logr/logr"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
@@ -115,7 +116,9 @@ func (r *ReconcileVelero) provisionS3(reqLogger logr.Logger, s3Client *awss3.S3,
 	}
 
 	instance.Status.S3Bucket.Provisioned = true
-	instance.Status.S3Bucket.LastSyncTimestamp.Time = time.Now()
+	instance.Status.S3Bucket.LastSyncTimestamp = &metav1.Time{
+		Time: time.Now(),
+	}
 	return reconcile.Result{}, r.statusUpdate(reqLogger, instance)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import (`
`6`	`6`
`7`	`7`	`veleroCR "github.com/openshift/managed-velero-operator/pkg/apis/managed/v1alpha1"`
`8`	`8`	`"github.com/openshift/managed-velero-operator/pkg/s3"`
	`9`	`+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`9`	`10`
`10`	`11`	`"github.com/go-logr/logr"`
`11`	`12`	`"sigs.k8s.io/controller-runtime/pkg/reconcile"`
`@@ -115,7 +116,9 @@ func (r ReconcileVelero) provisionS3(reqLogger logr.Logger, s3Client awss3.S3,`
`115`	`116`	`}`
`116`	`117`
`117`	`118`	`instance.Status.S3Bucket.Provisioned = true`
`118`		`- instance.Status.S3Bucket.LastSyncTimestamp.Time = time.Now()`
	`119`	`+ instance.Status.S3Bucket.LastSyncTimestamp = &metav1.Time{`
	`120`	`+ Time: time.Now(),`
	`121`	`+ }`
`119`	`122`	`return reconcile.Result{}, r.statusUpdate(reqLogger, instance)`
`120`	`123`	`}`
`121`	`124`