Skip to content

K8SPG 741 Merge upstream changes for 2.7.0 #1094

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

Merged
merged 45 commits into from
Apr 14, 2025
Merged

K8SPG 741 Merge upstream changes for 2.7.0 #1094

merged 45 commits into from
Apr 14, 2025

Conversation

gkech
Copy link
Contributor

@gkech gkech commented Mar 18, 2025

K8SPG-741 Powered by Pull Request Badge

https://github.com/CrunchyData/postgres-operator/compare/bdcb7eb9b50bd01f1674fc2f6ffdd022bd9058d5..072a19d31465d99963b52205885cd8e01c747f3a

We skipped these:

CHANGE DESCRIPTION

Problem:
Short explanation of the problem.

Cause:
Short explanation of the root cause of the issue if applicable.

Solution:
Short explanation of the solution we are providing with this PR.

CHECKLIST

Jira

  • Is the Jira ticket created and referenced properly?
  • Does the Jira ticket have the proper statuses for documentation (Needs Doc) and QA (Needs QA)?
  • Does the Jira ticket link to the proper milestone (Fix Version field)?

Tests

  • Is an E2E test/test case added for the new feature/change?
  • Are unit tests added where appropriate?

Config/Logging/Testability

  • Are all needed new/changed options added to default YAML files?
  • Are all needed new/changed options added to the Helm Chart?
  • Did we add proper logging messages for operator actions?
  • Did we ensure compatibility with the previous version or cluster upgrade process?
  • Does the change support oldest and newest supported PG version?
  • Does the change support oldest and newest supported Kubernetes version?

@it-percona-cla
Copy link

it-percona-cla commented Mar 18, 2025

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 5 committers have signed the CLA.

✅ gkech
❌ cbandy
❌ dsessler7
❌ benjaminjb
❌ tjmoore4
You have signed the CLA already but the status is still pending? Let us recheck it.

@egegunes egegunes added this to the 2.7.0 milestone Mar 31, 2025
@gkech gkech force-pushed the K8SPG-741 branch 5 times, most recently from 0aa9c09 to 473e93d Compare April 2, 2025 06:59
@gkech gkech changed the title K8SPG 741 K8SPG 741 Merge upstream changes for 2.7.0 Apr 2, 2025
if err != nil {
return result, err
}
clusterbyte, _ := json.Marshal(clusterRequestPayload)
Copy link
Contributor

Choose a reason for hiding this comment

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

interesting, i wonder why upstream decided to ignore the error

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

reverted this

@@ -13,7 +13,7 @@ import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
. "github.com/onsi/gomega/gstruct"
"github.com/pkg/errors"
"github.com/pkg/errors" //nolint:depguard // This legacy test covers so much code, it logs the origin of unexpected errors.

Copy link
Contributor

Choose a reason for hiding this comment

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

[goimports-reviser] reported by reviewdog 🐶

Suggested change

@gkech gkech force-pushed the K8SPG-741 branch 3 times, most recently from 4ec68cc to bfe72f4 Compare April 9, 2025 08:22
tjmoore4 and others added 17 commits April 9, 2025 12:26
This test duplicates what's in the main e2e folder.
This version of controller-gen ignores "validation:Required" markers
when the struct tag has "json:omitempty".

Issue: PGO-1748
Issue: PGO-738
Issue: PGO-1829
For some reason, this was originally created without PGO
listed as the manager for the configmap used by upgrade check.
These are specific to Postgres. Add tests and remove unused functions.
This is part of the "bugs" preset of golangci-lint.
The "check-error-free-encoding" setting is recommended upstream.
These are ignored by golangci-lint by default.
Subtle bugs can arise when mixing the two. A type is more coherent when
it behaves as only one of (1) a value or (2) a reference.

A new linter identifies this situation but does not yet account for
unmarshal methods on value types.

See: https://go.dev/wiki/CodeReviewComments#receiver-type
See: https://go.dev/wiki/MethodSets
The default unstructured converter does not complain if you try to
convert a list to an object or vice versa. It also expects to be called
with an empty target object.
@gkech gkech marked this pull request as ready for review April 9, 2025 10:54
egegunes
egegunes previously approved these changes Apr 10, 2025
@gkech
Copy link
Contributor Author

gkech commented Apr 11, 2025

passed locally

Screenshot 2025-04-11 at 5 41 49 PM

@gkech gkech requested a review from egegunes April 11, 2025 14:48
@hors hors merged commit a71d121 into main Apr 14, 2025
16 of 18 checks passed
@hors hors deleted the K8SPG-741 branch April 14, 2025 12:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants