updating olm kustomize to remove default values from env

[acornett21]

Issue #, if available:

• Fixes: All newly release controllers fail to start on OpenShift community#1238

Description of changes:
Updating the olm kustomize file to go back to previous state before default values were added into the env section of the deployment.yaml.tpl. Ideally it would be best to be able to keep these defaults, but even moving everything into the env and away from the envFrom did not work properly in a cluster, so I feel this is the best option that we have.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Signed-off-by: Adam D. Cornett [email protected]

[ack-bot]

Hi @acornett21. Thanks for your PR.

I'm waiting for a aws-controllers-k8s member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

[RedbackThomson]

Thank you for figuring this out. It's a shame we can't do an intelligent merge strategy, but I'm happy with this for now. It just means we have to be aware of the OLM user config file whenever we add an environment variable.

[RedbackThomson]

/lgtm

[ack-bot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: acornett21, RedbackThomson, vijtrip2

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 [RedbackThomson,vijtrip2]

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

[acornett21]

Thank you for figuring this out. It's a shame we can't do an intelligent merge strategy, but I'm happy with this for now. It just means we have to be aware of the OLM user config file whenever we add an environment variable.

@RedbackThomson I'm pretty sad merge did not work as well, when I moved everything into the env section ie the defaults plus the values from the config map, it resulted in this format

- name: ACK_LOG_LEVEL
          value: info
          valueFrom:
            configMapKeyRef:
              key: ACK_LOG_LEVEL
              name: ack-user-config

Which does not work in a cluster.