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

Change the default image name for vsphere provider and other minor fix.

This commit is contained in:
Miao Luo 2017-04-20 16:31:21 -07:00
parent 3707436f2f
commit de72c50a0d
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/development/vsphere-dev.md
View File

@ -94,7 +94,7 @@ export KOPS_STATE_STORE=s3://[s3_bucket]
export S3_ACCESS_KEY_ID=[s3_access_key] export S3_ACCESS_KEY_ID=[s3_access_key]
export S3_SECRET_ACCESS_KEY=[s3_secret_key] export S3_SECRET_ACCESS_KEY=[s3_secret_key]
export S3_REGION=[s3_region] export S3_REGION=[s3_region]
export S3_ENDPOINT=http://[s3_server_ip]:[s3_service_port] export S3_ENDPOINT=http://[s3_server_ip]:9000
``` ```
Users can also choose their own S3-compatible storage applications by setting environment varibales similiarly. Users can also choose their own S3-compatible storage applications by setting environment varibales similiarly.

2
hack/vsphere/cleanup_env
View File

@ -29,7 +29,7 @@ export NODEUP_URL=
export PROTOKUBE_IMAGE= export PROTOKUBE_IMAGE=
echo "KOPS_FEATURE_FLAGS=${KOPS_FEATURE_FLAGS}" echo "KOPS_FEATURE_FLAGS=${KOPS_FEATURE_FLAGS}"
echo "DNSCONTROLLER_IMAGE=${VSPHERE_DNSCONTROLLER_IMAGE}" echo "DNSCONTROLLER_IMAGE=${DNSCONTROLLER_IMAGE}"
echo "KOPS_STATE_STORE=${KOPS_STATE_STORE}" echo "KOPS_STATE_STORE=${KOPS_STATE_STORE}"
echo "S3_REGION=${S3_REGION}" echo "S3_REGION=${S3_REGION}"
echo "S3_ACCESS_KEY_ID=${S3_ACCESS_KEY_ID}" echo "S3_ACCESS_KEY_ID=${S3_ACCESS_KEY_ID}"

2
hack/vsphere/set_env
View File

@ -48,7 +48,7 @@ export NODEUP_URL=https://storage.googleapis.com/kops-vsphere/nodeup
export PROTOKUBE_IMAGE=https://storage.googleapis.com/kops-vsphere/protokube.tar.gz export PROTOKUBE_IMAGE=https://storage.googleapis.com/kops-vsphere/protokube.tar.gz
echo "KOPS_FEATURE_FLAGS=${KOPS_FEATURE_FLAGS}" echo "KOPS_FEATURE_FLAGS=${KOPS_FEATURE_FLAGS}"
echo "DNSCONTROLLER_IMAGE=${VSPHERE_DNSCONTROLLER_IMAGE}" echo "DNSCONTROLLER_IMAGE=${DNSCONTROLLER_IMAGE}"
echo "KOPS_STATE_STORE=${KOPS_STATE_STORE}" echo "KOPS_STATE_STORE=${KOPS_STATE_STORE}"
echo "S3_REGION=${S3_REGION}" echo "S3_REGION=${S3_REGION}"
echo "S3_ACCESS_KEY_ID=${S3_ACCESS_KEY_ID}" echo "S3_ACCESS_KEY_ID=${S3_ACCESS_KEY_ID}"

5
pkg/model/bootstrapscript.go
View File

@ -28,9 +28,8 @@ import (
// BootstrapScript creates the bootstrap script // BootstrapScript creates the bootstrap script
type BootstrapScript struct { type BootstrapScript struct {
NodeUpSource string NodeUpSource string
NodeUpSourceHash string NodeUpSourceHash string
NodeUpConfigBuilder func(ig *kops.InstanceGroup) (*nodeup.NodeUpConfig, error) NodeUpConfigBuilder func(ig *kops.InstanceGroup) (*nodeup.NodeUpConfig, error)
} }

2
upup/pkg/fi/cloudup/populate_instancegroup_spec.go
View File

@ -43,7 +43,7 @@ const (
defaultMasterMachineTypeAWS = "m3.medium" defaultMasterMachineTypeAWS = "m3.medium"
defaultMasterMachineTypeVSphere = "vsphere_master" defaultMasterMachineTypeVSphere = "vsphere_master"
defaultVSphereNodeImage = "ubuntu_16_04" defaultVSphereNodeImage = "kops_ubuntu_16_04.ova"
) )
var masterMachineTypeExceptions = map[string]string{ var masterMachineTypeExceptions = map[string]string{