deployment: add env vars from the Proxy object #155
Conversation
openshift-ci-robot
added
do-not-merge/work-in-progress
stlaz
changed the title
openshift-ci-robot
removed
the
do-not-merge/work-in-progress
|
Let's deal with the CA bundle once the networking team actually provides us with one -> can be reviewed. |
pkg/operator2/operator.go
Outdated
| @@ -400,6 +403,9 @@ func (c *authOperator) handleSync(operatorConfig *operatorv1.Authentication) err | |||
| return err | |||
| } | |||
|
|
|||
| proxyConfig := c.handleProxyConfig() | |||
| resourceVersions = append(resourceVersions, proxyConfig.GetResourceVersion()) | |||
There was a problem hiding this comment.
It annoys me that this adds another thing that needs explicit RV tracking. Oh well.
Use proxyConfig.ResourceVersion directly - the generic methods should only be used when dealing with Object Meta generically, not when you have a specific type.
There was a problem hiding this comment.
I guess most of it could be replaced with the config-observation logic as done in {K,O}AS-O, we'd probably only be left with checking the resource versions of configmaps/secrets (for CA/cert+priv key updates)
| @@ -236,6 +238,24 @@ func getImagePullPolicy(operatorDeployment *appsv1.Deployment) corev1.PullPolicy | |||
| return containers[0].ImagePullPolicy | |||
| } | |||
|
|
|||
| func proxyConfigToEnvVars(proxy *configv1.Proxy) []corev1.EnvVar { | |||
There was a problem hiding this comment.
This assumes that the transports that the OAuth server uses honors these proxy headers. I would like an e2e to prove that.
There was a problem hiding this comment.
Testing is huge topic that is still unaddressed throughout the whole proxy initiative. This will be follow-up.
The Proxy object specifies certain http-proxy related environmnent variables that we need setting for the operand's cotainer.
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: enj, stlaz 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:
Approvers can indicate their approval by writing |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
The Proxy object specifies certain http-proxy related environmnent
variables that we need setting for the operand's cotainer.
/cc @sttts @enj