openshift / ocp-release-operator-sdk

Apache License 2.0
16 stars 39 forks source link

Merge upstream tag v1.28.0 #310

Closed rashmigottipati closed 1 year ago

rashmigottipati commented 1 year ago

Operator SDK v1.28.0

Merge executed via ./UPSTREAM-MERGE.sh v1.28.0

rashmigottipati commented 1 year ago

@everettraven Good catch! Updated the SIMPLE_VERSION to v1.28.0-ocp in latest bfa002d

rashmigottipati commented 1 year ago

@emmajiafan @michaelryanpeter Would like to get QE and Docs signoff on this if everything looks good.

/cc @oceanc80

openshift-ci[bot] commented 1 year ago

@rashmigottipati: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
adellape commented 1 year ago

/label docs-approved

emmajiafan commented 1 year ago

/label qe-approved

openshift-ci[bot] commented 1 year ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: everettraven, rashmigottipati, varshaprasad96

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: - ~~[OWNERS](https://github.com/openshift/ocp-release-operator-sdk/blob/master/OWNERS)~~ [everettraven,varshaprasad96] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
openshift-cherrypick-robot commented 1 year ago

@rashmigottipati: #310 failed to apply on top of branch "release-4.13":

Applying: updating PodSecurityContext and SecurityContext for scorecard pod/containers (#6294)
Applying: fix broken links to molecule docs (#6313)
Applying: fix ansible CI (#6325)
Applying: (ansible): update ansible base images to use multi-stage builds (#6333)
Applying: update kubernetes.core collection default to v2.4.0 (#6334)
Applying: Bump operator-manifest-tools dependency (#6316)
Applying: Update tutorial.md (#6311)
Applying: Fixes to golang tutorial (#6321)
Applying: (scorecard): Add new images for default untar and storage options (#6335)
Applying: Adds note about repo flag (#6312)
Applying: (actions): Fix Ansible-Operator base image build problems due to `cryptography` package (#6348)
Applying: Upgrade SDK to use Kubernetes 1.26.2 (#6352)
.git/rebase-apply/patch:177: trailing whitespace.
        - bundle/manifests/memcached-operator.clusterserviceversion.yaml        
.git/rebase-apply/patch:201: trailing whitespace.
           - Replacing 
.git/rebase-apply/patch:202: trailing whitespace.
          ```diff 
warning: 3 lines add whitespace errors.
Using index info to reconstruct a base tree...
M   go.mod
M   go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0012 Upgrade SDK to use Kubernetes 1.26.2 (#6352)
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](https://github.com/openshift/ocp-release-operator-sdk/pull/310#issuecomment-1473865617): >/cherrypick release-4.13 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
rashmigottipati commented 1 year ago

/cherry-pick release-4.13

openshift-cherrypick-robot commented 1 year ago

@rashmigottipati: #310 failed to apply on top of branch "release-4.13":

Applying: updating PodSecurityContext and SecurityContext for scorecard pod/containers (#6294)
Applying: fix broken links to molecule docs (#6313)
Applying: fix ansible CI (#6325)
Applying: (ansible): update ansible base images to use multi-stage builds (#6333)
Applying: update kubernetes.core collection default to v2.4.0 (#6334)
Applying: Bump operator-manifest-tools dependency (#6316)
Applying: Update tutorial.md (#6311)
Applying: Fixes to golang tutorial (#6321)
Applying: (scorecard): Add new images for default untar and storage options (#6335)
Applying: Adds note about repo flag (#6312)
Applying: (actions): Fix Ansible-Operator base image build problems due to `cryptography` package (#6348)
Applying: Upgrade SDK to use Kubernetes 1.26.2 (#6352)
.git/rebase-apply/patch:177: trailing whitespace.
        - bundle/manifests/memcached-operator.clusterserviceversion.yaml        
.git/rebase-apply/patch:201: trailing whitespace.
           - Replacing 
.git/rebase-apply/patch:202: trailing whitespace.
          ```diff 
warning: 3 lines add whitespace errors.
Using index info to reconstruct a base tree...
M   go.mod
M   go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0012 Upgrade SDK to use Kubernetes 1.26.2 (#6352)
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](https://github.com/openshift/ocp-release-operator-sdk/pull/310#issuecomment-1473867372): >/cherry-pick release-4.13 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.