pgupgrade: Update pgupgrade path (PROJQUAY-7329)

[jonathankingfc]

• Remove base from pgupgrade path to ensure that the file location is parsed properly by kustomize package

[dmage]

/cherrypick redhat-3.12

[openshift-cherrypick-robot]

@dmage: once the present PR merges, I will cherry-pick it on top of redhat-3.12 in a new PR and assign it to you.

In response to this:

/cherrypick redhat-3.12

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.

[openshift-cherrypick-robot]

@dmage: #934 failed to apply on top of branch "redhat-3.12":

Applying: pgupgrade: Update pgupgrade path (PROJQUAY-7329)
Using index info to reconstruct a base tree...
M	pkg/kustomize/kustomize.go
M	pkg/kustomize/kustomize_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/kustomize/kustomize_test.go
CONFLICT (content): Merge conflict in pkg/kustomize/kustomize_test.go
Auto-merging pkg/kustomize/kustomize.go
CONFLICT (content): Merge conflict in pkg/kustomize/kustomize.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 pgupgrade: Update pgupgrade path (PROJQUAY-7329)
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick redhat-3.12

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.

[dmage]

/cherrypick redhat-3.12

[openshift-cherrypick-robot]

@dmage: new pull request created: #936

In response to this:

/cherrypick redhat-3.12

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.

[dmage]

/cherrypick redhat-3.11

[openshift-cherrypick-robot]

@dmage: new pull request created: #937

In response to this:

/cherrypick redhat-3.11

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.