Add delete logging data function

apis/core/v1beta1/gateway_types.go

@@ -42,7 +42,8 @@ type GatewaySpec struct {
 	Hostname         string   `json:"hostname,omitempty"`
 	PluginSearchDirs []string `json:"pluginSearchDirs,omitempty"`
 
-	Alerting *AlertingSpec `json:"alerting,omitempty"`
+	Alerting *AlertingSpec               `json:"alerting,omitempty"`
+	NatsRef  corev1.LocalObjectReference `json:"natsCluster"`
 
 	//+kubebuilder:default=LoadBalancer
 	ServiceType        corev1.ServiceType        `json:"serviceType,omitempty"`

config/crd/bases/core.opni.io_gateways.yaml

@@ -2023,6 +2023,11 @@ spec:
                     default: 0.0.0.0:12080
                     type: string
                 type: object
+              natsCluster:
+                properties:
+                  name:
+                    type: string
+                type: object
               nodeSelector:
                 additionalProperties:
                   type: string
@@ -2057,6 +2062,8 @@ spec:
                       type: string
                   type: object
                 type: array
+            required:
+            - natsCluster
             type: object
           status:
             properties:

controllers/ai_opnicluster_controller.go

@@ -31,6 +31,7 @@ import (
 	"github.com/rancher/opni/apis/v1beta2"
 	"github.com/rancher/opni/pkg/resources"
 	"github.com/rancher/opni/pkg/resources/opnicluster"
+	"github.com/rancher/opni/pkg/resources/opnicluster/elastic/indices"
 	"github.com/rancher/opni/pkg/util"
 	opsterv1 "opensearch.opster.io/api/v1"
 )
@@ -76,14 +77,14 @@ func (r *AIOpniClusterReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		return ctrl.Result{}, err
 	}
 
-	// indicesReconciler, err := indices.NewReconciler(ctx, opniCluster, r)
-	// if err != nil {
-	// 	return ctrl.Result{}, err
-	// }
+	indicesReconciler, err := indices.NewReconciler(ctx, opniCluster, r)
+	if err != nil {
+		return ctrl.Result{}, err
+	}
 
 	reconcilers := []resources.ComponentReconciler{
 		opniReconciler.Reconcile,
-		//indicesReconciler.Reconcile,
+		indicesReconciler.Reconcile,
 	}
 
 	for _, rec := range reconcilers {

controllers/ai_opnicluster_controller_test.go

@@ -23,6 +23,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	aiv1beta1 "github.com/rancher/opni/apis/ai/v1beta1"
+	opnicorev1beta1 "github.com/rancher/opni/apis/core/v1beta1"
 	"github.com/rancher/opni/pkg/resources"
 )
 
@@ -58,6 +59,25 @@ var _ = Describe("AI OpniCluster Controller", Ordered, Label("controller"), func
 			Name:      "test-cluster",
 			Namespace: c.Namespace,
 		}
+
+		nats := &opnicorev1beta1.NatsCluster{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "test",
+				Namespace: c.Namespace,
+			},
+			Spec: opnicorev1beta1.NatsSpec{
+				Replicas:   lo.ToPtr(int32(3)),
+				AuthMethod: opnicorev1beta1.NatsAuthNkey,
+			},
+		}
+		err = k8sClient.Create(context.Background(), nats)
+		Expect(err).NotTo(HaveOccurred())
+		Eventually(Object(nats)).Should(Exist())
+
+		c.Spec.NatsRef = corev1.LocalObjectReference{
+			Name: nats.Name,
+		}
+
 		err = k8sClient.Create(context.Background(), c)
 		Expect(err).NotTo(HaveOccurred())
 		Eventually(Object(c)).Should(Exist())

controllers/core_nats_controller_test.go

@@ -48,7 +48,7 @@ var _ = Describe("Core Nats Controller", Ordered, Label("controller"), func() {
 		By("checking nats statefulset")
 		Eventually(Object(&appsv1.StatefulSet{
 			ObjectMeta: metav1.ObjectMeta{
-				Name:      cluster.Name,
+				Name:      fmt.Sprintf("%s-nats", cluster.Name),
 				Namespace: cluster.Namespace,
 			},
 		})).Should(ExistAnd(

go.mod

@@ -8,11 +8,10 @@ require (
 	github.com/Masterminds/sprig/v3 v3.2.2
 	github.com/NVIDIA/gpu-operator v1.8.1
 	github.com/alecthomas/jsonschema v0.0.0-20220216202328-9eeeec9d044b
-	github.com/alexandreLamarre/oslo v0.4.1-0.20220622183136-9097b55785d9
-	github.com/alexandreLamarre/sloth v0.11.1-0.20220621184403-416cfe52767a
 	github.com/andybalholm/brotli v1.0.4
 	github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de
 	github.com/aws/aws-sdk-go v1.44.33
+	github.com/banzaicloud/k8s-objectmatcher v1.8.0
 	github.com/banzaicloud/logging-operator v0.0.0-20220225205714-b06e7ad17676
 	github.com/banzaicloud/logging-operator/pkg/sdk v0.7.19
 	github.com/banzaicloud/operator-tools v0.28.5
@@ -31,6 +30,7 @@ require (
 	github.com/golang/snappy v0.0.4
 	github.com/google/go-cmp v0.5.8
 	github.com/google/uuid v1.3.0
+	github.com/goombaio/namegenerator v0.0.0-20181006234301-989e774b106e
 	github.com/grafana-operator/grafana-operator/v4 v4.3.0
 	github.com/grafana/cortex-tools v0.0.0-00010101000000-000000000000
 	github.com/hashicorp/go-hclog v1.2.2
@@ -46,7 +46,6 @@ require (
 	github.com/jwalton/go-supportscolor v1.1.0
 	github.com/kralicky/gpkg v0.0.0-20220311205216-0d8ea9557555
 	github.com/kralicky/grpc-gateway/v2 v2.11.0-1
-	github.com/kralicky/highlander v0.0.0-20210804214334-9cfe339efd8a
 	github.com/kralicky/kmatch v0.0.0-20220713045459-85a252b9275e
 	github.com/kralicky/ragu v1.0.0-beta2
 	github.com/kralicky/spellbook v0.0.0-20220415171527-86ac7812393f
@@ -59,6 +58,7 @@ require (
 	github.com/magefile/mage v1.13.0
 	github.com/mattn/go-tty v0.0.4
 	github.com/mitchellh/mapstructure v1.5.0
+	github.com/nats-io/nats.go v1.16.0
 	github.com/nats-io/nkeys v0.3.0
 	github.com/olebedev/when v0.0.0-20211212231525-59bd4edcf9d6
 	github.com/onsi/ginkgo/v2 v2.1.4
@@ -121,6 +121,7 @@ require (
 	k8s.io/apimachinery v0.24.3
 	k8s.io/client-go v0.24.3
 	k8s.io/component-base v0.24.3
+	k8s.io/kubernetes v1.13.0
 	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
 	opensearch.opster.io v0.0.0-00010101000000-000000000000
 	sigs.k8s.io/controller-runtime v0.11.1
@@ -167,7 +168,6 @@ require (
 	github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 // indirect
 	github.com/armon/go-metrics v0.4.0 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
-	github.com/banzaicloud/k8s-objectmatcher v1.8.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bgentry/speakeasy v0.1.0 // indirect
 	github.com/blang/semver v3.5.1+incompatible // indirect
@@ -267,7 +267,6 @@ require (
 	github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa // indirect
 	github.com/googleapis/gax-go/v2 v2.4.0 // indirect
 	github.com/googleapis/go-type-adapters v1.0.0 // indirect
-	github.com/goombaio/namegenerator v0.0.0-20181006234301-989e774b106e // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/gorilla/websocket v1.4.2 // indirect
 	github.com/gosuri/uitable v0.0.4 // indirect
@@ -349,6 +348,7 @@ require (
 	github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
+	github.com/nats-io/nuid v1.0.1 // indirect
 	github.com/ncw/swift v1.0.52 // indirect
 	github.com/nwaples/rardecode/v2 v2.0.0-beta.2 // indirect
 	github.com/nxadm/tail v1.4.8 // indirect
@@ -408,7 +408,6 @@ require (
 	github.com/therootcompany/xz v1.0.1 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
-	github.com/traefik/yaegi v0.12.0 // indirect
 	github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7 // indirect
 	github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
 	github.com/uber/jaeger-lib v2.4.1+incompatible // indirect

go.sum

@@ -260,10 +260,6 @@ github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15/go.mod h1:OMCwj8V
 github.com/alecthomas/units v0.0.0-20210927113745-59d0afb8317a/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc=
 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
-github.com/alexandreLamarre/oslo v0.4.1-0.20220622183136-9097b55785d9 h1:gj8xKfjkPuMZiz/3rRyEqFk5lHXt/t76f0aTkyD/CBw=
-github.com/alexandreLamarre/oslo v0.4.1-0.20220622183136-9097b55785d9/go.mod h1:ogDEYGwkqCarEMhSFcd31LMU//nmxuHSCrBW1B409qI=
-github.com/alexandreLamarre/sloth v0.11.1-0.20220621184403-416cfe52767a h1:UxgguUFkxSFN+aZoJyvyTegcP1HqXdVeRj1gbV2KATw=
-github.com/alexandreLamarre/sloth v0.11.1-0.20220621184403-416cfe52767a/go.mod h1:5zIH7+VgAiYnT6yEzzPjplOzezthRfiRQ+iTrDtZzG8=
 github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0=
 github.com/alexflint/go-filemutex v1.1.0/go.mod h1:7P4iRhttt/nUvUOrYIhcpMzv2G6CY9UnI16Z+UJqRyk=
 github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a h1:HbKu58rmZpUGpz5+4FfNmIU+FmZg2P3Xaj2v2bfNWmk=
@@ -1860,8 +1856,6 @@ github.com/kralicky/grafana-operator/v4 v4.2.1-0.20220602163320-c4f349ffe03f h1:
 github.com/kralicky/grafana-operator/v4 v4.2.1-0.20220602163320-c4f349ffe03f/go.mod h1:XV6jHHGx7m9vDzCVklAw4KHJaUsZhfCmQx9PqN7UWL8=
 github.com/kralicky/grpc-gateway/v2 v2.11.0-1 h1:2MFkegf/TH5G+tS1Zg6RH7Fbfnpa/7xO0m0JFIcerCI=
 github.com/kralicky/grpc-gateway/v2 v2.11.0-1/go.mod h1:NrASbA855UMefvjwka3KcBNlb0PE24Yy8V00gTEsM9E=
-github.com/kralicky/highlander v0.0.0-20210804214334-9cfe339efd8a h1:I5tncrQ/dxOPY7jNN5hhubtkpvoIhz4qckT62C0kdTQ=
-github.com/kralicky/highlander v0.0.0-20210804214334-9cfe339efd8a/go.mod h1:ie5ARlfZVi2fyaApaZ/5JFhIs5DaIIFKxwM6rjYa8SE=
 github.com/kralicky/kmatch v0.0.0-20220710233303-ed73989bbe4a/go.mod h1:GIlN+uSFeISHISm+32UmNce20rNVC5q1Jyz5Wg05cEw=
 github.com/kralicky/kmatch v0.0.0-20220713045459-85a252b9275e h1:0HTOxNxXnJy4EV0zRWr37D/N6xWLdQ1GjtgLpts30jw=
 github.com/kralicky/kmatch v0.0.0-20220713045459-85a252b9275e/go.mod h1:GIlN+uSFeISHISm+32UmNce20rNVC5q1Jyz5Wg05cEw=
@@ -2057,6 +2051,7 @@ github.com/miekg/dns v1.1.48/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7Xn
 github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
 github.com/mileusna/useragent v0.0.0-20190129205925-3e331f0949a5/go.mod h1:JWhYAp2EXqUtsxTKdeGlY8Wp44M7VxThC9FEoNGi2IE=
 github.com/minio/highwayhash v1.0.1/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY=
+github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g=
 github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY=
 github.com/minio/md5-simd v1.1.0 h1:QPfiOqlZH+Cj9teu0t9b1nTBfPbyTl16Of5MeuShdK4=
 github.com/minio/md5-simd v1.1.0/go.mod h1:XpBqgZULrMYD3R+M28PcmP0CkI7PEMzB3U77ZrKZ0Gw=
@@ -2157,17 +2152,24 @@ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+
 github.com/nakagami/firebirdsql v0.0.0-20190310045651-3c02a58cfed8/go.mod h1:86wM1zFnC6/uDBfZGNwB65O+pR2OFi5q/YQaEUid1qA=
 github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg=
 github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU=
+github.com/nats-io/jwt v1.2.2 h1:w3GMTO969dFg+UOKTmmyuu7IGdusK+7Ytlt//OYH/uU=
 github.com/nats-io/jwt v1.2.2/go.mod h1:/xX356yQA6LuXI9xWW7mZNpxgF2mBmGecH+Fj34sP5Q=
+github.com/nats-io/jwt/v2 v2.0.3 h1:i/O6cmIsjpcQyWDYNcq2JyZ3/VTF8SJ4JWluI5OhpvI=
 github.com/nats-io/jwt/v2 v2.0.3/go.mod h1:VRP+deawSXyhNjXmxPCHskrR6Mq50BqpEI5SEcNiGlY=
 github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k=
+github.com/nats-io/nats-server/v2 v2.5.0 h1:wsnVaaXH9VRSg+A2MVg5Q727/CqxnmPLGFQ3YZYKTQg=
 github.com/nats-io/nats-server/v2 v2.5.0/go.mod h1:Kj86UtrXAL6LwYRA6H4RqzkHhK0Vcv2ZnKD5WbQ1t3g=
 github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w=
+github.com/nats-io/nats.go v1.12.1 h1:+0ndxwUPz3CmQ2vjbXdkC1fo3FdiOQDim4gl3Mge8Qo=
 github.com/nats-io/nats.go v1.12.1/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w=
+github.com/nats-io/nats.go v1.16.0 h1:zvLE7fGBQYW6MWaFaRdsgm9qT39PJDQoju+DS8KsO1g=
+github.com/nats-io/nats.go v1.16.0/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w=
 github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
 github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
 github.com/nats-io/nkeys v0.2.0/go.mod h1:XdZpAbhgyyODYqjTawOnIOI7VlbKSarI9Gfy1tqEu/s=
 github.com/nats-io/nkeys v0.3.0 h1:cgM5tL53EvYRU+2YLXIK0G2mJtK12Ft9oeooSZMA2G8=
 github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4=
+github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM=
 github.com/ncw/swift v1.0.52 h1:ACF3JufDGgeKp/9mrDgQlEgS8kRYC4XKcuzj/8EJjQU=
@@ -2740,8 +2742,6 @@ github.com/tinylib/msgp v1.1.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDW
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
-github.com/traefik/yaegi v0.12.0 h1:1gSdARfQ5JB/yEvwEyy9e0AOyLuJrocGiDfkTftQpEo=
-github.com/traefik/yaegi v0.12.0/go.mod h1:RuCwD8/wsX7b6KoQHOaIFUfuH3gQIK4KWnFFmJMw5VA=
 github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31 h1:OXcKh35JaYsGMRzpvFkLv/MEyPuL49CThT1pZ8aSml4=
 github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31/go.mod h1:onvgF043R+lC5RZ8IT9rBXDaEDnpnw/Cl+HFiw+v/7Q=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
@@ -3438,7 +3438,6 @@ golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -4027,6 +4026,7 @@ k8s.io/kubectl v0.20.4/go.mod h1:yCC5lUQyXRmmtwyxfaakryh9ezzp/bT0O14LeoFLbGo=
 k8s.io/kubectl v0.22.1/go.mod h1:mjAOgEbMNMtZWxnfM6jd+nPjPsaoLqO5xanc78WcSbw=
 k8s.io/kubectl v0.24.3 h1:PqY8ho/S/KuE2/hCC3Iee7X+lOtARYo0LQsNzvV/edE=
 k8s.io/kubectl v0.24.3/go.mod h1:PYLcvw96sC1NLbxZEDbdlOEd6/C76VIWjGmWV5QjSk0=
+k8s.io/kubernetes v1.13.0 h1:qTfB+u5M92k2fCCCVP2iuhgwwSOv1EkAkvQY1tQODD8=
 k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
 k8s.io/metrics v0.19.4/go.mod h1:a0gvAzrxQPw2ouBqnXI7X9qlggpPkKAFgWU/Py+KZiU=
 k8s.io/metrics v0.20.4/go.mod h1:DDXS+Ls+2NAxRcVhXKghRPa3csljyJRjDRjPe6EOg/g=
@@ -4073,7 +4073,6 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod h1:LEScyz
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25/go.mod h1:Mlj9PNLmG9bZ6BHFwFKDo5afkpWyUISkb9Me0GnK66I=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw=
 sigs.k8s.io/controller-runtime v0.7.0/go.mod h1:pJ3YBrJiAqMAZKi6UVGuE98ZrroV1p+pIhoHsMm9wdU=
-sigs.k8s.io/controller-runtime v0.9.5/go.mod h1:q6PpkM5vqQubEKUKOM6qr06oXGzOBcCby1DA9FbyZeA=
 sigs.k8s.io/controller-runtime v0.9.6/go.mod h1:q6PpkM5vqQubEKUKOM6qr06oXGzOBcCby1DA9FbyZeA=
 sigs.k8s.io/controller-runtime v0.11.0/go.mod h1:KKwLiTooNGu+JmLZGn9Sl3Gjmfj66eMbCQznLP5zcqA=
 sigs.k8s.io/controller-runtime v0.11.1 h1:7YIHT2QnHJArj/dk9aUkYhfqfK5cIxPOX5gPECfdZLU=

packages/opni-agent/opni-agent/package.yaml

@@ -1,6 +1,6 @@
 
 url: local
-version: 0.5.4
+version: 0.6.0-dev1
 workingDir: charts
 additionalCharts:
 - workingDir: charts-crd

packages/opni/opni/charts/crds/crds.yaml

@@ -18755,6 +18755,11 @@ spec:
                     default: 0.0.0.0:12080
                     type: string
                 type: object
+              natsCluster:
+                properties:
+                  name:
+                    type: string
+                type: object
               nodeSelector:
                 additionalProperties:
                   type: string
@@ -18789,6 +18794,8 @@ spec:
                       type: string
                   type: object
                 type: array
+            required:
+            - natsCluster
             type: object
           status:
             properties:

packages/opni/opni/charts/templates/ai/controlplane.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.ai.enabled }}
-apiVersion: opni.io/v1beta2
+apiVersion: ai.opni.io/v1beta1
 kind: PretrainedModel
 metadata:
   name: control-plane

packages/opni/opni/charts/templates/ai/longhornmodel.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.ai.enabled }}
-apiVersion: opni.io/v1beta2
+apiVersion: ai.opni.io/v1beta1
 kind: PretrainedModel
 metadata:
   name: longhorn

packages/opni/opni/charts/templates/ai/opnicluster.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.ai.enabled }}
-apiVersion: opni.io/v1beta2
+apiVersion: ai.opni.io/v1beta1
 kind: OpniCluster
 metadata:
   name: opni
@@ -43,15 +43,12 @@ spec:
             - key: ca.crt
               path: ca.crt
   opensearch:
-    externalOpensearch:
-      name: opni
-      namespace: {{ include "opni.namespace" . }}
-    enableLogIndexManagement: false
-    enableIngestPreprocessing: true
+    name: opni
+    namespace: {{ include "opni.namespace" . }}
 {{- with .Values.ai.s3 }}
   s3:
     {{- toYaml . | nindent 4 }}
 {{- end }}
-  nats:
-    authMethod: nkey
+  natsCluster:
+    name: {{ include "opni.fullname" . }}
 {{- end }}

packages/opni/opni/charts/templates/ai/ranchermodel.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.ai.enabled }}
-apiVersion: opni.io/v1beta2
+apiVersion: ai.opni.io/v1beta1
 kind: PretrainedModel
 metadata:
   name: rancher

packages/opni/opni/charts/templates/gateway-post-install.yaml

@@ -28,8 +28,8 @@ spec:
         - hooks
         - wait-for-resource
         - "--namespace={{ include "opni.namespace" . }}"
-        - --version=v1beta2
-        - --group=opni.io
+        - --version=v1beta1
+        - --group=core.opni.io
         - --resource=gateways
         - --jsonpath={.status.endpoints}
 {{- if eq .Values.gateway.serviceType "LoadBalancer" }}

packages/opni/opni/charts/templates/gateway.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.gateway.enabled }}
-apiVersion: opni.io/v1beta2
+apiVersion: core.opni.io/v1beta1
 kind: Gateway
 metadata:
   name: opni-gateway
@@ -9,6 +9,8 @@ metadata:
 spec:
   hostname: {{ .Values.gateway.hostname }}
   serviceType: {{ .Values.gateway.serviceType }}
+  natsCluster:
+    name: opni
   {{- with .Values.gateway.serviceAnnotations }}
   serviceAnnotations:
     {{- toYaml . | nindent 4 }}

packages/opni/opni/charts/templates/logging/multiclusterrolebinding.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.logging.enabled }}
-apiVersion: opni.io/v1beta2
+apiVersion: logging.opni.io/v1beta1
 kind: MulticlusterRoleBinding
 metadata:
   name: opni-logging

packages/opni/opni/charts/templates/logging/opensearch.yaml

@@ -18,7 +18,7 @@ spec:
       path: /etc/nkey
       secret:
         defaultMode: 420
-        secretName: opni-nats-client
+        secretName: {{ include "opni.fullname" . }}-nats-client
     - configMap:
         name: opni-preprocessing-config
       name: pluginsettings