Merge pull request #32 from vanus-labs/panic

fix: upgrade operator panic
vanus-labs · Mar 20, 2023 · f991697 · f991697
2 parents df5dbb9 + f7de9eb
commit f991697
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/controllers/connector_controller.go b/controllers/connector_controller.go
@@ -363,6 +363,9 @@ func (r *ConnectorReconciler) generateIngressForConnector(connector *vanusv1alph
 }
 
 func ExplicitConnectorAnnotations(connector *vanusv1alpha1.Connector) {
+	if connector.Annotations == nil {
+		connector.Annotations = make(map[string]string)
+	}
 	ExplicitConectorAnnotationWithDefaultValue(connector, cons.ConnectorDeploymentReplicasAnnotation, fmt.Sprintf("%d", cons.DefaultConnectorReplicas))
 	ExplicitConectorAnnotationWithDefaultValue(connector, cons.ConnectorServiceTypeAnnotation, cons.DefaultConnectorServiceType)
 	ExplicitConectorAnnotationWithDefaultValue(connector, cons.ConnectorServicePortAnnotation, fmt.Sprintf("%d", cons.DefaultConnectorServicePort))

diff --git a/controllers/core_controller.go b/controllers/core_controller.go
@@ -121,6 +121,9 @@ func (r *CoreReconciler) SetupWithManager(mgr ctrl.Manager) error {
 }
 
 func ExplicitCoreAnnotations(core *vanusv1alpha1.Core) {
+	if core.Annotations == nil {
+		core.Annotations = make(map[string]string)
+	}
 	ExplicitCoreAnnotationWithDefaultValue(core, cons.CoreComponentEtcdPortClientAnnotation, fmt.Sprintf("%d", cons.DefaultEtcdPortClient))
 	ExplicitCoreAnnotationWithDefaultValue(core, cons.CoreComponentEtcdPortPeerAnnotation, fmt.Sprintf("%d", cons.DefaultEtcdPortPeer))
 	ExplicitCoreAnnotationWithDefaultValue(core, cons.CoreComponentEtcdStorageSizeAnnotation, cons.DefaultEtcdStorageSize)