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

MGDAPI-5758 : set subscription resources to be empty #3247

Merged
merged 1 commit into from
Jun 1, 2023

Conversation

Boomatang
Copy link
Contributor

Issue link

https://issues.redhat.com/browse/MGDAPI-5758

What

Set resources in the subscription so that the resources values are not taken form the CSV's

Verification steps

  • install RHOAM 1.36
  • check resources on operators in, resources should be set
    • 3scale
    • marin3r
    • observability
  • upgrade to this branch
  • recheck the resources on the operators
  • EXPECTED: resources set to the namespace default which does not include values for the limits.

@codecov
Copy link

codecov bot commented May 31, 2023

Codecov Report

Merging #3247 (8ac02c8) into master (3561b03) will decrease coverage by 0.03%.
The diff coverage is 0.00%.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3247      +/-   ##
==========================================
- Coverage   72.97%   72.94%   -0.03%     
==========================================
  Files         103      103              
  Lines       29767    29778      +11     
==========================================
  Hits        21721    21721              
- Misses       7243     7254      +11     
  Partials      803      803              
Impacted Files Coverage Δ
pkg/resources/marketplace/manager.go 25.88% <0.00%> (-3.85%) ⬇️

@Boomatang
Copy link
Contributor Author

/retest

@adam-cattermole
Copy link
Member

adam-cattermole commented May 31, 2023

Tested this on cluster and can see that the resource config is set on the deployment before the change, and it gets removed after:

1.36.0 deployment:

containers:
  - resources:
      limits:
        cpu: 100m
        memory: 300Mi
      requests:
        cpu: 100m
        memory: 300Mi

This PR deployment:

containers:
  - resources: {}

1.36.0 subscription:

spec:
  channel: threescale-mas
  installPlanApproval: Manual
  name: 3scale-operator
  source: rhmi-registry-cs
  sourceNamespace: redhat-rhoam-3scale-operator

This PR subscription:

spec:
  channel: threescale-mas
  config:
    resources: {}
  installPlanApproval: Manual
  name: 3scale-operator
  source: rhmi-registry-cs
  sourceNamespace: redhat-rhoam-3scale-operator

Can see that the limits are removed across the board post upgrade:
image

/lgtm

@austincunningham
Copy link
Member

/approve
/override codecov/project

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 1, 2023

@austincunningham: Overrode contexts on behalf of austincunningham: codecov/project

In response to this:

/approve
/override codecov/project

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.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 1, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: austincunningham

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved label Jun 1, 2023
@openshift-merge-robot openshift-merge-robot merged commit bebd4dd into integr8ly:master Jun 1, 2023
15 of 16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants