Closed rashmigottipati closed 1 year ago
@everettraven Good catch! Updated the SIMPLE_VERSION
to v1.28.0-ocp
in latest bfa002d
@emmajiafan @michaelryanpeter Would like to get QE and Docs signoff on this if everything looks good.
/cc @oceanc80
@rashmigottipati: all tests passed!
Full PR test history. Your PR dashboard.
/label docs-approved
/label qe-approved
[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
@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".
/cherry-pick release-4.13
@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".
Operator SDK v1.28.0
Merge executed via ./UPSTREAM-MERGE.sh v1.28.0