Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: wrong annotation in function #10923

Merged
merged 1 commit into from
Oct 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions util/gpg/gpg.go
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ func IsGPGEnabled() bool {
return true
}

// InitializePGP will initialize a GnuPG working directory and also create a
// InitializeGnuPG will initialize a GnuPG working directory and also create a
// transient private key so that the trust DB will work correctly.
func InitializeGnuPG() error {

Expand Down Expand Up @@ -309,7 +309,7 @@ func ImportPGPKeysFromString(keyData string) ([]*appsv1.GnuPGPublicKey, error) {
return ImportPGPKeys(f.Name())
}

// ImportPGPKey imports one or more keys from a file into the local keyring and optionally
// ImportPGPKeys imports one or more keys from a file into the local keyring and optionally
// signs them with the transient private key for leveraging the trust DB.
func ImportPGPKeys(keyFile string) ([]*appsv1.GnuPGPublicKey, error) {
keys := make([]*appsv1.GnuPGPublicKey, 0)
Expand Down Expand Up @@ -394,7 +394,7 @@ func ValidatePGPKeys(keyFile string) (map[string]*appsv1.GnuPGPublicKey, error)
return keys, nil
}

// SetPGPTrustLevel sets the given trust level on keys with specified key IDs
// SetPGPTrustLevelById sets the given trust level on keys with specified key IDs
func SetPGPTrustLevelById(kids []string, trustLevel string) error {
keys := make([]*appsv1.GnuPGPublicKey, 0)
for _, kid := range kids {
Expand Down Expand Up @@ -581,7 +581,7 @@ func GetInstalledPGPKeys(kids []string) ([]*appsv1.GnuPGPublicKey, error) {
return keys, nil
}

// ParsePGPCommitSignature parses the output of "git verify-commit" and returns the result
// ParseGitCommitVerification parses the output of "git verify-commit" and returns the result
func ParseGitCommitVerification(signature string) PGPVerifyResult {
result := PGPVerifyResult{Result: VerifyResultUnknown}
parseOk := false
Expand Down
2 changes: 1 addition & 1 deletion util/kube/kube.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func SetAppInstanceLabel(target *unstructured.Unstructured, key, val string) err
return nil
}

// SetAppInstanceLabel the recommended app.kubernetes.io/instance annotation against an unstructured object
// SetAppInstanceAnnotation the recommended app.kubernetes.io/instance annotation against an unstructured object
// Uses the legacy labeling if environment variable is set
func SetAppInstanceAnnotation(target *unstructured.Unstructured, key, val string) error {
annotations := target.GetAnnotations()
Expand Down
2 changes: 1 addition & 1 deletion util/kube/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ type kubeUtil struct {
// secret was created by the caller, or false if it has existed before.
type updateFn func(s *apiv1.Secret, new bool) error

// NewUtil returns a new kubeUtil receiver
// NewKubeUtil NewUtil returns a new kubeUtil receiver
func NewKubeUtil(client kubernetes.Interface, ctx context.Context) *kubeUtil {
return &kubeUtil{client: client, ctx: ctx}
}
Expand Down