github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 18:31:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #111454 from HecarimV/fix-log-capitalized

Browse Source 
cleanup: fix some error log capitalization
This commit is contained in:
Kubernetes Prow Robot 2022-07-29 09:59:23 -07:00 committed by GitHub
commit 5065f7296a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
staging/src/k8s.io/apimachinery/pkg/api/apitesting/naming/naming.go
View File

@ -39,7 +39,7 @@ func VerifyGroupNames(scheme *runtime.Scheme, legacyUnsuffixedGroups sets.String
errs := []error{} errs := []error{}
for _, gv := range scheme.PrioritizedVersionsAllGroups() { for _, gv := range scheme.PrioritizedVersionsAllGroups() {
if !strings.HasSuffix(gv.Group, ".k8s.io") && !legacyUnsuffixedGroups.Has(gv.Group) { if !strings.HasSuffix(gv.Group, ".k8s.io") && !legacyUnsuffixedGroups.Has(gv.Group) {
errs = append(errs, fmt.Errorf("Group %s does not have the standard kubernetes API group suffix of .k8s.io", gv.Group)) errs = append(errs, fmt.Errorf("group %s does not have the standard kubernetes API group suffix of .k8s.io", gv.Group))
} }
} }
return errors.NewAggregate(errs) return errors.NewAggregate(errs)
@ -91,14 +91,14 @@ func ensureNoTags(gvk schema.GroupVersionKind, tp reflect.Type, parents []reflec
jsonTag := f.Tag.Get("json") jsonTag := f.Tag.Get("json")
protoTag := f.Tag.Get("protobuf") protoTag := f.Tag.Get("protobuf")
if len(jsonTag) > 0 || len(protoTag) > 0 { if len(jsonTag) > 0 || len(protoTag) > 0 {
errs = append(errs, fmt.Errorf("Internal types should not have json or protobuf tags. %#v has tag on field %v: %v.\n%s", gvk, f.Name, f.Tag, fmtParentString(parents))) errs = append(errs, fmt.Errorf("internal types should not have json or protobuf tags. %#v has tag on field %v: %v.\n%s", gvk, f.Name, f.Tag, fmtParentString(parents)))
} }
errs = append(errs, ensureNoTags(gvk, f.Type, parents, typesAllowedTags)...) errs = append(errs, ensureNoTags(gvk, f.Type, parents, typesAllowedTags)...)
} }
default: default:
errs = append(errs, fmt.Errorf("Unexpected type %v in %#v.\n%s", tp.Kind(), gvk, fmtParentString(parents))) errs = append(errs, fmt.Errorf("unexpected type %v in %#v.\n%s", tp.Kind(), gvk, fmtParentString(parents)))
} }
return errs return errs
} }
@ -140,7 +140,7 @@ func ensureTags(gvk schema.GroupVersionKind, tp reflect.Type, parents []reflect.
} }
default: default:
errs = append(errs, fmt.Errorf("Unexpected type %v in %#v.\n%s", tp.Kind(), gvk, fmtParentString(parents))) errs = append(errs, fmt.Errorf("unexpected type %v in %#v.\n%s", tp.Kind(), gvk, fmtParentString(parents)))
} }
return errs return errs
} }

2
staging/src/k8s.io/apimachinery/pkg/runtime/codec_check.go
View File

@ -30,7 +30,7 @@ import (
// TODO: verify that the correct external version is chosen on encode... // TODO: verify that the correct external version is chosen on encode...
func CheckCodec(c Codec, internalType Object, externalTypes ...schema.GroupVersionKind) error { func CheckCodec(c Codec, internalType Object, externalTypes ...schema.GroupVersionKind) error {
if _, err := Encode(c, internalType); err != nil { if _, err := Encode(c, internalType); err != nil {
return fmt.Errorf("Internal type not encodable: %v", err) return fmt.Errorf("internal type not encodable: %v", err)
} }
for _, et := range externalTypes { for _, et := range externalTypes {
typeMeta := TypeMeta{ typeMeta := TypeMeta{

2
staging/src/k8s.io/apimachinery/pkg/util/jsonmergepatch/patch.go
View File

@ -74,7 +74,7 @@ func CreateThreeWayJSONMergePatch(original, modified, current []byte, fns ...mer
var patchMap map[string]interface{} var patchMap map[string]interface{}
err = json.Unmarshal(patch, &patchMap) err = json.Unmarshal(patch, &patchMap)
if err != nil { if err != nil {
return nil, fmt.Errorf("Failed to unmarshal patch for precondition check: %s", patch) return nil, fmt.Errorf("failed to unmarshal patch for precondition check: %s", patch)
} }
meetPreconditions, err := meetPreconditions(patchMap, fns...) meetPreconditions, err := meetPreconditions(patchMap, fns...)
if err != nil { if err != nil {

2
staging/src/k8s.io/apimachinery/pkg/util/net/interface.go
View File

@ -339,7 +339,7 @@ func chooseIPFromHostInterfaces(nw networkInterfacer, addressFamilies AddressFam
for _, addr := range addrs { for _, addr := range addrs {
ip, _, err := netutils.ParseCIDRSloppy(addr.String()) ip, _, err := netutils.ParseCIDRSloppy(addr.String())
if err != nil { if err != nil {
return nil, fmt.Errorf("Unable to parse CIDR for interface %q: %s", intf.Name, err) return nil, fmt.Errorf("unable to parse CIDR for interface %q: %s", intf.Name, err)
} }
if !memberOf(ip, family) { if !memberOf(ip, family) {
klog.V(4).Infof("Skipping: no address family match for %q on interface %q.", ip, intf.Name) klog.V(4).Infof("Skipping: no address family match for %q on interface %q.", ip, intf.Name)