feat: Add support for custom username and password keys in auth.

chart/crds/druid.apache.org_druidingestions.yaml

@@ -47,6 +47,10 @@ spec:
             properties:
               auth:
                 properties:
+                  passwordKey:
+                    description: PasswordKey specifies the key within the Kubernetes
+                      secret that contains the password for authentication.
+                    type: string
                   secretRef:
                     description: |-
                       SecretReference represents a Secret Reference. It has enough information to retrieve secret
@@ -64,6 +68,10 @@ spec:
                     x-kubernetes-map-type: atomic
                   type:
                     type: string
+                  usernameKey:
+                    description: UsernameKey specifies the key within the Kubernetes
+                      secret that contains the username for authentication.
+                    type: string
                 required:
                 - secretRef
                 - type

chart/crds/druid.apache.org_druids.yaml

@@ -1267,6 +1267,10 @@ spec:
                 type: object
               auth:
                 properties:
+                  passwordKey:
+                    description: PasswordKey specifies the key within the Kubernetes
+                      secret that contains the password for authentication.
+                    type: string
                   secretRef:
                     description: |-
                       SecretReference represents a Secret Reference. It has enough information to retrieve secret
@@ -1284,6 +1288,10 @@ spec:
                     x-kubernetes-map-type: atomic
                   type:
                     type: string
+                  usernameKey:
+                    description: UsernameKey specifies the key within the Kubernetes
+                      secret that contains the username for authentication.
+                    type: string
                 required:
                 - secretRef
                 - type

config/crd/bases/druid.apache.org_druidingestions.yaml

@@ -47,6 +47,10 @@ spec:
             properties:
               auth:
                 properties:
+                  passwordKey:
+                    description: PasswordKey specifies the key within the Kubernetes
+                      secret that contains the password for authentication.
+                    type: string
                   secretRef:
                     description: |-
                       SecretReference represents a Secret Reference. It has enough information to retrieve secret
@@ -64,6 +68,10 @@ spec:
                     x-kubernetes-map-type: atomic
                   type:
                     type: string
+                  usernameKey:
+                    description: UsernameKey specifies the key within the Kubernetes
+                      secret that contains the username for authentication.
+                    type: string
                 required:
                 - secretRef
                 - type

config/crd/bases/druid.apache.org_druids.yaml

@@ -1267,6 +1267,10 @@ spec:
                 type: object
               auth:
                 properties:
+                  passwordKey:
+                    description: PasswordKey specifies the key within the Kubernetes
+                      secret that contains the password for authentication.
+                    type: string
                   secretRef:
                     description: |-
                       SecretReference represents a Secret Reference. It has enough information to retrieve secret
@@ -1284,6 +1288,10 @@ spec:
                     x-kubernetes-map-type: atomic
                   type:
                     type: string
+                  usernameKey:
+                    description: UsernameKey specifies the key within the Kubernetes
+                      secret that contains the username for authentication.
+                    type: string
                 required:
                 - secretRef
                 - type

docs/api_specifications/druid.md

@@ -173,56 +173,6 @@ Kubernetes core/v1.ResourceRequirements
 </table>
 </div>
 </div>
-<h3 id="druid.apache.org/v1alpha1.Auth">Auth
-</h3>
-<p>
-(<em>Appears on:</em>
-<a href="#druid.apache.org/v1alpha1.DruidIngestionSpec">DruidIngestionSpec</a>)
-</p>
-<div class="md-typeset__scrollwrap">
-<div class="md-typeset__table">
-<table>
-<thead>
-<tr>
-<th>Field</th>
-<th>Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>
-<code>type</code><br>
-<em>
-<a href="#druid.apache.org/v1alpha1.AuthType">
-AuthType
-</a>
-</em>
-</td>
-<td>
-</td>
-</tr>
-<tr>
-<td>
-<code>secretRef</code><br>
-<em>
-<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#secretreference-v1-core">
-Kubernetes core/v1.SecretReference
-</a>
-</em>
-</td>
-<td>
-</td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
-<h3 id="druid.apache.org/v1alpha1.AuthType">AuthType
-(<code>string</code> alias)</h3>
-<p>
-(<em>Appears on:</em>
-<a href="#druid.apache.org/v1alpha1.Auth">Auth</a>)
-</p>
 <h3 id="druid.apache.org/v1alpha1.DeepStorageSpec">DeepStorageSpec
 </h3>
 <p>
@@ -909,6 +859,29 @@ string
 </tr>
 <tr>
 <td>
+<code>dynamicConfig</code><br>
+<em>
+k8s.io/apimachinery/pkg/runtime.RawExtension
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>Dynamic Configurations for Druid. Applied through the dynamic configuration API.</p>
+</td>
+</tr>
+<tr>
+<td>
+<code>auth</code><br>
+<em>
+github.com/datainfrahq/druid-operator/pkg/druidapi.Auth
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+</td>
+</tr>
+<tr>
+<td>
 <code>dnsPolicy</code><br>
 <em>
 <a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#dnspolicy-v1-core">
@@ -1156,9 +1129,7 @@ IngestionSpec
 <td>
 <code>auth</code><br>
 <em>
-<a href="#druid.apache.org/v1alpha1.Auth">
-Auth
-</a>
+github.com/datainfrahq/druid-operator/pkg/druidapi.Auth
 </em>
 </td>
 <td>
@@ -1243,9 +1214,7 @@ IngestionSpec
 <td>
 <code>auth</code><br>
 <em>
-<a href="#druid.apache.org/v1alpha1.Auth">
-Auth
-</a>
+github.com/datainfrahq/druid-operator/pkg/druidapi.Auth
 </em>
 </td>
 <td>
@@ -1344,6 +1313,18 @@ string
 </em>
 </td>
 <td>
+<p>CurrentIngestionSpec is a string instead of RawExtension to maintain compatibility with existing
+IngestionSpecs that are stored as JSON strings.</p>
+</td>
+</tr>
+<tr>
+<td>
+<code>rules</code><br>
+<em>
+[]k8s.io/apimachinery/pkg/runtime.RawExtension
+</em>
+</td>
+<td>
 </td>
 </tr>
 </tbody>
@@ -1972,6 +1953,30 @@ Kubernetes autoscaling/v2.HorizontalPodAutoscalerSpec
 </tr>
 <tr>
 <td>
+<code>serviceAccountName</code><br>
+<em>
+string
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>ServiceAccountName Kubernetes native <code>serviceAccountName</code> specification.</p>
+</td>
+</tr>
+<tr>
+<td>
+<code>dynamicConfig</code><br>
+<em>
+k8s.io/apimachinery/pkg/runtime.RawExtension
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>Dynamic Configurations for Druid. Applied through the dynamic configuration API.</p>
+</td>
+</tr>
+<tr>
+<td>
 <code>dnsPolicy</code><br>
 <em>
 <a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#dnspolicy-v1-core">
@@ -2684,6 +2689,29 @@ string
 </tr>
 <tr>
 <td>
+<code>dynamicConfig</code><br>
+<em>
+k8s.io/apimachinery/pkg/runtime.RawExtension
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>Dynamic Configurations for Druid. Applied through the dynamic configuration API.</p>
+</td>
+</tr>
+<tr>
+<td>
+<code>auth</code><br>
+<em>
+github.com/datainfrahq/druid-operator/pkg/druidapi.Auth
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+</td>
+</tr>
+<tr>
+<td>
 <code>dnsPolicy</code><br>
 <em>
 <a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#dnspolicy-v1-core">
@@ -2750,12 +2778,52 @@ string
 </em>
 </td>
 <td>
+<em>(Optional)</em>
+<p>Spec should be passed in as a JSON string.
+Note: This field is planned for deprecation in favor of nativeSpec.</p>
 <br/>
 <br/>
 <table>
 </table>
 </td>
 </tr>
+<tr>
+<td>
+<code>nativeSpec</code><br>
+<em>
+k8s.io/apimachinery/pkg/runtime.RawExtension
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>nativeSpec allows the ingestion specification to be defined in a native Kubernetes format.
+This is particularly useful for environment-specific configurations and will eventually
+replace the JSON-based Spec field.
+Note: Spec will be ignored if nativeSpec is provided.</p>
+</td>
+</tr>
+<tr>
+<td>
+<code>compaction</code><br>
+<em>
+k8s.io/apimachinery/pkg/runtime.RawExtension
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+</td>
+</tr>
+<tr>
+<td>
+<code>rules</code><br>
+<em>
+[]k8s.io/apimachinery/pkg/runtime.RawExtension
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+</td>
+</tr>
 </tbody>
 </table>
 </div>

go.mod

@@ -20,6 +20,7 @@ require (
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
+	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/go-logr/zapr v1.2.4 // indirect

go.sum

@@ -23,6 +23,7 @@ github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=
+github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww=
 github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
 github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=