opensource/flux2
1
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2025-11-02 10:48:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3830 from cuishuang/main

Browse Source 
misc: fix some comments
This commit is contained in:
Max Jonas Werner
2023-05-02 08:34:29 +02:00
committed by GitHub
parent f9be835288 3edfff49a2
commit c0c76da4c8
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/flux/bootstrap_git.go
View File

@ -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")
} }
} }

2
internal/build/build.go
View File

@ -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"

2
pkg/manifestgen/manifest.go
View File

@ -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) {

4
rfcs/0005-artifact-revision-and-digest/README.md
View File

@ -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.

2
rfcs/RFC-0000/README.md
View File

@ -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

2
tests/azure/util_test.go
View File

@ -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"+