fix some comments

Signed-off-by: cui fliter <imcusg@gmail.com>
pull/3830/head
cui fliter 2 years ago committed by Hidde Beydals
parent f9be835288
commit 3edfff49a2

@ -134,7 +134,7 @@ func bootstrapGitCmdRun(cmd *cobra.Command, args []string) error {
} }
} }
if repositoryURL.Scheme == string(git.HTTPS) && !bootstrapArgs.tokenAuth { if repositoryURL.Scheme == string(git.HTTPS) && !bootstrapArgs.tokenAuth {
return fmt.Errorf("--token-auth=true must be specified for using a HTTPS AWS CodeCommit url") return fmt.Errorf("--token-auth=true must be specified for using an HTTPS AWS CodeCommit url")
} }
} }

@ -419,7 +419,7 @@ func maskSopsData(res *resource.Resource) error {
res.PipeE(yaml.FieldClearer{Name: "sops"}) res.PipeE(yaml.FieldClearer{Name: "sops"})
secretType, err := res.GetFieldValue(typeField) secretType, err := res.GetFieldValue(typeField)
// If the intented type is Opaque, then it can be omitted from the manifest, since it's the default // If the intended type is Opaque, then it can be omitted from the manifest, since it's the default
// Ref: https://kubernetes.io/docs/concepts/configuration/secret/#opaque-secrets // Ref: https://kubernetes.io/docs/concepts/configuration/secret/#opaque-secrets
if errors.As(err, &yaml.NoFieldError{}) { if errors.As(err, &yaml.NoFieldError{}) {
secretType = "Opaque" secretType = "Opaque"

@ -34,7 +34,7 @@ type Manifest struct {
Content string Content string
} }
// WriteFile writes the YAML content to a file inside the the root path. // WriteFile writes the YAML content to a file inside the root path.
// If the file does not exist, WriteFile creates it with permissions perm, // If the file does not exist, WriteFile creates it with permissions perm,
// otherwise WriteFile overwrites the file, without changing permissions. // otherwise WriteFile overwrites the file, without changing permissions.
func (m *Manifest) WriteFile(rootDir string) (string, error) { func (m *Manifest) WriteFile(rootDir string) (string, error) {

@ -284,7 +284,7 @@ algorithm.
#### Backwards compatibility #### Backwards compatibility
To allow backwards compatability in the notification-controller, Flux CLI and To allow backwards compatibility in the notification-controller, Flux CLI and
other applicable components, the `Revision` new field value format could be other applicable components, the `Revision` new field value format could be
detected by the presence of the `@` or `:` characters. Falling back to their detected by the presence of the `@` or `:` characters. Falling back to their
current behaviour if not present, phasing out the old format in a future current behaviour if not present, phasing out the old format in a future
@ -344,7 +344,7 @@ future release. The `Digest` field MUST be used instead.
#### Backwards compatibility #### Backwards compatibility
To allow backwards compatability, the source-controller could continue To allow backwards compatibility, the source-controller could continue
to advertise the checksum part of a `Digest` in the `Checksum` field until to advertise the checksum part of a `Digest` in the `Checksum` field until
the field is removed. the field is removed.

@ -51,7 +51,7 @@ you're proposing, but should not include things like API designs or
implementation. implementation.
If the RFC goal is to document best practices, If the RFC goal is to document best practices,
then this section can be replaced with the the actual documentation. then this section can be replaced with the actual documentation.
--> -->
### User Stories ### User Stories

@ -182,7 +182,7 @@ patchesStrategicMerge:
files["clusters/e2e/flux-system/gotk-sync.yaml"] = strings.NewReader("") files["clusters/e2e/flux-system/gotk-sync.yaml"] = strings.NewReader("")
err = commitAndPushAll(repo, files, defaultBranch) err = commitAndPushAll(repo, files, defaultBranch)
if err != nil { if err != nil {
return fmt.Errorf("error commiting and pushing manifests: %w", err) return fmt.Errorf("error committing and pushing manifests: %w", err)
} }
bootstrapCmd := fmt.Sprintf("flux bootstrap git --url=%s --password=%s --kubeconfig=%s"+ bootstrapCmd := fmt.Sprintf("flux bootstrap git --url=%s --password=%s --kubeconfig=%s"+

Loading…
Cancel
Save