Skip to content

Conversation

@sriroopar
Copy link
Contributor

@sriroopar sriroopar commented Sep 23, 2025

Description

Functionality has been added in order to ensure that the reconciliation happens in the postgres pod by watching the config for deletion of ca certs. This will allow the e2e test to run successfully.

Type of change

  • Refactor
  • New feature
  • Bug fix
  • CVE fix
  • Optimization
  • Documentation Update
  • Configuration Update
  • Bump-up dependent library

Related Tickets & Documents

Checklist before requesting a review

  • I have performed a self-review of my code.
  • PR has passed all pre-merge test jobs.
  • If it is a core feature, I have added thorough tests.

Testing

  • Please provide detailed steps to perform tests related to this code change.
    Functionality was verified by watching reconciliation activity when ca cert was intentionally deleted.

  • How were the fix/results from this change verified? Please provide relevant screenshots or results.

The fix was verified by deleting the olsconfig-service-ca signing-key certificate/ olsconfig ca.crt configmap, and the pods were observed for rollouts with updated cert.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 23, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 23, 2025

@sriroopar: This pull request references OLS-1775 which is a valid jira issue.

In response to this:

Description

Functionality has been added in order to ensure that the reconciliation happens in the postgres pod by watching the config for deletion of ca certs. This will allow the e2e test to run successfully.

Type of change

  • Refactor
  • New feature
  • Bug fix
  • CVE fix
  • Optimization
  • Documentation Update
  • Configuration Update
  • Bump-up dependent library

Related Tickets & Documents

Checklist before requesting a review

  • I have performed a self-review of my code.
  • PR has passed all pre-merge test jobs.
  • If it is a core feature, I have added thorough tests.

Testing

  • Please provide detailed steps to perform tests related to this code change.
    Functionality was verified by watching reconciliation activity when ca cert was intentionally deleted.

  • How were the fix/results from this change verified? Please provide relevant screenshots or results.

The fix was verified by deleting the olsconfig-service-ca signing-key certificate, and the pods were observed for rollouts with updated cert.

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot requested review from bparees and xrajesh September 23, 2025 19:01
@sriroopar
Copy link
Contributor Author

/retest

3 similar comments
@sriroopar
Copy link
Contributor Author

/retest

@sriroopar
Copy link
Contributor Author

/retest

@sriroopar
Copy link
Contributor Author

/retest

@sriroopar
Copy link
Contributor Author

/test bundle-e2e-4-18

@openshift-ci-robot
Copy link

openshift-ci-robot commented Oct 1, 2025

@sriroopar: This pull request references OLS-1775 which is a valid jira issue.

In response to this:

Description

Functionality has been added in order to ensure that the reconciliation happens in the postgres pod by watching the config for deletion of ca certs. This will allow the e2e test to run successfully.

Type of change

  • Refactor
  • New feature
  • Bug fix
  • CVE fix
  • Optimization
  • Documentation Update
  • Configuration Update
  • Bump-up dependent library

Related Tickets & Documents

Checklist before requesting a review

  • I have performed a self-review of my code.
  • PR has passed all pre-merge test jobs.
  • If it is a core feature, I have added thorough tests.

Testing

  • Please provide detailed steps to perform tests related to this code change.
    Functionality was verified by watching reconciliation activity when ca cert was intentionally deleted.

  • How were the fix/results from this change verified? Please provide relevant screenshots or results.

The fix was verified by deleting the olsconfig-service-ca signing-key certificate/ olsconfig ca.crt configmap, and the pods were observed for rollouts with updated cert.

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 openshift-eng/jira-lifecycle-plugin repository.

@sriroopar sriroopar force-pushed the postgres-cert-rotation branch 2 times, most recently from 02cf600 to 3162eff Compare October 1, 2025 12:58
@syedriko
Copy link
Contributor

@sriroopar could you squash the commits, please?

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 13, 2025
@sriroopar sriroopar force-pushed the postgres-cert-rotation branch from 6b9f4af to ca97db2 Compare October 13, 2025 17:25
@openshift-ci
Copy link

openshift-ci bot commented Oct 13, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign bparees for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 13, 2025
@sriroopar sriroopar force-pushed the postgres-cert-rotation branch from 439a87e to ca97db2 Compare October 13, 2025 17:36
@openshift-merge-robot openshift-merge-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Oct 13, 2025
@sriroopar sriroopar force-pushed the postgres-cert-rotation branch from 4f9c62c to ca97db2 Compare October 13, 2025 18:04
@openshift-merge-robot openshift-merge-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Oct 13, 2025
@sriroopar
Copy link
Contributor Author

/retest

1 similar comment
@sriroopar
Copy link
Contributor Author

/retest

@sriroopar sriroopar force-pushed the postgres-cert-rotation branch from 7bfce63 to e1f4b37 Compare October 13, 2025 20:01
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 13, 2025
@sriroopar sriroopar force-pushed the postgres-cert-rotation branch from e1f4b37 to 07eb78c Compare October 13, 2025 20:17
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 13, 2025
@sriroopar sriroopar force-pushed the postgres-cert-rotation branch from 07eb78c to 3aa1f4a Compare October 13, 2025 20:21
@openshift-ci
Copy link

openshift-ci bot commented Oct 13, 2025

@sriroopar: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/bundle-e2e-4-18 51d0e9d link true /test bundle-e2e-4-18

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

@sriroopar sriroopar force-pushed the postgres-cert-rotation branch from 3aa1f4a to c516853 Compare October 13, 2025 20:22
@sriroopar
Copy link
Contributor Author

/retest

@sriroopar sriroopar force-pushed the postgres-cert-rotation branch from c516853 to cf657e5 Compare October 13, 2025 21:02
@syedriko
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 15, 2025
@sriroopar sriroopar force-pushed the postgres-cert-rotation branch from 82a858d to 41e0fd8 Compare October 15, 2025 02:35
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Oct 15, 2025
@syedriko
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 15, 2025
PostgresSecretHashKey = "hash/postgres-secret"
// PostgresCAHashKey is the key of the hash value of the OLS Postgres CA certificate
PostgresCAHashKey = "hash/postgres-ca"
// PostgresServiceCACertKey is the key for the service CA certificate in the ConfigMap
Copy link
Contributor

Choose a reason for hiding this comment

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

Update the name of the configmap

PostgresCAHashKey = "hash/postgres-ca"
// PostgresServiceCACertKey is the key for the service CA certificate in the ConfigMap
PostgresServiceCACertKey = "service-ca.crt"
// PostgresTLSCertKey is the key for the TLS certificate in the Secret
Copy link
Contributor

Choose a reason for hiding this comment

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

Update the name of the Secret

storage := &olsv1alpha1.Storage{}
if cr.Spec.OLSConfig.Storage != nil {
storage = cr.Spec.OLSConfig.Storage.DeepCopy()
}
Copy link
Contributor

@xrajesh xrajesh Oct 29, 2025

Choose a reason for hiding this comment

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

@sriroopar Not sure what triggered to make the above lines part of this PR - looks unrelated - change is valid though.

return ctrl.NewControllerManagedBy(mgr).
For(&olsv1alpha1.OLSConfig{}).
Owns(&appsv1.Deployment{}, generationChanged).
Owns(&appsv1.Deployment{}).
Copy link
Contributor

Choose a reason for hiding this comment

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

@sriroopar Why are we removing the Predicate part of this change ?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants