mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-04 04:08:16 +00:00 
			
		
		
		
	Pass mbforbes TODOs to others.
This commit is contained in:
		@@ -139,8 +139,8 @@ function create-master-instance {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
# TODO(dawnchen): Check $CONTAINER_RUNTIME to decide which
 | 
					# TODO(dawnchen): Check $CONTAINER_RUNTIME to decide which
 | 
				
			||||||
# cloud_config yaml file should be passed
 | 
					# cloud_config yaml file should be passed
 | 
				
			||||||
# TODO(mbforbes): Make $1 required.
 | 
					# TODO(zmerlynn): Make $1 required.
 | 
				
			||||||
# TODO(mbforbes): Document required vars (for this and call chain).
 | 
					# TODO(zmerlynn): Document required vars (for this and call chain).
 | 
				
			||||||
# $1 version
 | 
					# $1 version
 | 
				
			||||||
function create-node-instance-template {
 | 
					function create-node-instance-template {
 | 
				
			||||||
  local suffix=""
 | 
					  local suffix=""
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -152,8 +152,8 @@ function create-master-instance {
 | 
				
			|||||||
    --disk "name=${MASTER_NAME}-pd,device-name=master-pd,mode=rw,boot=no,auto-delete=no"
 | 
					    --disk "name=${MASTER_NAME}-pd,device-name=master-pd,mode=rw,boot=no,auto-delete=no"
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# TODO(mbforbes): Make $1 required.
 | 
					# TODO(zmerlynn): Make $1 required.
 | 
				
			||||||
# TODO(mbforbes): Document required vars (for this and call chain).
 | 
					# TODO(zmerlynn): Document required vars (for this and call chain).
 | 
				
			||||||
# $1 version
 | 
					# $1 version
 | 
				
			||||||
function create-node-instance-template {
 | 
					function create-node-instance-template {
 | 
				
			||||||
  local suffix=""
 | 
					  local suffix=""
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -119,7 +119,7 @@ function prepare-upgrade() {
 | 
				
			|||||||
#   PROJECT
 | 
					#   PROJECT
 | 
				
			||||||
#   ZONE
 | 
					#   ZONE
 | 
				
			||||||
function get-node-env() {
 | 
					function get-node-env() {
 | 
				
			||||||
  # TODO(mbforbes): Make this more reliable with retries.
 | 
					  # TODO(zmerlynn): Make this more reliable with retries.
 | 
				
			||||||
  gcloud compute --project ${PROJECT} ssh --zone ${ZONE} ${MINION_NAMES[0]} --command \
 | 
					  gcloud compute --project ${PROJECT} ssh --zone ${ZONE} ${MINION_NAMES[0]} --command \
 | 
				
			||||||
    "curl --fail --silent -H 'Metadata-Flavor: Google' \
 | 
					    "curl --fail --silent -H 'Metadata-Flavor: Google' \
 | 
				
			||||||
      'http://metadata/computeMetadata/v1/instance/attributes/kube-env'" 2>/dev/null
 | 
					      'http://metadata/computeMetadata/v1/instance/attributes/kube-env'" 2>/dev/null
 | 
				
			||||||
@@ -177,7 +177,7 @@ function prepare-node-upgrade() {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  detect-minion-names
 | 
					  detect-minion-names
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # TODO(mbforbes): Refactor setting scope flags.
 | 
					  # TODO(zmerlynn): Refactor setting scope flags.
 | 
				
			||||||
  local scope_flags=
 | 
					  local scope_flags=
 | 
				
			||||||
  if [ -n "${MINION_SCOPES}" ]; then
 | 
					  if [ -n "${MINION_SCOPES}" ]; then
 | 
				
			||||||
    scope_flags="--scopes ${MINION_SCOPES}"
 | 
					    scope_flags="--scopes ${MINION_SCOPES}"
 | 
				
			||||||
@@ -194,11 +194,11 @@ function prepare-node-upgrade() {
 | 
				
			|||||||
  KUBELET_CERT_BASE64=$(get-env-val "${node_env}" "KUBELET_CERT")
 | 
					  KUBELET_CERT_BASE64=$(get-env-val "${node_env}" "KUBELET_CERT")
 | 
				
			||||||
  KUBELET_KEY_BASE64=$(get-env-val "${node_env}" "KUBELET_KEY")
 | 
					  KUBELET_KEY_BASE64=$(get-env-val "${node_env}" "KUBELET_KEY")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # TODO(mbforbes): How do we ensure kube-env is written in a ${version}-
 | 
					  # TODO(zmerlynn): How do we ensure kube-env is written in a ${version}-
 | 
				
			||||||
  #                 compatible way?
 | 
					  #                 compatible way?
 | 
				
			||||||
  write-node-env
 | 
					  write-node-env
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # TODO(mbforbes): Get configure-vm script from ${version}. (Must plumb this
 | 
					  # TODO(zmerlynn): Get configure-vm script from ${version}. (Must plumb this
 | 
				
			||||||
  #                 through all create-node-instance-template implementations).
 | 
					  #                 through all create-node-instance-template implementations).
 | 
				
			||||||
  create-node-instance-template ${SANITIZED_VERSION}
 | 
					  create-node-instance-template ${SANITIZED_VERSION}
 | 
				
			||||||
  # The following is echo'd so that callers can get the template name.
 | 
					  # The following is echo'd so that callers can get the template name.
 | 
				
			||||||
@@ -211,9 +211,9 @@ function prepare-node-upgrade() {
 | 
				
			|||||||
function do-node-upgrade() {
 | 
					function do-node-upgrade() {
 | 
				
			||||||
  echo "== Upgrading nodes to ${KUBE_VERSION}. ==" >&2
 | 
					  echo "== Upgrading nodes to ${KUBE_VERSION}. ==" >&2
 | 
				
			||||||
  # Do the actual upgrade.
 | 
					  # Do the actual upgrade.
 | 
				
			||||||
  # NOTE(mbforbes): If you are changing this gcloud command, update
 | 
					  # NOTE(zmerlynn): If you are changing this gcloud command, update
 | 
				
			||||||
  #                 test/e2e/cluster_upgrade.go to match this EXACTLY.
 | 
					  #                 test/e2e/cluster_upgrade.go to match this EXACTLY.
 | 
				
			||||||
  # TODO(mbforbes): Remove this hack on July 29, 2015, when the migration to
 | 
					  # TODO(zmerlynn): Remove this hack on July 29, 2015, when the migration to
 | 
				
			||||||
  #                 `gcloud alpha compute rolling-updates` is complete.
 | 
					  #                 `gcloud alpha compute rolling-updates` is complete.
 | 
				
			||||||
  local subgroup="preview"
 | 
					  local subgroup="preview"
 | 
				
			||||||
  local exists=$(gcloud ${subgroup} rolling-updates -h &>/dev/null; echo $?) || true
 | 
					  local exists=$(gcloud ${subgroup} rolling-updates -h &>/dev/null; echo $?) || true
 | 
				
			||||||
@@ -231,7 +231,7 @@ function do-node-upgrade() {
 | 
				
			|||||||
      --max-num-failed-instances=0 \
 | 
					      --max-num-failed-instances=0 \
 | 
				
			||||||
      --min-instance-update-time=0s
 | 
					      --min-instance-update-time=0s
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # TODO(mbforbes): Wait for the rolling-update to finish.
 | 
					  # TODO(zmerlynn): Wait for the rolling-update to finish.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  echo "== Finished upgrading nodes to ${KUBE_VERSION}. ==" >&2
 | 
					  echo "== Finished upgrading nodes to ${KUBE_VERSION}. ==" >&2
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -354,7 +354,7 @@ function create-node-template {
 | 
				
			|||||||
  detect-project
 | 
					  detect-project
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # First, ensure the template doesn't exist.
 | 
					  # First, ensure the template doesn't exist.
 | 
				
			||||||
  # TODO(mbforbes): To make this really robust, we need to parse the output and
 | 
					  # TODO(zmerlynn): To make this really robust, we need to parse the output and
 | 
				
			||||||
  #                 add retries. Just relying on a non-zero exit code doesn't
 | 
					  #                 add retries. Just relying on a non-zero exit code doesn't
 | 
				
			||||||
  #                 distinguish an ephemeral failed call from a "not-exists".
 | 
					  #                 distinguish an ephemeral failed call from a "not-exists".
 | 
				
			||||||
  if gcloud compute instance-templates describe "$1" --project "${PROJECT}" &>/dev/null; then
 | 
					  if gcloud compute instance-templates describe "$1" --project "${PROJECT}" &>/dev/null; then
 | 
				
			||||||
@@ -653,7 +653,7 @@ function kube-up {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  echo "Creating minions."
 | 
					  echo "Creating minions."
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # TODO(mbforbes): Refactor setting scope flags.
 | 
					  # TODO(zmerlynn): Refactor setting scope flags.
 | 
				
			||||||
  local scope_flags=
 | 
					  local scope_flags=
 | 
				
			||||||
  if [ -n "${MINION_SCOPES}" ]; then
 | 
					  if [ -n "${MINION_SCOPES}" ]; then
 | 
				
			||||||
    scope_flags="--scopes ${MINION_SCOPES}"
 | 
					    scope_flags="--scopes ${MINION_SCOPES}"
 | 
				
			||||||
@@ -1015,7 +1015,7 @@ function prepare-push() {
 | 
				
			|||||||
  if [[ "${1-}" == "true" ]]; then
 | 
					  if [[ "${1-}" == "true" ]]; then
 | 
				
			||||||
    write-node-env
 | 
					    write-node-env
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # TODO(mbforbes): Refactor setting scope flags.
 | 
					    # TODO(zmerlynn): Refactor setting scope flags.
 | 
				
			||||||
    local scope_flags=
 | 
					    local scope_flags=
 | 
				
			||||||
    if [ -n "${MINION_SCOPES}" ]; then
 | 
					    if [ -n "${MINION_SCOPES}" ]; then
 | 
				
			||||||
      scope_flags="--scopes ${MINION_SCOPES}"
 | 
					      scope_flags="--scopes ${MINION_SCOPES}"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -133,7 +133,7 @@ func masterUpgradeGKE(v string) error {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
var masterPush = func(_ string) error {
 | 
					var masterPush = func(_ string) error {
 | 
				
			||||||
	// TODO(mbforbes): Make master push use the provided version.
 | 
						// TODO(mikedanese): Make master push use the provided version.
 | 
				
			||||||
	_, _, err := runCmd(path.Join(testContext.RepoRoot, "hack/e2e-internal/e2e-push.sh"), "-m")
 | 
						_, _, err := runCmd(path.Join(testContext.RepoRoot, "hack/e2e-internal/e2e-push.sh"), "-m")
 | 
				
			||||||
	return err
 | 
						return err
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
@@ -233,7 +233,7 @@ var _ = Describe("Skipped", func() {
 | 
				
			|||||||
			}
 | 
								}
 | 
				
			||||||
			testLoadBalancerReachable(ingress, 80)
 | 
								testLoadBalancerReachable(ingress, 80)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			// TODO(mbforbes): Add setup, validate, and teardown for:
 | 
								// TODO(mikedanese): Add setup, validate, and teardown for:
 | 
				
			||||||
			//  - secrets
 | 
								//  - secrets
 | 
				
			||||||
			//  - volumes
 | 
								//  - volumes
 | 
				
			||||||
			//  - persistent volumes
 | 
								//  - persistent volumes
 | 
				
			||||||
@@ -485,7 +485,7 @@ func validate(f Framework, svcNameWant, rcNameWant string, ingress api.LoadBalan
 | 
				
			|||||||
	if svcNameWant != svc.Name {
 | 
						if svcNameWant != svc.Name {
 | 
				
			||||||
		return fmt.Errorf("wanted service name %q, got %q", svcNameWant, svc.Name)
 | 
							return fmt.Errorf("wanted service name %q, got %q", svcNameWant, svc.Name)
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	// TODO(mbforbes): Make testLoadBalancerReachable return an error.
 | 
						// TODO(mikedanese): Make testLoadBalancerReachable return an error.
 | 
				
			||||||
	testLoadBalancerReachable(ingress, 80)
 | 
						testLoadBalancerReachable(ingress, 80)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	Logf("Cluster validation succeeded")
 | 
						Logf("Cluster validation succeeded")
 | 
				
			||||||
@@ -517,7 +517,7 @@ func migTemplate() (string, error) {
 | 
				
			|||||||
	var templ string
 | 
						var templ string
 | 
				
			||||||
	key := "instanceTemplate"
 | 
						key := "instanceTemplate"
 | 
				
			||||||
	if wait.Poll(poll, singleCallTimeout, func() (bool, error) {
 | 
						if wait.Poll(poll, singleCallTimeout, func() (bool, error) {
 | 
				
			||||||
		// TODO(mbforbes): make this hit the compute API directly instead of
 | 
							// TODO(mikedanese): make this hit the compute API directly instead of
 | 
				
			||||||
		// shelling out to gcloud.
 | 
							// shelling out to gcloud.
 | 
				
			||||||
		// An `instance-groups managed describe` call outputs what we want to stdout.
 | 
							// An `instance-groups managed describe` call outputs what we want to stdout.
 | 
				
			||||||
		output, _, err := retryCmd("gcloud", "compute", "instance-groups", "managed",
 | 
							output, _, err := retryCmd("gcloud", "compute", "instance-groups", "managed",
 | 
				
			||||||
@@ -555,9 +555,9 @@ func migRollingUpdateStart(templ string, nt time.Duration) (string, error) {
 | 
				
			|||||||
	var id string
 | 
						var id string
 | 
				
			||||||
	prefix, suffix := "Started [", "]."
 | 
						prefix, suffix := "Started [", "]."
 | 
				
			||||||
	if err := wait.Poll(poll, singleCallTimeout, func() (bool, error) {
 | 
						if err := wait.Poll(poll, singleCallTimeout, func() (bool, error) {
 | 
				
			||||||
		// TODO(mbforbes): make this hit the compute API directly instead of
 | 
							// TODO(mikedanese): make this hit the compute API directly instead of
 | 
				
			||||||
		//                 shelling out to gcloud.
 | 
							//                 shelling out to gcloud.
 | 
				
			||||||
		// NOTE(mbforbes): If you are changing this gcloud command, update
 | 
							// NOTE(mikedanese): If you are changing this gcloud command, update
 | 
				
			||||||
		//                 cluster/gce/upgrade.sh to match this EXACTLY.
 | 
							//                 cluster/gce/upgrade.sh to match this EXACTLY.
 | 
				
			||||||
		// A `rolling-updates start` call outputs what we want to stderr.
 | 
							// A `rolling-updates start` call outputs what we want to stderr.
 | 
				
			||||||
		_, output, err := retryCmd("gcloud", append(migUdpateCmdBase(),
 | 
							_, output, err := retryCmd("gcloud", append(migUdpateCmdBase(),
 | 
				
			||||||
@@ -610,7 +610,7 @@ func migRollingUpdateStart(templ string, nt time.Duration) (string, error) {
 | 
				
			|||||||
//
 | 
					//
 | 
				
			||||||
//   {"alpha", "compute"}
 | 
					//   {"alpha", "compute"}
 | 
				
			||||||
//
 | 
					//
 | 
				
			||||||
// TODO(mbforbes): Remove this hack on July 29, 2015 when the migration to
 | 
					// TODO(mikedanese): Remove this hack on July 29, 2015 when the migration to
 | 
				
			||||||
//                 `gcloud alpha compute rolling-updates` is complete.
 | 
					//                 `gcloud alpha compute rolling-updates` is complete.
 | 
				
			||||||
func migUdpateCmdBase() []string {
 | 
					func migUdpateCmdBase() []string {
 | 
				
			||||||
	b := []string{"preview"}
 | 
						b := []string{"preview"}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -112,7 +112,7 @@ func testReboot(c *client.Client, rebootCmd string) {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	// Wait for all to finish and check the final result.
 | 
						// Wait for all to finish and check the final result.
 | 
				
			||||||
	failed := false
 | 
						failed := false
 | 
				
			||||||
	// TODO(mbforbes): Change to `for range` syntax and remove logging once
 | 
						// TODO(a-robinson): Change to `for range` syntax and remove logging once
 | 
				
			||||||
	// we support only Go >= 1.4.
 | 
						// we support only Go >= 1.4.
 | 
				
			||||||
	for _, n := range nodelist.Items {
 | 
						for _, n := range nodelist.Items {
 | 
				
			||||||
		if !<-result {
 | 
							if !<-result {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -221,7 +221,7 @@ func restartNodes(provider string, nt time.Duration) error {
 | 
				
			|||||||
	}
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// TODO(mbforbes): Switch this to MIG recreate-instances. This can be done
 | 
					// TODO(marekbiskup): Switch this to MIG recreate-instances. This can be done
 | 
				
			||||||
// with the following bash, but needs to be written in Go:
 | 
					// with the following bash, but needs to be written in Go:
 | 
				
			||||||
//
 | 
					//
 | 
				
			||||||
//   # Step 1: Get instance names.
 | 
					//   # Step 1: Get instance names.
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1533,7 +1533,7 @@ func (t *WebserverTest) Cleanup() []error {
 | 
				
			|||||||
		if _, err := t.Client.ReplicationControllers(t.Namespace).Update(old); err != nil {
 | 
							if _, err := t.Client.ReplicationControllers(t.Namespace).Update(old); err != nil {
 | 
				
			||||||
			errs = append(errs, err)
 | 
								errs = append(errs, err)
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
		// TODO(mbforbes): Wait.
 | 
							// TODO(mikedanese): Wait.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		// Then, delete the RC altogether.
 | 
							// Then, delete the RC altogether.
 | 
				
			||||||
		if err := t.Client.ReplicationControllers(t.Namespace).Delete(rcName); err != nil {
 | 
							if err := t.Client.ReplicationControllers(t.Namespace).Delete(rcName); err != nil {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1585,7 +1585,7 @@ func NodeSSHHosts(c *client.Client) ([]string, error) {
 | 
				
			|||||||
		for _, addr := range n.Status.Addresses {
 | 
							for _, addr := range n.Status.Addresses {
 | 
				
			||||||
			// Use the first external IP address we find on the node, and
 | 
								// Use the first external IP address we find on the node, and
 | 
				
			||||||
			// use at most one per node.
 | 
								// use at most one per node.
 | 
				
			||||||
			// TODO(mbforbes): Use the "preferred" address for the node, once
 | 
								// TODO(roberthbailey): Use the "preferred" address for the node, once
 | 
				
			||||||
			// such a thing is defined (#2462).
 | 
								// such a thing is defined (#2462).
 | 
				
			||||||
			if addr.Type == api.NodeExternalIP {
 | 
								if addr.Type == api.NodeExternalIP {
 | 
				
			||||||
				hosts = append(hosts, addr.Address+":22")
 | 
									hosts = append(hosts, addr.Address+":22")
 | 
				
			||||||
@@ -1680,7 +1680,7 @@ func checkPodsRunningReady(c *client.Client, ns string, podNames []string, timeo
 | 
				
			|||||||
	}
 | 
						}
 | 
				
			||||||
	// Wait for them all to finish.
 | 
						// Wait for them all to finish.
 | 
				
			||||||
	success := true
 | 
						success := true
 | 
				
			||||||
	// TODO(mbforbes): Change to `for range` syntax and remove logging once we
 | 
						// TODO(a-robinson): Change to `for range` syntax and remove logging once we
 | 
				
			||||||
	// support only Go >= 1.4.
 | 
						// support only Go >= 1.4.
 | 
				
			||||||
	for _, podName := range podNames {
 | 
						for _, podName := range podNames {
 | 
				
			||||||
		if !<-result {
 | 
							if !<-result {
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user