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.

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

Add kubebuilder validations in proto for extauth AuthConfig #9481

Merged
merged 62 commits into from
Jun 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
7d99ece
add maxLength
arianaw66 May 14, 2024
e64ef24
Merge refs/heads/main into AuthConfig.configs-maxLength
soloio-bulldozer[bot] May 14, 2024
3f93728
Merge refs/heads/main into AuthConfig.configs-maxLength
soloio-bulldozer[bot] May 15, 2024
809c47b
omg major :facepalm: : maxLength --> maxItems
arianaw66 May 16, 2024
12d791c
Merge refs/heads/main into AuthConfig.configs-maxLength
soloio-bulldozer[bot] May 16, 2024
bf1f87d
Merge refs/heads/main into AuthConfig.configs-maxLength
soloio-bulldozer[bot] May 16, 2024
65e7680
Merge refs/heads/main into AuthConfig.configs-maxLength
soloio-bulldozer[bot] May 16, 2024
1c152c0
Merge refs/heads/main into AuthConfig.configs-maxLength
soloio-bulldozer[bot] May 17, 2024
c6c6067
Merge refs/heads/main into AuthConfig.configs-maxLength
soloio-bulldozer[bot] May 17, 2024
cf5e0c7
Merge refs/heads/main into AuthConfig.configs-maxLength
soloio-bulldozer[bot] May 17, 2024
4e51b1e
Merge refs/heads/main into AuthConfig.configs-maxLength
soloio-bulldozer[bot] May 17, 2024
6283964
Merge refs/heads/main into AuthConfig.configs-maxLength
soloio-bulldozer[bot] May 20, 2024
2d212b0
Merge refs/heads/main into AuthConfig.configs-maxLength
soloio-bulldozer[bot] May 20, 2024
569ec7c
test a CEL rule as well
arianaw66 May 20, 2024
2602f62
Merge refs/heads/main into AuthConfig.configs-maxLength
soloio-bulldozer[bot] May 21, 2024
9e739af
Merge refs/heads/main into AuthConfig.configs-maxLength
soloio-bulldozer[bot] May 21, 2024
754e41f
Merge refs/heads/main into AuthConfig.configs-maxLength
soloio-bulldozer[bot] May 21, 2024
95a4b03
Merge refs/heads/main into AuthConfig.configs-maxLength
soloio-bulldozer[bot] May 22, 2024
e2f9cac
Merge refs/heads/main into AuthConfig.configs-maxLength
soloio-bulldozer[bot] May 23, 2024
c128fa8
ext-auth-service opaServer.Translate / ext-auth-service AuthConfig state
arianaw66 May 23, 2024
114b2a9
Revert "ext-auth-service opaServer.Translate / ext-auth-service AuthC…
arianaw66 May 23, 2024
178cf25
add kubebuilder validations for extauth
arianaw66 May 23, 2024
fd4d918
Merge branch 'main' of https://github.com/solo-io/gloo into AuthConfi…
arianaw66 May 23, 2024
b5c4e49
make go-generate-apis fmt
arianaw66 May 23, 2024
e1eefef
changelog
arianaw66 May 23, 2024
4eabf73
Merge refs/heads/main into AuthConfig.configs-maxLength
soloio-bulldozer[bot] May 23, 2024
5bcb67e
Merge refs/heads/main into AuthConfig.configs-maxLength
soloio-bulldozer[bot] May 24, 2024
0a3de6d
Merge refs/heads/main into AuthConfig.configs-maxLength
soloio-bulldozer[bot] May 24, 2024
92cfa95
Adding changelog file to new location
May 24, 2024
4e990aa
Deleting changelog file from old location
May 24, 2024
868a01f
Merge refs/heads/main into AuthConfig.configs-maxLength
soloio-bulldozer[bot] May 28, 2024
754908b
Merge refs/heads/main into AuthConfig.configs-maxLength
soloio-bulldozer[bot] May 28, 2024
fa7f4fc
Merge refs/heads/main into AuthConfig.configs-maxLength
soloio-bulldozer[bot] May 28, 2024
4779e87
Merge refs/heads/main into AuthConfig.configs-maxLength
soloio-bulldozer[bot] May 28, 2024
6a4f398
Merge refs/heads/main into AuthConfig.configs-maxLength
soloio-bulldozer[bot] May 29, 2024
97dca25
Merge refs/heads/main into AuthConfig.configs-maxLength
soloio-bulldozer[bot] May 29, 2024
2480e4f
Adding changelog file to new location
May 29, 2024
d899818
Deleting changelog file from old location
May 29, 2024
14db380
Merge refs/heads/main into AuthConfig.configs-maxLength
soloio-bulldozer[bot] May 29, 2024
da62150
Merge refs/heads/main into AuthConfig.configs-maxLength
soloio-bulldozer[bot] May 29, 2024
1b748ec
PR comment; combine apr rules into one
arianaw66 May 29, 2024
548791b
Adding changelog file to new location
May 31, 2024
59b5013
Deleting changelog file from old location
May 31, 2024
6faa26e
Adding changelog file to new location
Jun 4, 2024
5ce3119
Deleting changelog file from old location
Jun 4, 2024
52f5d3a
Merge branch 'main' into AuthConfig.configs-maxLength
arianaw66 Jun 11, 2024
d71d74e
move changelog
arianaw66 Jun 11, 2024
0a4e5ba
Adding changelog file to new location
Jun 12, 2024
3a32c03
Deleting changelog file from old location
Jun 12, 2024
6b0b016
Adding changelog file to new location
Jun 13, 2024
b755e89
Deleting changelog file from old location
Jun 13, 2024
1ccc94e
avoid changes to CRD using new DisableKubeMarkers flag from solo-kit …
arianaw66 Jun 14, 2024
e9d42a2
codegen- presumably from solo-kit v0.35.1?
arianaw66 Jun 14, 2024
cedd35b
Merge branch 'main' of https://github.com/solo-io/gloo into AuthConfi…
arianaw66 Jun 14, 2024
ff49b87
oops- committed local file
arianaw66 Jun 14, 2024
27d32c7
move changelog
arianaw66 Jun 14, 2024
dc92060
use solo-kit release now (not branch)
arianaw66 Jun 14, 2024
a33f31c
Merge branch 'main' of https://github.com/solo-io/gloo into AuthConfi…
arianaw66 Jun 14, 2024
3f81c44
bump solo-kit to v0.35.3, codegen
arianaw66 Jun 17, 2024
d503a42
Merge branch 'main' of https://github.com/solo-io/gloo into AuthConfi…
arianaw66 Jun 17, 2024
759ba94
Merge branch 'main' into AuthConfig.configs-maxLength
arianaw66 Jun 20, 2024
d6f5f5d
Merge refs/heads/main into AuthConfig.configs-maxLength
soloio-bulldozer[bot] Jun 20, 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
6 changes: 6 additions & 0 deletions changelog/v1.18.0-beta1/authconfig-cel-rules.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
changelog:
- type: NEW_FEATURE
issueLink: https://github.com/solo-io/gloo-mesh-enterprise/issues/16010
description: |
Adds pre-admission [validation rules](https://kubernetes.io/docs/tasks/extend-kubernetes/custom-resources/custom-resource-definitions/#validation-rules) to the `AuthConfig` CRD.
resolvesIssue: false

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ func main() {
"gloo.solo.io.HybridListener",
"gloo.solo.io.AggregateListener",
},
DisableKubeMarkers: true,
},
}
if err := cmd.Generate(generateOptions); err != nil {
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ require (
github.com/solo-io/go-utils v0.24.8
github.com/solo-io/k8s-utils v0.7.2
github.com/solo-io/protoc-gen-ext v0.0.18
github.com/solo-io/protoc-gen-openapi v0.2.2
github.com/solo-io/protoc-gen-openapi v0.2.4
github.com/solo-io/skv2 v0.39.1

// Pinned to the `sa-k8s-1.29-bump` tag of solo-apis on `gloo-main` branch
// Ref: https://github.com/solo-io/gloo/pull/9463/files#r1594409655 && https://solo-io-corp.slack.com/archives/C03MFATU265/p1716913420716729?thread_ts=1716476992.938679&cid=C03MFATU265
// as to why it is now based off `gloo-main` and not `gloo-repo-branch`
github.com/solo-io/solo-apis v0.0.0-20240528173540-7879b7d12cb9
github.com/solo-io/solo-kit v0.35.0
github.com/solo-io/solo-kit v0.35.3
github.com/spf13/afero v1.9.2
github.com/spf13/cobra v1.8.0
github.com/spf13/pflag v1.0.5
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -2028,14 +2028,14 @@ github.com/solo-io/k8s-utils v0.7.2 h1:pIRiTOpwymdCHUOSjzKDi/Ay16FNtF7JV7NIRlC2Z
github.com/solo-io/k8s-utils v0.7.2/go.mod h1:RrT6PVTSD1X0vteKCQmGzoAAfjI1U5oV/wA+T3T+NoM=
github.com/solo-io/protoc-gen-ext v0.0.18 h1:zSAL8NzWpJUGYoA5IyjHiKASNyHjR0uxBQ7eQS94i3A=
github.com/solo-io/protoc-gen-ext v0.0.18/go.mod h1:iGyCvmKmhJNXs5MgBcYFBF0om7LDnCVD2WwhOZGnqeA=
github.com/solo-io/protoc-gen-openapi v0.2.2 h1:OzyOAxiZuMAaLYWMNoTl2v9E7IXcl7UEeiTeCSwvCJ0=
github.com/solo-io/protoc-gen-openapi v0.2.2/go.mod h1:osEjRl1miHqlq4Wl/8SEqHFoyydptPL1EzEdM9c4vfE=
github.com/solo-io/protoc-gen-openapi v0.2.4 h1:9tqGhCAq83IRSzHhKDzpWnPlbPPORTM2izVxjLk0Ftw=
github.com/solo-io/protoc-gen-openapi v0.2.4/go.mod h1:osEjRl1miHqlq4Wl/8SEqHFoyydptPL1EzEdM9c4vfE=
github.com/solo-io/skv2 v0.39.1 h1:dWaZTWgntAsvh4lTlojd3xE+g7NF4oYNonfcdpy0nXE=
github.com/solo-io/skv2 v0.39.1/go.mod h1:Zsnl+OYmOkj+6KeaMfkzYIxHTVMC0w2gVApzNJRadM8=
github.com/solo-io/solo-apis v0.0.0-20240528173540-7879b7d12cb9 h1:4DNulNBJdaVz+fOaMQes1MqVCIO/db2vmwz7bVe3iIU=
github.com/solo-io/solo-apis v0.0.0-20240528173540-7879b7d12cb9/go.mod h1:fA+jJC7TXNM+i3uXvq7fpVrJ6JpNu1BgBxc4U9ntUW0=
github.com/solo-io/solo-kit v0.35.0 h1:iX7Wl9h59M7sPAH+fLVdjalY+nAfeG2ry+zrXYuyXTo=
github.com/solo-io/solo-kit v0.35.0/go.mod h1:fxakm2fhYzT3UNsM4baURVz19wCa75sv/KBNi4lwv6Q=
github.com/solo-io/solo-kit v0.35.3 h1:cm+uHB5cFFlAnghwKdboaKI0Ki+t1ECA0Db3TnTL6KU=
github.com/solo-io/solo-kit v0.35.3/go.mod h1:KBCEfl59/wE0K68s90aDcrTc36gKR5L97TbVelwL8n4=
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
Expand Down
39 changes: 39 additions & 0 deletions install/helm/gloo/crds/enterprise.gloo.solo.io_v1_AuthConfig.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,11 @@ spec:
type: string
type: object
type: array
required:
- secretRefs
type: object
required:
- secretRefs
type: object
jwt:
maxProperties: 0
Expand Down Expand Up @@ -268,6 +272,8 @@ spec:
type: string
userDnTemplate:
type: string
required:
- address
type: object
name:
nullable: true
Expand Down Expand Up @@ -297,6 +303,8 @@ spec:
items:
type: string
type: array
required:
- appUrl
type: object
oauth2:
properties:
Expand Down Expand Up @@ -326,6 +334,8 @@ spec:
type: string
userIdAttributeName:
type: string
required:
- introspectionUrl
type: object
introspectionUrl:
type: string
Expand All @@ -337,13 +347,17 @@ spec:
properties:
inlineString:
type: string
required:
- inlineString
type: object
remoteJwks:
properties:
refreshInterval:
type: string
url:
type: string
required:
- url
type: object
type: object
requiredScopes:
Expand Down Expand Up @@ -474,6 +488,12 @@ spec:
additionalProperties:
type: string
type: object
required:
- clientId
- appUrl
- callbackPath
- authEndpoint
- tokenEndpoint
type: object
oidcAuthorizationCode:
properties:
Expand Down Expand Up @@ -562,6 +582,8 @@ spec:
type: object
validFor:
type: string
required:
- signingKeyRef
type: object
type: object
clientId:
Expand Down Expand Up @@ -758,6 +780,11 @@ spec:
additionalProperties:
type: string
type: object
required:
- clientId
- issuerUrl
- appUrl
- callbackPath
type: object
type: object
opaAuth:
Expand All @@ -780,6 +807,8 @@ spec:
type: object
query:
type: string
required:
- query
type: object
opaServerAuth:
properties:
Expand All @@ -796,6 +825,8 @@ spec:
type: string
serverAddr:
type: string
required:
- package
type: object
passThroughAuth:
properties:
Expand Down Expand Up @@ -827,6 +858,8 @@ spec:
type: object
tlsConfig:
type: object
required:
- address
type: object
http:
properties:
Expand Down Expand Up @@ -868,6 +901,8 @@ spec:
type: object
url:
type: string
required:
- url
type: object
type: object
pluginAuth:
Expand All @@ -881,6 +916,8 @@ spec:
type: string
pluginFileName:
type: string
required:
- config
type: object
type: object
type: array
Expand All @@ -894,6 +931,8 @@ spec:
x-kubernetes-preserve-unknown-fields: true
type: object
type: object
required:
- configs
type: object
status:
default: {}
Expand Down
Loading
Loading