Optimize k8s runtime #1600
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| // Copyright © 2021 Alibaba Group Holding Ltd. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package registry | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "net" | ||
| "path/filepath" | ||
|
|
||
| "github.com/sealerio/sealer/common" | ||
| osi "github.com/sealerio/sealer/utils/os" | ||
| "github.com/sealerio/sealer/utils/yaml" | ||
|
|
||
| "github.com/sirupsen/logrus" | ||
| "golang.org/x/crypto/bcrypt" | ||
| ) | ||
|
|
||
| const ( | ||
| ConfigFile = "registry.yml" | ||
| SeaHub = "sea.hub" | ||
| ) | ||
|
|
||
| type Config struct { | ||
| IP net.IP `yaml:"ip,omitempty"` | ||
| Domain string `yaml:"domain,omitempty"` | ||
| Port string `yaml:"port,omitempty"` | ||
| Username string `json:"username,omitempty"` | ||
| Password string `json:"password,omitempty"` | ||
| } | ||
|
|
||
| func (c *Config) GenerateHtPasswd() (string, error) { | ||
| if c.Username == "" || c.Password == "" { | ||
| return "", fmt.Errorf("failed to generate htpasswd: registry username or passwodr is empty") | ||
| } | ||
| pwdHash, err := bcrypt.GenerateFromPassword([]byte(c.Password), bcrypt.DefaultCost) | ||
| if err != nil { | ||
| return "", fmt.Errorf("failed to generate registry password: %v", err) | ||
| } | ||
| return c.Username + ":" + string(pwdHash), nil | ||
| } | ||
|
|
||
| func (c *Config) Repo() string { | ||
| 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 |
||
| var config Config | ||
| var DefaultConfig = &Config{ | ||
|
There was a problem hiding this comment. DefaultConfig => defaultConfig |
||
| IP: defaultRegistryIP, | ||
| Domain: SeaHub, | ||
| Port: "5000", | ||
| } | ||
| 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 |
||
| return DefaultConfig | ||
| } | ||
| err := yaml.UnmarshalFile(registryConfigPath, &config) | ||
| if err != nil { | ||
| logrus.Errorf("failed to read registry config: %v", err) | ||
| return DefaultConfig | ||
| } | ||
| if config.IP == nil { | ||
| config.IP = DefaultConfig.IP | ||
| } | ||
| if config.Port == "" { | ||
| config.Port = DefaultConfig.Port | ||
| } | ||
| 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: |
||
| return &config | ||
| } | ||
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
passwodr => password
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ht?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i think this func means to gen HTTP basic authentication with username and password. so it could be rename to "GenerateHttpBasicAuth"