Support for Authorino enable/disable superseding strict host subsets (#…

…143) Exposes Authorino's `--allow-superseding-host-subsets` command-line flag (Kuadrant/authorino#434) as a new API option `spec.supersedingHostSubsets: Boolean` (default: `false`)
Kuadrant · Oct 2, 2023 · edce84b · edce84b
1 parent 33db95d
commit edce84b
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -123,6 +123,7 @@ the state of the Kubernetes Deployment and associated resources, based on the st
 | clusterWide              |           Boolean           | Sets the Authorino instance's [watching scope](https://github.com/Kuadrant/authorino/blob/main/docs/architecture.md#cluster-wide-vs-namespaced-instances) – cluster-wide or namespaced.                                                 | Default: `true` (cluster-wide)                        |
 | authConfigLabelSelectors |           String            | [Label selectors](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#label-selectors) used by the Authorino instance to filter `AuthConfig`-related reconciliation events.                                       | Default: empty (all AuthConfigs are watched)          |
 | secretLabelSelectors     |           String            | [Label selectors](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#label-selectors) used by the Authorino instance to filter `Secret`-related reconciliation events (API key and mTLS authentication methods). | Default: `authorino.kuadrant.io/managed-by=authorino` |
+| supersedingHostSubsets   |           Boolean           | Enable/disable allowing AuthConfigs to supersede strict subsets of hosts already taken.                                                                                                                                                 | Default: `false`                                      |
 | replicas                 |           Integer           | Number of replicas desired for the Authorino instance. Values greater than 1 enable leader election in the Authorino service, where the leader updates the statuses of the `AuthConfig` CRs).                                           | Default: 1                                            |
 | evaluatorCacheSize       |           Integer           | Cache size (in megabytes) of each Authorino evaluator (when enabled in an [`AuthConfig`](https://github.com/Kuadrant/authorino/blob/main/docs/features.md#common-feature-caching-cache)).                                               | Default: 1                                            |
 | image                    |           String            | Authorino image to be deployed (for dev/testing purpose only).                                                                                                                                                                          | Default: `quay.io/kuadrant/authorino:latest`          |

diff --git a/api/v1beta1/authorino_types.go b/api/v1beta1/authorino_types.go
@@ -71,6 +71,7 @@ type AuthorinoSpec struct {
 	OIDCServer               OIDCServer  `json:"oidcServer"`
 	AuthConfigLabelSelectors string      `json:"authConfigLabelSelectors,omitempty"`
 	SecretLabelSelectors     string      `json:"secretLabelSelectors,omitempty"`
+	SupersedingHostSubsets   bool        `json:"supersedingHostSubsets,omitempty"`
 	EvaluatorCacheSize       *int        `json:"evaluatorCacheSize,omitempty"`
 	Tracing                  Tracing     `json:"tracing,omitempty"`
 	Metrics                  Metrics     `json:"metrics,omitempty"`

diff --git a/bundle/manifests/operator.authorino.kuadrant.io_authorinos.yaml b/bundle/manifests/operator.authorino.kuadrant.io_authorinos.yaml
@@ -136,6 +136,8 @@ spec:
                 type: integer
               secretLabelSelectors:
                 type: string
+              supersedingHostSubsets:
+                type: boolean
               tracing:
                 properties:
                   endpoint:

diff --git a/config/crd/bases/operator.authorino.kuadrant.io_authorinos.yaml b/config/crd/bases/operator.authorino.kuadrant.io_authorinos.yaml
@@ -138,6 +138,8 @@ spec:
                 type: integer
               secretLabelSelectors:
                 type: string
+              supersedingHostSubsets:
+                type: boolean
               tracing:
                 properties:
                   endpoint:

diff --git a/config/deploy/manifests.yaml b/config/deploy/manifests.yaml
@@ -5537,6 +5537,8 @@ spec:
                 type: integer
               secretLabelSelectors:
                 type: string
+              supersedingHostSubsets:
+                type: boolean
               tracing:
                 properties:
                   endpoint:

diff --git a/config/install/manifests.yaml b/config/install/manifests.yaml
@@ -136,6 +136,8 @@ spec:
                 type: integer
               secretLabelSelectors:
                 type: string
+              supersedingHostSubsets:
+                type: boolean
               tracing:
                 properties:
                   endpoint:

diff --git a/controllers/authorino_controller.go b/controllers/authorino_controller.go
@@ -324,6 +324,11 @@ func (r *AuthorinoReconciler) buildAuthorinoArgs(authorino *api.Authorino) []str
 		args = append(args, fmt.Sprintf("--%s=%s", flagWatchedSecretLabelSelector, selectors))
 	}
 
+	// allow-superseding-host-subsets
+	if authorino.Spec.SupersedingHostSubsets {
+		args = append(args, fmt.Sprintf("--%s", flagSupersedingHostSubsets))
+	}
+
 	// log-level
 	if logLevel := authorino.Spec.LogLevel; logLevel != "" {
 		args = append(args, fmt.Sprintf("--%s=%s", flagLogLevel, logLevel))

diff --git a/controllers/authorino_controller_test.go b/controllers/authorino_controller_test.go
@@ -326,6 +326,8 @@ func checkAuthorinoArgs(authorinoInstance *api.Authorino, args []string) {
 			Expect(value).Should(Equal(authorinoInstance.Spec.AuthConfigLabelSelectors))
 		case flagWatchedSecretLabelSelector:
 			Expect(value).Should(Equal(authorinoInstance.Spec.SecretLabelSelectors))
+		case flagSupersedingHostSubsets:
+			Expect(authorinoInstance.Spec.SupersedingHostSubsets).Should(BeTrue())
 		case flagLogLevel:
 			Expect(value).Should(Equal(authorinoInstance.Spec.LogLevel))
 		case flagLogMode:

diff --git a/controllers/constants.go b/controllers/constants.go
@@ -33,6 +33,7 @@ const (
 	flagWatchNamespace                 string = "watch-namespace"
 	flagWatchedAuthConfigLabelSelector string = "auth-config-label-selector"
 	flagWatchedSecretLabelSelector     string = "secret-label-selector"
+	flagSupersedingHostSubsets         string = "allow-superseding-host-subsets"
 	flagLogLevel                       string = "log-level"
 	flagLogMode                        string = "log-mode"
 	flagTimeout                        string = "timeout"