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

CCXDEV-11946: finalize the config update to the new config map #857

Merged
merged 9 commits into from
Dec 1, 2023

Conversation

tremes
Copy link
Contributor

@tremes tremes commented Nov 2, 2023

This finalizes the move of configuration from the legacy support secret to a new insights-config config map.
The configmap definition can look like:

data:
  config.yaml: |
    dataReporting:
      interval: 30m
      obfuscation:
      - workload_names
      - networking
    sca:
      disabled: false
    alerting:
      disabled: false
    proxy:
      httpProxy: http://example.com
      httpsProxy: https://example.com
      noProxy: test.org
    clusterTransfer:
      interval: 1h

The operator logs every config change and it looks like:

periodic.go:257] Configuration is 
	dataReporting:
		interval: 30m0s,
		uploadEndpoint: https://console.redhat.com/api/ingress/v1/upload,
		storagePath: /var/lib/insights-operator,
		downloadEndpoint: https://console.redhat.com/api/insights-results-aggregator/v2/cluster/%s/reports, 
		conditionalGathererEndpoint: https://console.redhat.com/api/gathering/gathering_rules,
		obfuscation: [workload_names networking]
	sca:
		disabled: false,
		endpoint: https://api.openshift.com/api/accounts_mgmt/v1/certificates,
		interval: 8h0m0s
	alerting:
		disabled: false
	clusterTransfer:
		endpoint: https://api.openshift.com/api/accounts_mgmt/v1/cluster_transfers/,
		interval: 1h0m0s
	proxy:
		httpProxy: http://example.com,
		httpsProxy: https://example.com,
		noProxy: test.org

Categories`

  • Bugfix
  • Data Enhancement
  • Feature
  • Backporting
  • Others (CI, Infrastructure, Documentation)

Sample Archive

no new data

Documentation

  • path/to/documentation.md

Unit Tests

  • path/to/file_test.go

Privacy

Yes. There are no sensitive data in the newly collected information.

Changelog

Breaking Changes

Yes/No

References

https://issues.redhat.com/browse/???
https://access.redhat.com/solutions/???

@openshift-ci openshift-ci bot requested review from ncaak and rluders November 2, 2023 13:24
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 2, 2023
@tremes
Copy link
Contributor Author

tremes commented Nov 3, 2023

I think this is not 100% at the moment.
/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 3, 2023
@tremes
Copy link
Contributor Author

tremes commented Nov 7, 2023

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 7, 2023
Copy link
Contributor

@rluders rluders left a comment

Choose a reason for hiding this comment

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

Tested and seems good.
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 8, 2023
Copy link

openshift-ci bot commented Nov 8, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rluders, tremes

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

@JoaoFula
Copy link
Contributor

why is jira/valid-reference still being required?

@tremes tremes changed the title CCXDEV-11946 finalize the config update to the new config map CCXDEV-11946: finalize the config update to the new config map Nov 27, 2023
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 27, 2023
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 27, 2023

@tremes: This pull request references CCXDEV-11946 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.15.0" version, but no target version was set.

In response to this:

This finalizes the move of configuration from the legacy support secret to a new insights-config config map.
The configmap definition can look like:

data:
 config.yaml: |
   dataReporting:
     interval: 30m
     obfuscation:
     - workload_names
     - networking
   sca:
     disabled: false
   alerting:
     disabled: false
   proxy:
     httpProxy: http://example.com
     httpsProxy: https://example.com
     noProxy: test.org
   clusterTransfer:
     interval: 1h

The operator logs every config change and it looks like:

periodic.go:257] Configuration is 
  dataReporting:
  	interval: 30m0s,
  	uploadEndpoint: https://console.redhat.com/api/ingress/v1/upload,
  	storagePath: /var/lib/insights-operator,
  	downloadEndpoint: https://console.redhat.com/api/insights-results-aggregator/v2/cluster/%s/reports, 
  	conditionalGathererEndpoint: https://console.redhat.com/api/gathering/gathering_rules,
  	obfuscation: [workload_names networking]
  sca:
  	disabled: false,
  	endpoint: https://api.openshift.com/api/accounts_mgmt/v1/certificates,
  	interval: 8h0m0s
  alerting:
  	disabled: false
  clusterTransfer:
  	endpoint: https://api.openshift.com/api/accounts_mgmt/v1/cluster_transfers/,
  	interval: 1h0m0s
  proxy:
  	httpProxy: http://example.com,
  	httpsProxy: https://example.com,
  	noProxy: test.org

Categories`

  • Bugfix
  • Data Enhancement
  • Feature
  • Backporting
  • Others (CI, Infrastructure, Documentation)

Sample Archive

no new data

Documentation

  • path/to/documentation.md

Unit Tests

  • path/to/file_test.go

Privacy

Yes. There are no sensitive data in the newly collected information.

Changelog

Breaking Changes

Yes/No

References

https://issues.redhat.com/browse/???
https://access.redhat.com/solutions/???

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.

@JoaoFula
Copy link
Contributor

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Nov 29, 2023
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 29, 2023

@tremes: This pull request references CCXDEV-11946 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.15.0" version, but no target version was set.

In response to this:

This finalizes the move of configuration from the legacy support secret to a new insights-config config map.
The configmap definition can look like:

data:
 config.yaml: |
   dataReporting:
     interval: 30m
     obfuscation:
     - workload_names
     - networking
   sca:
     disabled: false
   alerting:
     disabled: false
   proxy:
     httpProxy: http://example.com
     httpsProxy: https://example.com
     noProxy: test.org
   clusterTransfer:
     interval: 1h

The operator logs every config change and it looks like:

periodic.go:257] Configuration is 
  dataReporting:
  	interval: 30m0s,
  	uploadEndpoint: https://console.redhat.com/api/ingress/v1/upload,
  	storagePath: /var/lib/insights-operator,
  	downloadEndpoint: https://console.redhat.com/api/insights-results-aggregator/v2/cluster/%s/reports, 
  	conditionalGathererEndpoint: https://console.redhat.com/api/gathering/gathering_rules,
  	obfuscation: [workload_names networking]
  sca:
  	disabled: false,
  	endpoint: https://api.openshift.com/api/accounts_mgmt/v1/certificates,
  	interval: 8h0m0s
  alerting:
  	disabled: false
  clusterTransfer:
  	endpoint: https://api.openshift.com/api/accounts_mgmt/v1/cluster_transfers/,
  	interval: 1h0m0s
  proxy:
  	httpProxy: http://example.com,
  	httpsProxy: https://example.com,
  	noProxy: test.org

Categories`

  • Bugfix
  • Data Enhancement
  • Feature
  • Backporting
  • Others (CI, Infrastructure, Documentation)

Sample Archive

no new data

Documentation

  • path/to/documentation.md

Unit Tests

  • path/to/file_test.go

Privacy

Yes. There are no sensitive data in the newly collected information.

Changelog

Breaking Changes

Yes/No

References

https://issues.redhat.com/browse/???
https://access.redhat.com/solutions/???

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-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD f440fa0 and 2 for PR HEAD bf69261 in total

@tremes
Copy link
Contributor Author

tremes commented Nov 29, 2023

/test e2e-gcp-ovn-techpreview

@tremes
Copy link
Contributor Author

tremes commented Nov 29, 2023

/retest

3 similar comments
@tremes
Copy link
Contributor Author

tremes commented Nov 30, 2023

/retest

@tremes
Copy link
Contributor Author

tremes commented Nov 30, 2023

/retest

@tremes
Copy link
Contributor Author

tremes commented Dec 1, 2023

/retest

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 4d4542e and 1 for PR HEAD bf69261 in total

@tremes
Copy link
Contributor Author

tremes commented Dec 1, 2023

Our tests passing locally and we need to fix them. Overriding for this one.
/override ci/prow/e2e-gcp-ovn-techpreview
/override ci/prow/insights-operator-e2e-tests

Copy link

openshift-ci bot commented Dec 1, 2023

@tremes: Overrode contexts on behalf of tremes: ci/prow/e2e-gcp-ovn-techpreview, ci/prow/insights-operator-e2e-tests

In response to this:

Our tests passing locally and we need to fix them. Overriding for this one.
/override ci/prow/e2e-gcp-ovn-techpreview
/override ci/prow/insights-operator-e2e-tests

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.

Copy link

openshift-ci bot commented Dec 1, 2023

@tremes: all tests passed!

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit 9b91ed4 into openshift:master Dec 1, 2023
9 checks passed
@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-insights-operator-container-v4.15.0-202312012031.p0.g9b91ed4.assembly.stream for distgit ose-insights-operator.
All builds following this will include this PR.

JoaoFula pushed a commit to JoaoFula/insights-operator that referenced this pull request Jan 23, 2024
…hift#857)

* insightsreport using new config_aggregator

* prometheuscontroller using new config_aggregator

* sca controller using new config_aggregator

* status controller using new config_aggregator

* clustertransfer controller using new config aggregator

* clusterauthorizer using new config aggregator

* files renaming

* extend tests & final adjustments

* update logging
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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants