rebase LwM2M pingInterval update to main (#1064)

Edgenesis · Dec 3, 2024 · 539475c · 539475c
1 parent 8510408
commit 539475c
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 4 deletions.
diff --git a/pkg/gateway/lwm2m/gatewaylwm2m.go b/pkg/gateway/lwm2m/gatewaylwm2m.go
@@ -25,14 +25,14 @@ const (
 	ConfigmapInstructionsStr = "instructions"
 	ObjectIdStr              = "ObjectId"
 	DataTypeStr              = "DataType"
-
-	pingIntervalSec = 10
 )
 
 type Gateway struct {
 	client     *lwm2mclient.Client
 	k8sClient  *rest.RESTClient
 	edgeDevice *v1alpha1.EdgeDevice
+
+	pingIntervalSec int64
 }
 
 func New() (*Gateway, error) {
@@ -68,6 +68,8 @@ func New() (*Gateway, error) {
 		return nil, err
 	}
 
+	gateway.pingIntervalSec = edgedevice.Spec.GatewaySettings.LwM2MSetting.PingIntervalSec
+
 	return gateway, nil
 }
 
@@ -160,8 +162,8 @@ func (g *Gateway) Start() error {
 		return err
 	}
 
-	// Ping the client every 10 seconds
-	t := time.NewTicker(time.Second * pingIntervalSec)
+	// Ping the client every pingIntervalSec seconds, by default 30 seconds
+	t := time.NewTicker(time.Second * time.Duration(g.pingIntervalSec))
 	for range t.C {
 		if err := g.client.Ping(); err != nil {
 			logger.Errorf("Error pinging client: %v", err)

diff --git a/pkg/k8s/api/v1alpha1/edgedevice_types.go b/pkg/k8s/api/v1alpha1/edgedevice_types.go
@@ -112,6 +112,9 @@ type LwM2MSetting struct {
 	CipherSuites []CipherSuite `json:"cipherSuites,omitempty"`
 	PSKIdentity  *string       `json:"pskIdentity,omitempty"`
 	PSKKey       *string       `json:"pskKey,omitempty"`
+
+	// +kubebuilder:default=30
+	PingIntervalSec int64 `json:"pingIntervalSec,omitempty"`
 }
 
 type CipherSuite string

diff --git a/pkg/k8s/crd/config/edgedevice/bases/shifu.edgenesis.io_edgedevices.yaml b/pkg/k8s/crd/config/edgedevice/bases/shifu.edgenesis.io_edgedevices.yaml
@@ -63,6 +63,10 @@ spec:
                         type: string
                       endpointName:
                         type: string
+                      pingIntervalSec:
+                        default: 30
+                        format: int64
+                        type: integer
                       pskIdentity:
                         type: string
                       pskKey:
@@ -95,6 +99,10 @@ spec:
                         type: string
                       endpointName:
                         type: string
+                      pingIntervalSec:
+                        default: 30
+                        format: int64
+                        type: integer
                       pskIdentity:
                         type: string
                       pskKey:

diff --git a/pkg/k8s/crd/install/config_crd.yaml b/pkg/k8s/crd/install/config_crd.yaml
@@ -62,6 +62,10 @@ spec:
                         type: string
                       endpointName:
                         type: string
+                      pingIntervalSec:
+                        default: 30
+                        format: int64
+                        type: integer
                       pskIdentity:
                         type: string
                       pskKey:
@@ -94,6 +98,10 @@ spec:
                         type: string
                       endpointName:
                         type: string
+                      pingIntervalSec:
+                        default: 30
+                        format: int64
+                        type: integer
                       pskIdentity:
                         type: string
                       pskKey:

diff --git a/pkg/k8s/crd/install/config_default.yaml b/pkg/k8s/crd/install/config_default.yaml
@@ -69,6 +69,10 @@ spec:
                         type: string
                       endpointName:
                         type: string
+                      pingIntervalSec:
+                        default: 30
+                        format: int64
+                        type: integer
                       pskIdentity:
                         type: string
                       pskKey:
@@ -101,6 +105,10 @@ spec:
                         type: string
                       endpointName:
                         type: string
+                      pingIntervalSec:
+                        default: 30
+                        format: int64
+                        type: integer
                       pskIdentity:
                         type: string
                       pskKey:

diff --git a/pkg/k8s/crd/install/shifu_install.yml b/pkg/k8s/crd/install/shifu_install.yml
@@ -69,6 +69,10 @@ spec:
                         type: string
                       endpointName:
                         type: string
+                      pingIntervalSec:
+                        default: 30
+                        format: int64
+                        type: integer
                       pskIdentity:
                         type: string
                       pskKey:
@@ -101,6 +105,10 @@ spec:
                         type: string
                       endpointName:
                         type: string
+                      pingIntervalSec:
+                        default: 30
+                        format: int64
+                        type: integer
                       pskIdentity:
                         type: string
                       pskKey: