Skip to content

Commit

Permalink
Merge pull request #15927 from justinsb/fix_some_comments
Browse files Browse the repository at this point in the history
fix some comments
  • Loading branch information
k8s-ci-robot committed Sep 18, 2023
2 parents 7648247 + 1bf8485 commit 0b87f7f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions pkg/assets/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ func (a *AssetBuilder) RemapImage(image string) (string, error) {
}
}

if strings.HasPrefix(image, "registry.k8s.io/kops/kops-controller:") {
// To use user-defined DNS Controller:
if strings.HasPrefix(image, "k8s.gcr.io/kops/kops-controller:") || strings.HasPrefix(image, "registry.k8s.io/kops/kops-controller:") {
// To use user-defined kops Controller:
// 1. DOCKER_REGISTRY=[your docker hub repo] make kops-controller-push
// 2. export KOPSCONTROLLER_IMAGE=[your docker hub repo]
// 3. make kops and create/apply cluster
Expand Down
2 changes: 1 addition & 1 deletion pkg/truncate/truncate.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ type TruncateStringOptions struct {
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
func TruncateString(s string, opt TruncateStringOptions) string {
if opt.MaxLength == 0 {
Expand Down

0 comments on commit 0b87f7f

Please sign in to comment.