Optimize k8s runtime #1600
Optimize k8s runtime #1600
Conversation
optimize k8s runtime optimize k8s runtime
pkg/registry/config.go
Outdated
|
|
||
| func (c *Config) GenerateHtPasswd() (string, error) { | ||
| if c.Username == "" || c.Password == "" { | ||
| return "", fmt.Errorf("failed to generate htpasswd: registry username or passwodr is empty") |
There was a problem hiding this comment.
i think this func means to gen HTTP basic authentication with username and password. so it could be rename to "GenerateHttpBasicAuth"
pkg/registry/config.go
Outdated
| return fmt.Sprintf("%s:%s", c.Domain, c.Port) | ||
| } | ||
|
|
||
| func GetConfig(rootfs string, defaultRegistryIP net.IP) *Config { |
There was a problem hiding this comment.
defaultRegistryIP => registryIP
pkg/registry/config.go
Outdated
| } | ||
| registryConfigPath := filepath.Join(rootfs, common.EtcDir, ConfigFile) | ||
| if !osi.IsFileExist(registryConfigPath) { | ||
| logrus.Debug("use default registry config") |
There was a problem hiding this comment.
default registry configuration is used: \n %+v, DefaultConfig
pkg/registry/config.go
Outdated
|
|
||
| func GetConfig(rootfs string, defaultRegistryIP net.IP) *Config { | ||
| var config Config | ||
| var DefaultConfig = &Config{ |
There was a problem hiding this comment.
DefaultConfig => defaultConfig
pkg/registry/config.go
Outdated
| if config.Domain == "" { | ||
| config.Domain = DefaultConfig.Domain | ||
| } | ||
| logrus.Debugf("show registry info, IP: %s, Domain: %s", config.IP, config.Domain) |
There was a problem hiding this comment.
The ultimate registry configration is:
| ) | ||
|
|
||
| var ( | ||
| ContainerdShell = `if grep "SystemdCgroup = true" /etc/containerd/config.toml &> /dev/null; then |
There was a problem hiding this comment.
Is that possible we try not to write shell in go later?
There was a problem hiding this comment.
yes, We have too many operations done by the shell，it is hard to read and maintain. this pr only move out some code section nothing to do with the logic. I plan to optimize them in the next steps.
| @@ -12,15 +12,15 @@ | |||
| // See the License for the specific language governing permissions and | |||
| // limitations under the License. | |||
|
|
|||
| package kubernetes | |||
| package version | |||
There was a problem hiding this comment.
"package version" makes me feel it's the version of sealer instead of "kube"
There was a problem hiding this comment.
this package under utils, rename it to "kubeVersion" ?
Codecov Report
@@ Coverage Diff @@
## main #1600 +/- ##
==========================================
+ Coverage 11.82% 13.98% +2.15%
==========================================
Files 91 80 -11
Lines 8112 6859 -1253
==========================================
Hits 959 959
+ Misses 7030 5777 -1253
Partials 123 123 Continue to review full report at Codecov.
|
|
So good to see the registry related part split from runtime. @kakaZhou719 👍🏻 LGTM after updated all the change request. |
Describe what this PR does / why we need it
optimize k8s runtime
this pr only move out some code section nothing to do with the logic.
the next steps:
Redesign the runtime interface, make this module more clearly.
Does this pull request fix one issue?
Describe how you did it
Describe how to verify it
Special notes for reviews