Skip to content

Update the string splitter in OperandConfig status #766

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.

Sign up for GitHub

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
ibm-ci-bot merged 1 commit into from
Nov 23, 2021
Merged

Update the string splitter in OperandConfig status #766

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions controllers/operandconfig/operandconfig_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ func (r *Reconciler) updateStatus(ctx context.Context, instance *operatorv1alpha
if resource.Namespace != "" {
k8sNamespace = resource.Namespace
}
resourceKey := k8sAPIVersion + "." + k8sKind + "." + k8sNamespace + "." + k8sName
resourceKey := k8sAPIVersion + "@" + k8sKind + "@" + k8sNamespace + "@" + k8sName

k8sUnstruct.SetAPIVersion(k8sAPIVersion)
k8sUnstruct.SetKind(k8sKind)
Expand Down Expand Up @@ -269,7 +269,7 @@ func (r *Reconciler) updateStatus(ctx context.Context, instance *operatorv1alpha
// deleteK8sReousceFromStatus deletes the k8s resources from OperandConfig Status when they are not defined in OperandConfig Spec anymore
func (r *Reconciler) deleteK8sReousceFromStatus(ctx context.Context, serviceStatus map[string]operatorv1alpha1.CrStatus, service *operatorv1alpha1.ConfigService, op *operatorv1alpha1.Operator) error {
merr := &util.MultiErr{}
reg, _ := regexp.Compile(`^(.*)\.(.*)\.(.*)\.(.*)`)
reg, _ := regexp.Compile(`^(.*)\@(.*)\@(.*)\@(.*)`)
var existingResList []string
for key := range serviceStatus[op.Name].CrStatus {
if reg.MatchString((key)) {
Expand Down