diff options
| author | cl2017 <chenlin.liu@daocloud.io> | 2023-04-25 19:50:54 +0800 |
|---|---|---|
| committer | cl2017 <chenlin.liu@daocloud.io> | 2023-05-31 15:56:52 +0800 |
| commit | 71c4b3ddb3ea287f5274932b41bcfc8e6ce7acce (patch) | |
| tree | 2e7123a41db267122aa06d61bcf8629c009b2f18 | |
| parent | Merge pull request #4689 from lishaokai1995/master (diff) | |
| download | kubeedge-71c4b3ddb3ea287f5274932b41bcfc8e6ce7acce.tar.gz | |
fix grammar error
Signed-off-by: cl2017 <chenlin.liu@daocloud.io>
| -rw-r--r-- | .golangci.yml | 2 | ||||
| -rw-r--r-- | build/cloud/ha/01-ha-prepare.yaml | 2 | ||||
| -rw-r--r-- | build/crds/devices/devices_v1alpha2_device.yaml | 2 | ||||
| -rw-r--r-- | cloud/pkg/devicecontroller/types/deviceprofile.go | 2 | ||||
| -rw-r--r-- | docs/proposals/device-management-enhance.md | 2 | ||||
| -rw-r--r-- | keadm/cmd/keadm/app/cmd/util/common.go | 6 | ||||
| -rw-r--r-- | manifests/charts/cloudcore/crds/devices_v1alpha2_device.yaml | 2 | ||||
| -rw-r--r-- | pkg/apis/devices/v1alpha2/device_instance_types.go | 4 | ||||
| -rw-r--r-- | staging/src/github.com/kubeedge/beehive/pkg/core/core.go | 2 |
9 files changed, 12 insertions, 12 deletions
diff --git a/.golangci.yml b/.golangci.yml index 3ea2969b4..0d3854b1e 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -3,7 +3,7 @@ # options for analysis running run: - # default concurrency is a available CPU number + # default concurrency is an available CPU number concurrency: 4 # timeout for analysis, e.g. 30s, 5m, default is 1m diff --git a/build/cloud/ha/01-ha-prepare.yaml b/build/cloud/ha/01-ha-prepare.yaml index a469a2a73..1dea583f7 100644 --- a/build/cloud/ha/01-ha-prepare.yaml +++ b/build/cloud/ha/01-ha-prepare.yaml @@ -545,7 +545,7 @@ spec: properties: twins: description: 'A list of device twins containing desired/reported desired/reported - values of twin properties.. Optional: A passive device won''t have + values of twin properties. Optional: A passive device won''t have twin properties and this list could be empty.' items: description: Twin provides a logical representation of control properties diff --git a/build/crds/devices/devices_v1alpha2_device.yaml b/build/crds/devices/devices_v1alpha2_device.yaml index 313df0991..3da933b9a 100644 --- a/build/crds/devices/devices_v1alpha2_device.yaml +++ b/build/crds/devices/devices_v1alpha2_device.yaml @@ -471,7 +471,7 @@ spec: properties: twins: description: 'A list of device twins containing desired/reported desired/reported - values of twin properties.. Optional: A passive device won''t have + values of twin properties. Optional: A passive device won''t have twin properties and this list could be empty.' items: description: Twin provides a logical representation of control properties diff --git a/cloud/pkg/devicecontroller/types/deviceprofile.go b/cloud/pkg/devicecontroller/types/deviceprofile.go index 4a7dbb67f..b786918be 100644 --- a/cloud/pkg/devicecontroller/types/deviceprofile.go +++ b/cloud/pkg/devicecontroller/types/deviceprofile.go @@ -24,7 +24,7 @@ type DeviceInstance struct { Protocol string `json:"protocol,omitempty"` // Model is deviceInstance model name Model string `json:"model,omitempty"` - // A list of device twins containing desired/reported desired/reported values of twin properties.. + // A list of device twins containing desired/reported desired/reported values of twin properties. // Optional: A passive device won't have twin properties and this list could be empty. // +optional Twins []v1alpha2.Twin `json:"twins,omitempty"` diff --git a/docs/proposals/device-management-enhance.md b/docs/proposals/device-management-enhance.md index 439bb4994..5264cd312 100644 --- a/docs/proposals/device-management-enhance.md +++ b/docs/proposals/device-management-enhance.md @@ -318,7 +318,7 @@ type DeviceInstance struct { Protocol string `json:"protocol,omitempty"` // Model is deviceInstance model name Model string `json:"model,omitempty"` - // A list of device twins containing desired/reported desired/reported values of twin properties.. + // A list of device twins containing desired/reported desired/reported values of twin properties. // Optional: A passive device won't have twin properties and this list could be empty. // +optional Twins []v1alpha2.Twin `json:"twins,omitempty"` diff --git a/keadm/cmd/keadm/app/cmd/util/common.go b/keadm/cmd/keadm/app/cmd/util/common.go index c62a1d3f5..e3f1eec4d 100644 --- a/keadm/cmd/keadm/app/cmd/util/common.go +++ b/keadm/cmd/keadm/app/cmd/util/common.go @@ -46,7 +46,7 @@ import ( ) var ( - kubeReleaseRegex = regexp.MustCompile(`^v?(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)([-0-9a-zA-Z_\.+]*)?$`) + kubeReleaseRegex = regexp.MustCompile(`^v?(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)([-\w.+]*)?$`) ) // Constants used by installers @@ -379,7 +379,7 @@ func installKubeEdge(options types.InstallOptions, version semver.Version) error } //Check if the same version exists, then skip the download and just checksum for it - //and if checksum failed, there will be a option to choose to continue to untar or quit. + //and if checksum failed, there will be an option to choose to continue to untar or quit. //checksum available at download URL. So that both can be compared to see if //proper download has happened and then only proceed further. //Currently it is missing and once checksum is in place, checksum check required @@ -723,7 +723,7 @@ func Compress(tarName string, paths []string) error { if err := tw.WriteHeader(hdr); err != nil { return err } - // if path is a dir, dont continue + // if path is a dir, don't continue if finfo.Mode().IsDir() { return nil } diff --git a/manifests/charts/cloudcore/crds/devices_v1alpha2_device.yaml b/manifests/charts/cloudcore/crds/devices_v1alpha2_device.yaml index 313df0991..3da933b9a 100644 --- a/manifests/charts/cloudcore/crds/devices_v1alpha2_device.yaml +++ b/manifests/charts/cloudcore/crds/devices_v1alpha2_device.yaml @@ -471,7 +471,7 @@ spec: properties: twins: description: 'A list of device twins containing desired/reported desired/reported - values of twin properties.. Optional: A passive device won''t have + values of twin properties. Optional: A passive device won''t have twin properties and this list could be empty.' items: description: Twin provides a logical representation of control properties diff --git a/pkg/apis/devices/v1alpha2/device_instance_types.go b/pkg/apis/devices/v1alpha2/device_instance_types.go index 5ddcb2c84..b1425d787 100644 --- a/pkg/apis/devices/v1alpha2/device_instance_types.go +++ b/pkg/apis/devices/v1alpha2/device_instance_types.go @@ -168,7 +168,7 @@ type ProtocolConfigCustomized struct { // DeviceStatus reports the device state and the desired/reported values of twin attributes. type DeviceStatus struct { - // A list of device twins containing desired/reported desired/reported values of twin properties.. + // A list of device twins containing desired/reported desired/reported values of twin properties. // Optional: A passive device won't have twin properties and this list could be empty. // +optional Twins []Twin `json:"twins,omitempty"` @@ -201,7 +201,7 @@ type TwinProperty struct { } // DeviceData reports the device's time-series data to edge MQTT broker. -// These data should not be processed by edgecore. Instead, they can be process by +// These data should not be processed by edgecore. Instead, they can be processed by // third-party data-processing apps like EMQX kuiper. type DeviceData struct { // Required: A list of data properties, which are not required to be processed by edgecore diff --git a/staging/src/github.com/kubeedge/beehive/pkg/core/core.go b/staging/src/github.com/kubeedge/beehive/pkg/core/core.go index 0ff8b53ff..941e29da7 100644 --- a/staging/src/github.com/kubeedge/beehive/pkg/core/core.go +++ b/staging/src/github.com/kubeedge/beehive/pkg/core/core.go @@ -13,7 +13,7 @@ import ( // StartModules starts modules that are registered func StartModules() { - // only register channel mode, if want to use socket mode, we should also pass in common.MsgCtxTypeUS parameter + // only register channel mode, if we want to use socket mode, we should also pass in common.MsgCtxTypeUS parameter beehiveContext.InitContext([]string{common.MsgCtxTypeChannel}) modules := GetModules() |
