ISSUE-1980: Changes for CloudScanner auto upgrade and cloud agent #2139
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
noboruma
reviewed
May 10, 2024
Comment on lines
+1
to
+25
| [unix_http_server] | ||
| file=/var/run/supervisor.sock | ||
| chmod=0700 | ||
|
|
||
| [supervisord] | ||
| logfile=%(ENV_DF_INSTALL_DIR)s/var/log/supervisor/supervisord.log | ||
| pidfile=/var/run/supervisord.pid | ||
| childlogdir=%(ENV_DF_INSTALL_DIR)s/var/log/supervisor | ||
|
|
||
| [supervisorctl] | ||
| serverurl=unix:///var/run/supervisor.sock | ||
|
|
||
| [rpcinterface:supervisor] | ||
| supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface | ||
|
|
||
| [program:deepfenced] | ||
| environment=DF_ENABLE_CLOUD_NODE=true | ||
| command=/bin/deepfenced | ||
| numprocs=1 | ||
| autostart=true | ||
| autorestart=true | ||
| startsecs=0 | ||
| stopwaitsecs=30 | ||
| killasgroup=true | ||
| priority=50 |
There was a problem hiding this comment.
Can't we resue the same as agent?
There was a problem hiding this comment.
We are using the DF_INSTALL_DIR env variable for the cloud scanner agent which we are not using in the case of regular agent. This env is required to setup the directory structure (/home/deepfence) for the cloudscanner agent.
noboruma
reviewed
May 10, 2024
| } | ||
| } | ||
| log.Info().Msgf("Started processes:%s", strings.Join(startedProcesses, ",")) | ||
| log.Info().Msgf("Failed processes:%s", strings.Join(failedProcess, ",")) | ||
|
|
||
| if enableClusterDiscovery { |
| @@ -87,6 +93,7 @@ func restartSelf() error { | |||
| } | |||
| argv0, err := exec.LookPath(os.Args[0]) | |||
| if err != nil { | |||
| log.Error().Msgf(err.Error()) | |||
There was a problem hiding this comment.
nit: Since we push the err to next layer, not needed
noboruma
approved these changes
May 10, 2024
fbc8585
to
79674ad
Compare
79674ad
to
2103fc6
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #
https://github.com/deepfence/enterprise-roadmap/issues/1980
Changes proposed in this pull request: