search

openstack-k8s-operators / openstack-operator

Meta Operator for OpenStack
https://openstack-k8s-operators.github.io/openstack-operator/
Apache License 2.0
27 stars 76 forks source link

[OSPRH-8705] Fix SwiftStorage replicas update nil pointer #951

Closed abays closed 2 months ago

abays commented 2 months ago

If the OpenStackControlPlane CR's spec.swift.template section is missing, trying to oc patch it fails due to a nil-pointer on the server side.

Depends-on: https://github.com/openstack-k8s-operators/swift-operator/pull/248

Jira: https://issues.redhat.com/browse/OSPRH-8705

openshift-ci[bot] commented 2 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abays, stuggi

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/openstack-k8s-operators/openstack-operator/blob/main/OWNERS)~~ [abays,stuggi] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
softwarefactory-project-zuul[bot] commented 2 months ago

Build failed (check pipeline). Post recheck (without leading slash) to rerun all jobs. Make sure the failure cause has been resolved before you rerun jobs.

https://review.rdoproject.org/zuul/buildset/195a09828acc4b11a4cf1e5c614aa06e

:heavy_check_mark: openstack-k8s-operators-content-provider SUCCESS in 2h 43m 50s :heavy_check_mark: podified-multinode-edpm-deployment-crc SUCCESS in 1h 21m 14s :x: cifmw-crc-podified-edpm-baremetal RETRY_LIMIT in 10m 44s :heavy_check_mark: cifmw-data-plane-adoption-osp-17-to-extracted-crc SUCCESS in 2h 29m 07s :heavy_check_mark: openstack-operator-tempest-multinode SUCCESS in 1h 56m 13s

abays commented 2 months ago

recheck

RETRY_LIMIT

abays commented 3 weeks ago

/cherry-pick 18.0.0-proposed

openshift-cherrypick-robot commented 3 weeks ago

@abays: #951 failed to apply on top of branch "18.0.0-proposed":

Applying: Fix SwiftStorage replicas update nil pointer
Using index info to reconstruct a base tree...
M   apis/go.mod
M   apis/go.sum
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
Auto-merging apis/go.sum
CONFLICT (content): Merge conflict in apis/go.sum
Auto-merging apis/go.mod
CONFLICT (content): Merge conflict in apis/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 0001 Fix SwiftStorage replicas update nil pointer
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/openstack-k8s-operators/openstack-operator/pull/951#issuecomment-2326760869): >/cherry-pick 18.0.0-proposed 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-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.