Minor bug fixes

rancher · Sep 14, 2022 · 1fea56b · 1fea56b
1 parent 8ded2a9
commit 1fea56b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/pkg/resources/opniopensearch/opniopensearch.go b/pkg/resources/opniopensearch/opniopensearch.go
@@ -96,11 +96,17 @@ func (r *Reconciler) Reconcile() (*reconcile.Result, error) {
 }
 
 func (r *Reconciler) buildOpensearchCluster() *opsterv1.OpenSearchCluster {
+	// Set default image version
+	version := r.spec.Version
+	if version == "unversioned" {
+		version = "0.5.4"
+	}
+
 	image := fmt.Sprintf(
 		"%s/opensearch:%s-%s",
 		r.spec.ImageRepo,
 		r.spec.OpensearchVersion,
-		r.spec.Version,
+		version,
 	)
 	cluster := &opsterv1.OpenSearchCluster{
 		ObjectMeta: metav1.ObjectMeta{
@@ -112,7 +118,7 @@ func (r *Reconciler) buildOpensearchCluster() *opsterv1.OpenSearchCluster {
 				ImageSpec: &opsterv1.ImageSpec{
 					Image: &image,
 				},
-				Version:          r.spec.Version,
+				Version:          r.spec.OpensearchVersion,
 				ServiceName:      fmt.Sprintf("%s-opensearch-svc", r.instanceName),
 				HttpPort:         9200,
 				SetVMMaxMapCount: true,

diff --git a/plugins/logging/pkg/logging/admin.go b/plugins/logging/pkg/logging/admin.go
@@ -147,6 +147,7 @@ func (p *Plugin) CreateOrUpdateOpensearchCluster(
 					}
 					return util.Version
 				}(),
+				ImageRepo: "docker.io/rancher",
 			},
 		}
 		return &emptypb.Empty{}, p.k8sClient.Create(ctx, k8sOpensearchCluster)
@@ -170,7 +171,7 @@ func (p *Plugin) CreateOrUpdateOpensearchCluster(
 		return p.k8sClient.Update(ctx, k8sOpensearchCluster)
 	})
 
-	return nil, err
+	return &emptypb.Empty{}, err
 }
 
 func (p *Plugin) UpgradeAvailable(context.Context, *emptypb.Empty) (*loggingadmin.UpgradeAvailableResponse, error) {
@@ -418,7 +419,7 @@ func convertProtobufToNodePool(pool *loggingadmin.OpensearchNodeDetails, cluster
 			if err != nil {
 				return opsterv1.NodePool{}, err
 			}
-			resources.Requests[corev1.ResourceCPU] = limit
+			resources.Limits[corev1.ResourceCPU] = limit
 		}
 	}