Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
flux2
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GitHub Mirror
fluxcd
flux2
Commits
1fda202c
Commit
1fda202c
authored
3 years ago
by
cuishuang
Browse files
Options
Downloads
Patches
Plain Diff
all: fix some typos
Signed-off-by:
cuishuang
<
imcusg@gmail.com
>
parent
7e634c15
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
cmd/flux/create_source_git.go
+1
-1
1 addition, 1 deletion
cmd/flux/create_source_git.go
cmd/flux/main_test.go
+1
-1
1 addition, 1 deletion
cmd/flux/main_test.go
pkg/manifestgen/install/manifests.go
+1
-1
1 addition, 1 deletion
pkg/manifestgen/install/manifests.go
with
3 additions
and
3 deletions
cmd/flux/create_source_git.go
+
1
−
1
View file @
1fda202c
...
@@ -169,7 +169,7 @@ func createSourceGitCmdRun(cmd *cobra.Command, args []string) error {
...
@@ -169,7 +169,7 @@ func createSourceGitCmdRun(cmd *cobra.Command, args []string) error {
}
}
if
sourceGitArgs
.
caFile
!=
""
&&
u
.
Scheme
==
"ssh"
{
if
sourceGitArgs
.
caFile
!=
""
&&
u
.
Scheme
==
"ssh"
{
return
fmt
.
Errorf
(
"specifing a CA file is not supported for Git over SSH"
)
return
fmt
.
Errorf
(
"specif
y
ing a CA file is not supported for Git over SSH"
)
}
}
if
sourceGitArgs
.
recurseSubmodules
&&
sourceGitArgs
.
gitImplementation
==
sourcev1
.
LibGit2Implementation
{
if
sourceGitArgs
.
recurseSubmodules
&&
sourceGitArgs
.
gitImplementation
==
sourcev1
.
LibGit2Implementation
{
...
...
This diff is collapsed.
Click to expand it.
cmd/flux/main_test.go
+
1
−
1
View file @
1fda202c
...
@@ -302,7 +302,7 @@ func assertGoldenTemplateFile(goldenFile string, templateValues map[string]strin
...
@@ -302,7 +302,7 @@ func assertGoldenTemplateFile(goldenFile string, templateValues map[string]strin
expectedOutput
=
string
(
goldenFileContents
)
expectedOutput
=
string
(
goldenFileContents
)
}
}
if
assertErr
:=
assertGoldenValue
(
expectedOutput
)(
output
,
err
);
assertErr
!=
nil
{
if
assertErr
:=
assertGoldenValue
(
expectedOutput
)(
output
,
err
);
assertErr
!=
nil
{
// Update the golden files if comparis
i
on fails and the update flag is set.
// Update the golden files if comparison fails and the update flag is set.
if
*
update
&&
output
!=
""
{
if
*
update
&&
output
!=
""
{
// Skip update if there are template values.
// Skip update if there are template values.
if
len
(
templateValues
)
>
0
{
if
len
(
templateValues
)
>
0
{
...
...
This diff is collapsed.
Click to expand it.
pkg/manifestgen/install/manifests.go
+
1
−
1
View file @
1fda202c
...
@@ -71,7 +71,7 @@ func generate(base string, options Options) error {
...
@@ -71,7 +71,7 @@ func generate(base string, options Options) error {
// In such environments they normally add `.cluster.local` and `.local`
// In such environments they normally add `.cluster.local` and `.local`
// suffixes to `no_proxy` variable in order to prevent cluster-local
// suffixes to `no_proxy` variable in order to prevent cluster-local
// traffic from going through http proxy. Without fully specified
// traffic from going through http proxy. Without fully specified
// domain they need to mention `notifications-controller` explicity in
// domain they need to mention `notifications-controller` explicit
l
y in
// `no_proxy` variable after debugging http proxy logs.
// `no_proxy` variable after debugging http proxy logs.
options
.
EventsAddr
=
fmt
.
Sprintf
(
"http://%s.%s.svc.%s/"
,
options
.
NotificationController
,
options
.
Namespace
,
options
.
ClusterDomain
)
options
.
EventsAddr
=
fmt
.
Sprintf
(
"http://%s.%s.svc.%s/"
,
options
.
NotificationController
,
options
.
Namespace
,
options
.
ClusterDomain
)
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment