Skip to content

Commit 97e19ba

Browse files
committed
chore: add comment to newly introduced API and remove newline
Signed-off-by: aaronschweig <[email protected]>
1 parent 8a8228d commit 97e19ba

File tree

5 files changed

+11
-3
lines changed

5 files changed

+11
-3
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@ spec:
9191
description: 'Optional: OIDC configures OpenID Connect Authentication.'
9292
properties:
9393
caFileRef:
94+
description: |-
95+
Optionally provides a reference to a secret that contains a CA bundle for the OIDC issuer. This is useful when
96+
the OIDC issuer is not publicly trusted.
9497
properties:
9598
key:
9699
description: Key is the key in the secret that contains

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,9 @@ spec:
134134
description: 'Optional: OIDC configures OpenID Connect Authentication.'
135135
properties:
136136
caFileRef:
137+
description: |-
138+
Optionally provides a reference to a secret that contains a CA bundle for the OIDC issuer. This is useful when
139+
the OIDC issuer is not publicly trusted.
137140
properties:
138141
key:
139142
description: Key is the key in the secret that contains

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,9 @@ spec:
134134
description: 'Optional: OIDC configures OpenID Connect Authentication.'
135135
properties:
136136
caFileRef:
137+
description: |-
138+
Optionally provides a reference to a secret that contains a CA bundle for the OIDC issuer. This is useful when
139+
the OIDC issuer is not publicly trusted.
137140
properties:
138141
key:
139142
description: Key is the key in the secret that contains

internal/resources/utils/authentication.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,8 @@ func applyOIDCConfiguration(deployment *appsv1.Deployment, config operatorv1alph
7373
MountPath: "/etc/kcp/tls/oidc",
7474
ReadOnly: true,
7575
})
76-
7776
}
7877

79-
// TODO(mjudeikis): Add support for when OIDC is not publically trusted --oidc-ca-file=/etc/kcp/tls/oidc/<ca-secret-name>
80-
8178
podSpec.Containers[0].Args = append(podSpec.Containers[0].Args, extraArgs...)
8279
deployment.Spec.Template.Spec = podSpec
8380

sdk/apis/operator/v1alpha1/common.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,8 @@ type OIDCConfiguration struct {
380380
// on the OIDC side will be recognised as "oidc:[email protected]" in KCP.
381381
UsernamePrefix string `json:"usernamePrefix,omitempty"`
382382

383+
// Optionally provides a reference to a secret that contains a CA bundle for the OIDC issuer. This is useful when
384+
// the OIDC issuer is not publicly trusted.
383385
CAFileRef *OIDCCAFileRef `json:"caFileRef,omitempty"`
384386
}
385387

0 commit comments

Comments
 (0)