Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reconcile Sub Component Authorino CR #393

Closed
wants to merge 10 commits into from
Closed

Reconcile Sub Component Authorino CR #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ef30130
Add Authorino types
Boomatang Nov 30, 2023
b11526c
Reconcile authorino spec from kuadrant CR
Boomatang Nov 30, 2023
f30c216
Add API documentation
Boomatang Jan 10, 2024
ac31040
PR checks: Update code to pass
Boomatang Jan 11, 2024
8799593
PR comments fix
Boomatang Jan 23, 2024
817c1d8
Updates for rebase
Boomatang Jan 26, 2024
273b9aa
Add integration tests.
Boomatang Apr 29, 2024
8da1d63
Update docs for rebase.
Boomatang May 8, 2024
de6e57f
Change forces control to Kuadrant.
Boomatang Jun 5, 2024
eb909a5
Changes required after a rebase.
Boomatang Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions api/v1beta1/kuadrant_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package v1beta1
import (
"github.com/go-logr/logr"
"github.com/google/go-cmp/cmp"
authorinov1beta1 "github.com/kuadrant/authorino-operator/api/v1beta1"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's make sure we use the latest version of the Authorino API here: #561

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Once that PR is merged I will make sure to rebase to include it.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merged

limitadorv1alpha1 "github.com/kuadrant/limitador-operator/api/v1alpha1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -31,10 +32,33 @@ import (

// KuadrantSpec defines the desired state of Kuadrant
type KuadrantSpec struct {
// +optional
Authorino *AuthorinoSpec `json:"authorino,omitempty"`
// +optional
Limitador *LimitadorSpec `json:"limitador,omitempty"`
}

type AuthorinoSpec struct {
EvaluatorCacheSize *int `json:"evaluatorCacheSize,omitempty"`
Listener *AuthorinoListener `json:"listener,omitempty"`
Metrics *authorinov1beta1.Metrics `json:"metrics,omitempty"`
OIDCServer *authorinov1beta1.OIDCServer `json:"oidcServer,omitempty"`
Replicas *int32 `json:"replicas,omitempty"`
Tracing *authorinov1beta1.Tracing `json:"tracing,omitempty"`
Volumes *authorinov1beta1.VolumesSpec `json:"volumes,omitempty"`
}

type AuthorinoListener struct {
// Port numbers of the GRPC and HTTP auth interfaces.
Ports *authorinov1beta1.Ports `json:"ports,omitempty"`
// TLS configuration of the auth service (GRPC and HTTP interfaces).
TLS *authorinov1beta1.Tls `json:"tls"`
// Timeout of the auth service (GRPC and HTTP interfaces), in milliseconds.
Timeout *int `json:"timeout,omitempty"`
// Maximum payload (request body) size for the auth service (HTTP interface), in bytes.
MaxHTTPRequestBodySize *int `json:"maxHttpRequestBodySize,omitempty"`
}

type LimitadorSpec struct {

// +optional
Expand Down
91 changes: 91 additions & 0 deletions api/v1beta1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

160 changes: 160 additions & 0 deletions bundle/manifests/kuadrant.io_kuadrants.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,166 @@ spec:
spec:
description: KuadrantSpec defines the desired state of Kuadrant
properties:
authorino:
properties:
evaluatorCacheSize:
type: integer
listener:
properties:
maxHttpRequestBodySize:
description: Maximum payload (request body) size for the auth
service (HTTP interface), in bytes.
type: integer
ports:
description: Port numbers of the GRPC and HTTP auth interfaces.
properties:
grpc:
format: int32
type: integer
http:
format: int32
type: integer
type: object
timeout:
description: Timeout of the auth service (GRPC and HTTP interfaces),
in milliseconds.
type: integer
tls:
description: TLS configuration of the auth service (GRPC and
HTTP interfaces).
properties:
certSecretRef:
description: |-
LocalObjectReference contains enough information to let you locate the
referenced object inside the same namespace.
properties:
name:
description: |-
Name of the referent.
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?
type: string
type: object
x-kubernetes-map-type: atomic
enabled:
type: boolean
type: object
required:
- tls
type: object
metrics:
properties:
deep:
type: boolean
port:
format: int32
type: integer
type: object
oidcServer:
properties:
port:
format: int32
type: integer
tls:
properties:
certSecretRef:
description: |-
LocalObjectReference contains enough information to let you locate the
referenced object inside the same namespace.
properties:
name:
description: |-
Name of the referent.
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?
type: string
type: object
x-kubernetes-map-type: atomic
enabled:
type: boolean
type: object
required:
- tls
type: object
replicas:
format: int32
type: integer
tracing:
properties:
endpoint:
type: string
insecure:
type: boolean
tags:
additionalProperties:
type: string
type: object
required:
- endpoint
type: object
volumes:
properties:
defaultMode:
description: Permissions mode.
format: int32
type: integer
items:
items:
properties:
configMaps:
description: Allow multiple configmaps to mount to the
same directory
items:
type: string
type: array
items:
description: Mount details
items:
description: Maps a string key to a path within a
volume.
properties:
key:
description: key is the key to project.
type: string
mode:
description: |-
mode is Optional: mode bits used to set permissions on this file.
Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
If not specified, the volume defaultMode will be used.
This might be in conflict with other options that affect the file
mode, like fsGroup, and the result can be other mode bits set.
format: int32
type: integer
path:
description: |-
path is the relative path of the file to map the key to.
May not be an absolute path.
May not contain the path element '..'.
May not start with the string '..'.
type: string
required:
- key
- path
type: object
type: array
mountPath:
description: An absolute path where to mount it
type: string
name:
description: Volume name
type: string
secrets:
description: Secret mount
items:
type: string
type: array
required:
- mountPath
type: object
type: array
type: object
type: object
limitador:
properties:
affinity:
Expand Down
Loading
Loading