setup-etcd-environment/run.go: fix upgrade path

[alaypatel07]

Upgrades from a 4.3 cluster to a cluster-etcd-operator enabled
cluster discovery fails because the expected operator environment
is not being populated. The isScaling function was passing in normal
scale-up but not in an upgrade, where etcd pods already exist with the
directory and we cannot afford to delete the etcd data directory.

This is a temporary solution until we find a better way of differentiating
between scale-up and upgrade.

More context here

- How to verify it

• Install a 4.4 cluster from CI for example, registry.svc.ci.openshift.org/ocp/release:4.4-ci
• Upgrade to a cluster-etcd-operator enabled cluster

- Description for the changelog

fixes upgrades to cluster-etcd-operator enabled cluster

[kikisdeliveryservice]

@alaypatel07 and @hexfusion will be testing this PR & will update

/assign @hexfusion

[kikisdeliveryservice]

until they confirm desired functionality/results in testing

/hold

[kikisdeliveryservice]

nstalling from release registry.svc.ci.openshift.org/ci-op-csd96v5y/release@sha256:3f0e269fe328f29ec0469283f518a4390222608bc2dc165aa256ea310c3f490b
AWS region: us-west-1 (zones: us-west-1a us-west-1b)
level=info msg="Credentials loaded from the \"default\" profile in file \"/etc/openshift-installer/.awscred\""
level=warning msg="Found override for release image. Please be warned, this is not advised"
level=info msg="Consuming Install Config from target directory"
level=info msg="Creating infrastructure resources..."
level=error
level=error msg="Error: timeout while waiting for state to become 'INSYNC' (last state: 'PENDING', timeout: 30m0s)"
level=error
level=error msg="  on ../tmp/openshift-install-212653961/route53/base.tf line 33, in resource \"aws_route53_record\" \"api_external\":"
level=error msg="  33: resource \"aws_route53_record\" \"api_external\" {"
level=error
level=error
level=fatal msg="failed to fetch Cluster: failed to generate asset \"Cluster\": failed to create cluster: failed to apply using Terraform" 

Update: reported to 4-dev

/test e2e-aws

[hexfusion]

We can clean this up after code freeze I think it is a reasonable assumption that upgrade of a node happens inCluster()

/lgtm

[alaypatel07]

2020/01/24 22:47:53 Submitted failure event to sentry (id=e9705aee4e7145c0b46f8aa005ecf56a)
error: could not run steps: step e2e-aws failed: cannot resolve parameter IMAGE_FORMAT into template e2e-aws: could not lazily evaluate deferred parameter: imagestreams.image.openshift.io "pipeline" is forbidden: User "system:serviceaccount:ci:ci-operator" cannot get imagestreams.image.openshift.io in the namespace "ci-op-z1n7sdv1": no RBAC policy matched

looks like flake

/test e2e-aws

[alaypatel07]

level=error
level=error msg="  on ../tmp/openshift-install-588440333/vpc/vpc-public.tf line 1, in resource \"aws_internet_gateway\" \"igw\":"
level=error msg="   1: resource \"aws_internet_gateway\" \"igw\" {"
level=error
level=error
level=fatal msg="failed to fetch Cluster: failed to generate asset \"Cluster\": failed to create cluster: failed to apply using Terraform"

/test e2e-aws

[alaypatel07]

/test e2e-aws-scaleup-rhel7

[alaypatel07]

/test e2e-aws

[kikisdeliveryservice]

Adding an approval.

@hexfusion @alaypatel07 please remove the hold once you are satisfied with your manual testing.

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alaypatel07, hexfusion, kikisdeliveryservice

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [kikisdeliveryservice]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[alaypatel07]

@kikisdeliveryservice @hexfusion I had 2 manual upgrades and a fresh install with this PR and CEO enabled... looking good!

[alaypatel07]

/test e2e-aws-scaleup-rhel7

[alaypatel07]

/hold cancel

[openshift-ci-robot]

@alaypatel07: The following test failed, say /retest to rerun all failed tests:

Test name	Commit	Details	Rerun command
ci/prow/e2e-aws-scaleup-rhel7	598de48	link	/test e2e-aws-scaleup-rhel7

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

[hexfusion]

/test e2e-aws

[hexfusion]

/skip