Merge develop into remove-mc-azure-gcp-appframework-phase2

Resolve merge conflict in test/appframework_az/m4/appframework_azure_test.go:
- Use 'successful' spelling (from develop)
- Remove MC mention from comment (consistent with MC removal)
- Keep typo fixes from develop branch

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

Author: gabrielm-splunk

api/v4/ingestorcluster_types.go

@@ -73,7 +73,7 @@ type IngestorClusterStatus struct {
 	// Telemetry App installation flag
 	TelAppInstalled bool `json:"telAppInstalled"`
 
-	// Auxillary message describing CR status
+	// Auxiliary message describing CR status
 	Message string `json:"message"`
 
 	// Credential secret version to track changes to the secret and trigger rolling restart of indexer cluster peers when the secret is updated
@@ -95,7 +95,7 @@ type IngestorClusterStatus struct {
 // +kubebuilder:printcolumn:name="Desired",type="integer",JSONPath=".status.replicas",description="Number of desired ingestor cluster pods"
 // +kubebuilder:printcolumn:name="Ready",type="integer",JSONPath=".status.readyReplicas",description="Current number of ready ingestor cluster pods"
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Age of ingestor cluster resource"
-// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message",description="Auxillary message describing CR status"
+// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message",description="Auxiliary message describing CR status"
 // +kubebuilder:storageversion
 
 // IngestorCluster is the Schema for the ingestorclusters API

api/v4/objectstorage_types.go

@@ -60,7 +60,7 @@ type ObjectStorageStatus struct {
 	// Resource revision tracker
 	ResourceRevMap map[string]string `json:"resourceRevMap"`
 
-	// Auxillary message describing CR status
+	// Auxiliary message describing CR status
 	Message string `json:"message"`
 }
 
@@ -73,7 +73,7 @@ type ObjectStorageStatus struct {
 // +kubebuilder:resource:path=objectstorages,scope=Namespaced,shortName=os
 // +kubebuilder:printcolumn:name="Phase",type="string",JSONPath=".status.phase",description="Status of object storage"
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Age of object storage resource"
-// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message",description="Auxillary message describing CR status"
+// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message",description="Auxiliary message describing CR status"
 // +kubebuilder:storageversion
 
 // ObjectStorage is the Schema for the objectstorages API

api/v4/queue_types.go

@@ -89,7 +89,7 @@ type QueueStatus struct {
 	// Resource revision tracker
 	ResourceRevMap map[string]string `json:"resourceRevMap"`
 
-	// Auxillary message describing CR status
+	// Auxiliary message describing CR status
 	Message string `json:"message"`
 }
 
@@ -102,7 +102,7 @@ type QueueStatus struct {
 // +kubebuilder:resource:path=queues,scope=Namespaced,shortName=queue
 // +kubebuilder:printcolumn:name="Phase",type="string",JSONPath=".status.phase",description="Status of queue"
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Age of queue resource"
-// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message",description="Auxillary message describing CR status"
+// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message",description="Auxiliary message describing CR status"
 // +kubebuilder:storageversion
 
 // Queue is the Schema for the queues API

bundle/manifests/enterprise.splunk.com_ingestorclusters.yaml

@@ -95,7 +95,7 @@ var _ = Describe("LicenseManager Controller", func() {
 			// econcile for the first time err is resource not found
 			_, err := instance.Reconcile(ctx, request)
 			Expect(err).ToNot(HaveOccurred())
-			// create resource first adn then reconcile for the first time
+			// create resource first and then reconcile for the first time
 			ssSpec := testutils.NewLicenseManager("test", namespace, "image")
 			Expect(c.Create(ctx, ssSpec)).Should(Succeed())
 			// reconcile with updated annotations for pause