Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set requests on operator and router deployments #115

Conversation

Miciah
Copy link
Contributor

@Miciah Miciah commented Feb 5, 2019

Set resources.requests.cpu=10m on the operator's container, and set resources.requests.cpu=100m and resources.requests.memory=256Mi on the router's container.

The setting for the operator is the standard setting for operators that run on masters. The setting for the router is the default in Origin 3.11.

This commit resolves NE-142.

  • assets/router/deployment.yaml: Set resources.requests.cpu=100m and resources.requests.memory=256Mi on the router container.
  • manifests/02-deployment.yaml: Set resources.requests.cpu=10m on the operator container.
  • pkg/manifests/bindata.go: Regenerate.

@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 5, 2019
Set resources.requests.cpu=10m on the operator's container, and set
resources.requests.cpu=100m and resources.requests.memory=256Mi on the
router's container.

The setting for the operator is the standard setting for operators that run
on masters.  The setting for the router is the default in Origin 3.11 (see
<https://github.com/openshift/origin/blob/b054a7bf5b11c760e5dd0f870fc852cc9b8b748b/pkg/oc/cli/admin/router/router.go#L907-L912>).

This commit resolves NE-142.

https://jira.coreos.com/browse/NE-142

* assets/router/deployment.yaml: Set resources.requests.cpu=100m and
resources.requests.memory=256Mi on the router container.
* manifests/02-deployment.yaml: Set resources.requests.cpu=10m on the
operator container.
* pkg/manifests/bindata.go: Regenerate.
@Miciah Miciah force-pushed the NE-142-set-requests-on-operator-and-router-deployments branch from c9033f8 to 179cf62 Compare February 5, 2019 01:30
@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 5, 2019
@Miciah
Copy link
Contributor Author

Miciah commented Feb 5, 2019

pods.json from the e2e-aws-operator test run has

    {
        "apiVersion": "v1",
        "kind": "Pod",
        "metadata": {
            "annotations": {
                "k8s.v1.cni.cncf.io/networks-status": "[{\n    \"name\": \"openshift-sdn\",\n    \"ips\": [\n        \"10.129.0.19\"\n    ],\n    \"default\": true,\n    \"dns\": {}\n}]"
            },
            "creationTimestamp": "2019-02-05T02:07:03Z",
            "generateName": "ingress-operator-75c64d894-",
            "labels": {
                "name": "ingress-operator",
                "pod-template-hash": "75c64d894"
            },
            "name": "ingress-operator-75c64d894-49266",
            "namespace": "openshift-ingress-operator",
            ...
        },
        "spec": {
            "containers": [
                {
                    ...
                    "resources": {
                        "requests": {
                            "cpu": "10m"
                        }
                    },
                   ...

and

    {
        "apiVersion": "v1",
        "kind": "Pod",
        "metadata": {
            "creationTimestamp": "2019-02-05T02:07:21Z",
            "generateName": "router-default-6d854c5dc6-",
            "labels": {
                "app": "router",
                "pod-template-hash": "6d854c5dc6",
                "router": "router-default"
            },
            "name": "router-default-6d854c5dc6-kpvhf",
            "namespace": "openshift-ingress",
            ...
        "spec": {
            "containers": [
                {
                    ...
                    "resources": {
                        "requests": {
                            "cpu": "100m",
                            "memory": "256Mi"
                        }
                    },

@ironcladlou
Copy link
Contributor

/lgtm

@Miciah
Copy link
Contributor Author

Miciah commented Feb 5, 2019

/refresh

@ironcladlou
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 6, 2019
Copy link

@pravisankar pravisankar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ironcladlou, Miciah, pravisankar

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 [Miciah,ironcladlou,pravisankar]

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

@openshift-merge-robot
Copy link
Contributor

/retest

@openshift-merge-robot openshift-merge-robot merged commit 6214e12 into openshift:master Feb 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants