Skip to content

asset/password: KubeadminPassword responsible for the password file #1539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Apr 5, 2019
Merged

asset/password: KubeadminPassword responsible for the password file #1539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 1 addition & 14 deletions pkg/asset/cluster/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@ import (
"github.com/openshift/installer/pkg/terraform"
)

var (
// kubeadminPasswordPath is the path where kubeadmin user password is stored.
kubeadminPasswordPath = filepath.Join("auth", "kubeadmin-password")
)

// Cluster uses the terraform executable to launch a cluster
// with the given terraform tfvar and generated templates.
type Cluster struct {
Expand Down Expand Up @@ -53,8 +48,7 @@ func (c *Cluster) Generate(parents asset.Parents) (err error) {
clusterID := &installconfig.ClusterID{}
installConfig := &installconfig.InstallConfig{}
terraformVariables := &TerraformVariables{}
kubeadminPassword := &password.KubeadminPassword{}
parents.Get(clusterID, installConfig, terraformVariables, kubeadminPassword)
parents.Get(clusterID, installConfig, terraformVariables)

if installConfig.Config.Platform.None != nil {
return errors.New("cluster cannot be created with platform set to 'none'")
Expand All @@ -75,13 +69,6 @@ func (c *Cluster) Generate(parents asset.Parents) (err error) {
extraArgs = append(extraArgs, fmt.Sprintf("-var-file=%s", filepath.Join(tmpDir, file.Filename)))
}

c.FileList = []*asset.File{
{
Filename: kubeadminPasswordPath,
Data: []byte(kubeadminPassword.Password),
},
}

logrus.Infof("Creating infrastructure resources...")
stateFile, err := terraform.Apply(tmpDir, installConfig.Config.Platform.Name(), extraArgs...)
if err != nil {
Expand Down
25 changes: 24 additions & 1 deletion pkg/asset/password/password.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,25 @@ package password
import (
"crypto/rand"
"math/big"
"path/filepath"

"github.com/openshift/installer/pkg/asset"
"golang.org/x/crypto/bcrypt"
)

var (
// kubeadminPasswordPath is the path where kubeadmin user password is stored.
kubeadminPasswordPath = filepath.Join("auth", "kubeadmin-password")
)

// KubeadminPassword is the asset for the kubeadmin user password
type KubeadminPassword struct {
Password string
PasswordHash []byte
File *asset.File
}

var _ asset.Asset = (*KubeadminPassword)(nil)
var _ asset.WritableAsset = (*KubeadminPassword)(nil)

// Dependencies returns no dependencies.
func (a *KubeadminPassword) Dependencies() []asset.Asset {
Expand Down Expand Up @@ -70,10 +77,26 @@ func (a *KubeadminPassword) generateRandomPasswordHash(length int) error {
return err
}
a.PasswordHash = bytes

a.File = &asset.File{
Filename: kubeadminPasswordPath,
Data: []byte(a.Password),
}

return nil
}

// Name returns the human-friendly name of the asset.
func (a *KubeadminPassword) Name() string {
return "Kubeadmin Password"
}

// Files returns the password file.
func (a *KubeadminPassword) Files() []*asset.File {
return []*asset.File{a.File}
}

// Load returns false as the password file is read-only.
func (a *KubeadminPassword) Load(f asset.FileFetcher) (found bool, err error) {
return false, nil
}
2 changes: 2 additions & 0 deletions pkg/asset/targets/targets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/openshift/installer/pkg/asset/kubeconfig"
"github.com/openshift/installer/pkg/asset/machines"
"github.com/openshift/installer/pkg/asset/manifests"
"github.com/openshift/installer/pkg/asset/password"
"github.com/openshift/installer/pkg/asset/templates/content/bootkube"
"github.com/openshift/installer/pkg/asset/templates/content/openshift"
"github.com/openshift/installer/pkg/asset/tls"
Expand Down Expand Up @@ -62,6 +63,7 @@ var (
Cluster = []asset.WritableAsset{
&cluster.TerraformVariables{},
&kubeconfig.AdminClient{},
&password.KubeadminPassword{},
&tls.JournalCertKey{},
&cluster.Metadata{},
&cluster.Cluster{},
Expand Down