Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Argo Cd
Commits
84f24cdb
Unverified
Commit
84f24cdb
authored
5 years ago
by
Alexander Matyushentsev
Committed by
GitHub
5 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Issue #2673 - Application controller flag is broken (#2674)
parent
0d8011da
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
cmd/argocd-application-controller/main.go
+1
-1
cmd/argocd-application-controller/main.go
server/server.go
+1
-1
server/server.go
util/kube/ctl.go
+8
-8
util/kube/ctl.go
util/kube/ctl_test.go
+8
-9
util/kube/ctl_test.go
with
18 additions
and
19 deletions
+18
-19
cmd/argocd-application-controller/main.go
+
1
-
1
View file @
84f24cdb
...
...
@@ -77,7 +77,7 @@ func newCommand() *cobra.Command {
errors
.
CheckError
(
err
)
settingsMgr
:=
settings
.
NewSettingsManager
(
ctx
,
kubeClient
,
namespace
)
kubectl
:=
kube
.
KubectlCmd
{}
kubectl
:=
&
kube
.
KubectlCmd
{}
appController
,
err
:=
controller
.
NewApplicationController
(
namespace
,
settingsMgr
,
...
...
This diff is collapsed.
Click to expand it.
server/server.go
+
1
-
1
View file @
84f24cdb
...
...
@@ -456,7 +456,7 @@ func (a *ArgoCDServer) newGRPCServer() *grpc.Server {
)))
grpcS
:=
grpc
.
NewServer
(
sOpts
...
)
db
:=
db
.
NewDB
(
a
.
Namespace
,
a
.
settingsMgr
,
a
.
KubeClientset
)
kubectl
:=
kube
.
KubectlCmd
{}
kubectl
:=
&
kube
.
KubectlCmd
{}
clusterService
:=
cluster
.
NewServer
(
db
,
a
.
enf
,
a
.
Cache
,
kubectl
)
repoService
:=
repository
.
NewServer
(
a
.
RepoClientset
,
db
,
a
.
enf
,
a
.
Cache
,
a
.
settingsMgr
)
repoCredsService
:=
repocreds
.
NewServer
(
a
.
RepoClientset
,
db
,
a
.
enf
,
a
.
settingsMgr
)
...
...
This diff is collapsed.
Click to expand it.
util/kube/ctl.go
+
8
-
8
View file @
84f24cdb
...
...
@@ -108,7 +108,7 @@ func isSupportedVerb(apiResource *metav1.APIResource, verb string) bool {
return
false
}
func
(
k
KubectlCmd
)
GetAPIResources
(
config
*
rest
.
Config
,
resourceFilter
ResourceFilter
)
([]
APIResourceInfo
,
error
)
{
func
(
k
*
KubectlCmd
)
GetAPIResources
(
config
*
rest
.
Config
,
resourceFilter
ResourceFilter
)
([]
APIResourceInfo
,
error
)
{
apiResIfs
,
err
:=
filterAPIResources
(
config
,
resourceFilter
,
func
(
apiResource
*
metav1
.
APIResource
)
bool
{
return
isSupportedVerb
(
apiResource
,
listVerb
)
&&
isSupportedVerb
(
apiResource
,
watchVerb
)
},
""
)
...
...
@@ -119,7 +119,7 @@ func (k KubectlCmd) GetAPIResources(config *rest.Config, resourceFilter Resource
}
// GetResource returns resource
func
(
k
KubectlCmd
)
GetResource
(
config
*
rest
.
Config
,
gvk
schema
.
GroupVersionKind
,
name
string
,
namespace
string
)
(
*
unstructured
.
Unstructured
,
error
)
{
func
(
k
*
KubectlCmd
)
GetResource
(
config
*
rest
.
Config
,
gvk
schema
.
GroupVersionKind
,
name
string
,
namespace
string
)
(
*
unstructured
.
Unstructured
,
error
)
{
dynamicIf
,
err
:=
dynamic
.
NewForConfig
(
config
)
if
err
!=
nil
{
return
nil
,
err
...
...
@@ -138,7 +138,7 @@ func (k KubectlCmd) GetResource(config *rest.Config, gvk schema.GroupVersionKind
}
// PatchResource patches resource
func
(
k
KubectlCmd
)
PatchResource
(
config
*
rest
.
Config
,
gvk
schema
.
GroupVersionKind
,
name
string
,
namespace
string
,
patchType
types
.
PatchType
,
patchBytes
[]
byte
)
(
*
unstructured
.
Unstructured
,
error
)
{
func
(
k
*
KubectlCmd
)
PatchResource
(
config
*
rest
.
Config
,
gvk
schema
.
GroupVersionKind
,
name
string
,
namespace
string
,
patchType
types
.
PatchType
,
patchBytes
[]
byte
)
(
*
unstructured
.
Unstructured
,
error
)
{
dynamicIf
,
err
:=
dynamic
.
NewForConfig
(
config
)
if
err
!=
nil
{
return
nil
,
err
...
...
@@ -157,7 +157,7 @@ func (k KubectlCmd) PatchResource(config *rest.Config, gvk schema.GroupVersionKi
}
// DeleteResource deletes resource
func
(
k
KubectlCmd
)
DeleteResource
(
config
*
rest
.
Config
,
gvk
schema
.
GroupVersionKind
,
name
string
,
namespace
string
,
forceDelete
bool
)
error
{
func
(
k
*
KubectlCmd
)
DeleteResource
(
config
*
rest
.
Config
,
gvk
schema
.
GroupVersionKind
,
name
string
,
namespace
string
,
forceDelete
bool
)
error
{
dynamicIf
,
err
:=
dynamic
.
NewForConfig
(
config
)
if
err
!=
nil
{
return
err
...
...
@@ -184,7 +184,7 @@ func (k KubectlCmd) DeleteResource(config *rest.Config, gvk schema.GroupVersionK
}
// ApplyResource performs an apply of a unstructured resource
func
(
k
KubectlCmd
)
ApplyResource
(
config
*
rest
.
Config
,
obj
*
unstructured
.
Unstructured
,
namespace
string
,
dryRun
,
force
,
validate
bool
)
(
string
,
error
)
{
func
(
k
*
KubectlCmd
)
ApplyResource
(
config
*
rest
.
Config
,
obj
*
unstructured
.
Unstructured
,
namespace
string
,
dryRun
,
force
,
validate
bool
)
(
string
,
error
)
{
log
.
Infof
(
"Applying resource %s/%s in cluster: %s, namespace: %s"
,
obj
.
GetKind
(),
obj
.
GetName
(),
config
.
Host
,
namespace
)
f
,
err
:=
ioutil
.
TempFile
(
util
.
TempDir
,
""
)
if
err
!=
nil
{
...
...
@@ -329,7 +329,7 @@ func Version() (string, error) {
}
// ConvertToVersion converts an unstructured object into the specified group/version
func
(
k
KubectlCmd
)
ConvertToVersion
(
obj
*
unstructured
.
Unstructured
,
group
string
,
version
string
)
(
*
unstructured
.
Unstructured
,
error
)
{
func
(
k
*
KubectlCmd
)
ConvertToVersion
(
obj
*
unstructured
.
Unstructured
,
group
string
,
version
string
)
(
*
unstructured
.
Unstructured
,
error
)
{
gvk
:=
obj
.
GroupVersionKind
()
if
gvk
.
Group
==
group
&&
gvk
.
Version
==
version
{
return
obj
.
DeepCopy
(),
nil
...
...
@@ -375,7 +375,7 @@ func (k KubectlCmd) ConvertToVersion(obj *unstructured.Unstructured, group strin
return
&
convertedObj
,
nil
}
func
(
k
KubectlCmd
)
GetServerVersion
(
config
*
rest
.
Config
)
(
string
,
error
)
{
func
(
k
*
KubectlCmd
)
GetServerVersion
(
config
*
rest
.
Config
)
(
string
,
error
)
{
client
,
err
:=
discovery
.
NewDiscoveryClientForConfig
(
config
)
if
err
!=
nil
{
return
""
,
err
...
...
@@ -387,6 +387,6 @@ func (k KubectlCmd) GetServerVersion(config *rest.Config) (string, error) {
return
fmt
.
Sprintf
(
"%s.%s"
,
v
.
Major
,
v
.
Minor
),
nil
}
func
(
k
KubectlCmd
)
SetOnKubectlRun
(
onKubectlRun
func
(
command
string
)
(
util
.
Closer
,
error
))
{
func
(
k
*
KubectlCmd
)
SetOnKubectlRun
(
onKubectlRun
func
(
command
string
)
(
util
.
Closer
,
error
))
{
k
.
OnKubectlRun
=
onKubectlRun
}
This diff is collapsed.
Click to expand it.
util/kube/ctl_test.go
+
8
-
9
View file @
84f24cdb
...
...
@@ -15,15 +15,14 @@ import (
func
TestConvertToVersion
(
t
*
testing
.
T
)
{
callbackExecuted
:=
false
closerExecuted
:=
false
kubectl
:=
KubectlCmd
{
func
(
command
string
)
(
util
.
Closer
,
error
)
{
callbackExecuted
=
true
return
util
.
NewCloser
(
func
()
error
{
closerExecuted
=
true
return
nil
}),
nil
},
}
kubectl
:=
KubectlCmd
{}
kubectl
.
SetOnKubectlRun
(
func
(
command
string
)
(
util
.
Closer
,
error
)
{
callbackExecuted
=
true
return
util
.
NewCloser
(
func
()
error
{
closerExecuted
=
true
return
nil
}),
nil
})
yamlBytes
,
err
:=
ioutil
.
ReadFile
(
"testdata/nginx.yaml"
)
assert
.
Nil
(
t
,
err
)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help