Skip to content

Commit fb9c8f4

Browse files
authored
Merge pull request #68 from mjudeikis/mjudeikis/oidc.config
Add OIDC configuration support
2 parents 16d3a85 + f6826f5 commit fb9c8f4

File tree

9 files changed

+514
-59
lines changed

9 files changed

+514
-59
lines changed

config/crd/bases/operator.kcp.io_frontproxies.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,6 @@ spec:
9898
Optionally provide the client secret for the OIDC client. This is not used by KCP itself, but is used to generate
9999
a OIDC kubeconfig that can be shared with users to log in via the OIDC provider.
100100
type: string
101-
enabled:
102-
type: boolean
103101
groupsClaim:
104102
description: 'Experimental: Optionally provides a custom claim
105103
for fetching groups. The claim must be a string or an array
@@ -125,7 +123,6 @@ spec:
125123
type: string
126124
required:
127125
- clientID
128-
- enabled
129126
- issuerURL
130127
type: object
131128
passOnGroups:

go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ require (
99
github.com/go-logr/logr v1.4.2
1010
github.com/go-logr/zapr v1.3.0
1111
github.com/go-test/deep v1.1.0
12-
github.com/google/go-cmp v0.6.0
1312
github.com/kcp-dev/code-generator/v2 v2.3.1
1413
github.com/kcp-dev/kcp-operator/sdk v0.0.0-00010101000000-000000000000
1514
github.com/kcp-dev/kcp/sdk v0.27.1
1615
github.com/onsi/ginkgo/v2 v2.20.0
1716
github.com/onsi/gomega v1.34.1
17+
github.com/stretchr/testify v1.9.0
1818
go.uber.org/zap v1.27.0
1919
k8c.io/reconciler v0.5.0
2020
k8s.io/api v0.31.6
@@ -53,6 +53,7 @@ require (
5353
github.com/golang/protobuf v1.5.4 // indirect
5454
github.com/google/cel-go v0.20.1 // indirect
5555
github.com/google/gnostic-models v0.6.8 // indirect
56+
github.com/google/go-cmp v0.6.0 // indirect
5657
github.com/google/gofuzz v1.2.1-0.20210504230335-f78f29fc09ea // indirect
5758
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
5859
github.com/google/uuid v1.6.0 // indirect
@@ -70,6 +71,7 @@ require (
7071
github.com/modern-go/reflect2 v1.0.2 // indirect
7172
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7273
github.com/pkg/errors v0.9.1 // indirect
74+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
7375
github.com/prometheus/client_golang v1.20.4 // indirect
7476
github.com/prometheus/client_model v0.6.1 // indirect
7577
github.com/prometheus/common v0.55.0 // indirect

internal/resources/frontproxy/deployment.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ func DeploymentReconciler(frontProxy *operatorv1alpha1.FrontProxy, rootShard *op
236236
}
237237

238238
dep = utils.ApplyDeploymentTemplate(dep, frontProxy.Spec.DeploymentTemplate)
239+
dep = utils.ApplyAuthConfiguration(dep, frontProxy.Spec.Auth)
239240

240241
return dep, nil
241242
}

0 commit comments

Comments
 (0)