Skip to content

Commit

Permalink
Add resources requests/limits to oauth_proxy
Browse files Browse the repository at this point in the history
Signed-off-by: Ruben Vargas <[email protected]>
  • Loading branch information
rubenvp8510 committed May 14, 2019
1 parent a5c3011 commit fdc92dd
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions pkg/inject/oauth-proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"github.com/jaegertracing/jaeger-operator/pkg/account"
"github.com/jaegertracing/jaeger-operator/pkg/apis/jaegertracing/v1"
"github.com/jaegertracing/jaeger-operator/pkg/service"
"github.com/jaegertracing/jaeger-operator/pkg/util"
)

// OAuthProxy injects an appropriate proxy into the given deployment
Expand Down Expand Up @@ -43,6 +44,7 @@ func getOAuthProxyContainer(jaeger *v1.Jaeger) corev1.Container {
"--tls-key=/etc/tls/private/tls.key",
"--upstream=http://localhost:16686",
}
commonSpec := util.Merge([]v1.JaegerCommonSpec{jaeger.Spec.Ingress.JaegerCommonSpec, jaeger.Spec.JaegerCommonSpec})

return corev1.Container{
Image: viper.GetString("openshift-oauth-proxy-image"),
Expand All @@ -58,5 +60,6 @@ func getOAuthProxyContainer(jaeger *v1.Jaeger) corev1.Container {
Name: "public",
},
},
Resources: commonSpec.Resources,
}
}

0 comments on commit fdc92dd

Please sign in to comment.