kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15927 from justinsb/fix_some_comments 

fix some comments
This commit is contained in:
Kubernetes Prow Robot 2023-09-18 13:26:52 -07:00 committed by GitHub
parent 7648247baf 1bf8485cdf
commit 0b87f7f2bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/assets/builder.go
View File

@ -156,8 +156,8 @@ func (a *AssetBuilder) RemapImage(image string) (string, error) {
} }
} }
if strings.HasPrefix(image, "registry.k8s.io/kops/kops-controller:") { if strings.HasPrefix(image, "k8s.gcr.io/kops/kops-controller:") || strings.HasPrefix(image, "registry.k8s.io/kops/kops-controller:") {
// To use user-defined DNS Controller: // To use user-defined kops Controller:
// 1. DOCKER_REGISTRY=[your docker hub repo] make kops-controller-push // 1. DOCKER_REGISTRY=[your docker hub repo] make kops-controller-push
// 2. export KOPSCONTROLLER_IMAGE=[your docker hub repo] // 2. export KOPSCONTROLLER_IMAGE=[your docker hub repo]
// 3. make kops and create/apply cluster // 3. make kops and create/apply cluster

2
pkg/truncate/truncate.go
View File

@ -37,7 +37,7 @@ type TruncateStringOptions struct {
HashLength int HashLength int
} }
// TruncateString will attempt to truncate a string to a max, adding a prefix to avoid collisions. // TruncateString will attempt to truncate a string to a max length, adding a suffix to avoid collisions.
// Will never return a string longer than maxLength chars // Will never return a string longer than maxLength chars
func TruncateString(s string, opt TruncateStringOptions) string { func TruncateString(s string, opt TruncateStringOptions) string {
if opt.MaxLength == 0 { if opt.MaxLength == 0 {