Skip to content

operator: Support using custom IdP #146

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

Draft
f110 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

operator: Support using custom IdP #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions operator/config/crd/proto.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2351,12 +2351,21 @@ spec:
required:
- name
type: object
domain:
type: string
extraScopes:
items:
type: string
type: array
issuer:
type: string
provider:
type: string
redirectUrl:
type: string
required:
- provider
- extraScopes
type: object
issuerRef:
properties:
Expand Down
10 changes: 5 additions & 5 deletions .../github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoringv1/generated.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -939,12 +939,12 @@ message RemoteWriteSpec {
}

message Rule {
optional string record = 1 [(dev.f110.kubeproto.field) = { go_name: "Record", api_field_name: "record", inline: false }];
optional string alert = 2 [(dev.f110.kubeproto.field) = { go_name: "Alert", api_field_name: "alert", inline: false }];
.k8s.io.apimachinery.pkg.util.intstr.IntOrString expr = 3 [(dev.f110.kubeproto.field) = { go_name: "Expr", api_field_name: "expr", inline: false }];
optional string record = 1 [(dev.f110.kubeproto.field) = { go_name: "Record", api_field_name: "record", inline: false }];
optional string alert = 2 [(dev.f110.kubeproto.field) = { go_name: "Alert", api_field_name: "alert", inline: false }];
.k8s.io.apimachinery.pkg.util.intstr.IntOrString expr = 3 [(dev.f110.kubeproto.field) = { go_name: "Expr", api_field_name: "expr", inline: false }];
optional string for = 4 [(dev.f110.kubeproto.field) = {go_name: "For", api_field_name: "for", inline: false}];
map<string, string> labels = 5 [(dev.f110.kubeproto.field) = { go_name: "Labels", api_field_name: "labels", inline: false }];
map<string, string> annotations = 6 [(dev.f110.kubeproto.field) = { go_name: "Annotations", api_field_name: "annotations", inline: false }];
map<string, string> labels = 5 [(dev.f110.kubeproto.field) = { go_name: "Labels", api_field_name: "labels", inline: false }];
map<string, string> annotations = 6 [(dev.f110.kubeproto.field) = { go_name: "Annotations", api_field_name: "annotations", inline: false }];
}

message RuleGroup {
Expand Down
8 changes: 8 additions & 0 deletions pkg/k8s/api/proxyv1alpha2/go_api.generated.object.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,6 +881,9 @@ type IdentityProviderSpec struct {
ClientId string `json:"clientId,omitempty"`
ClientSecretRef *SecretSelector `json:"clientSecretRef,omitempty"`
RedirectUrl string `json:"redirectUrl,omitempty"`
Domain string `json:"domain,omitempty"`
Issuer string `json:"issuer,omitempty"`
ExtraScopes []string `json:"extraScopes"`
}

func (in *IdentityProviderSpec) DeepCopyInto(out *IdentityProviderSpec) {
Expand All @@ -890,6 +893,11 @@ func (in *IdentityProviderSpec) DeepCopyInto(out *IdentityProviderSpec) {
*out = new(SecretSelector)
(*in).DeepCopyInto(*out)
}
if in.ExtraScopes != nil {
t := make([]string, len(in.ExtraScopes))
copy(t, in.ExtraScopes)
out.ExtraScopes = t
}
}

func (in *IdentityProviderSpec) DeepCopy() *IdentityProviderSpec {
Expand Down
3 changes: 3 additions & 0 deletions pkg/k8s/api/proxyv1alpha2/proxy.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,9 @@ message IdentityProviderSpec {
optional string client_id = 2;
optional SecretSelector client_secret_ref = 3;
optional string redirect_url = 4;
optional string domain = 5;
optional string issuer = 6;
repeated string extra_scopes = 7;
}

message SessionSpec {
Expand Down
4 changes: 3 additions & 1 deletion pkg/k8s/controllers/proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,8 +771,10 @@ func (r *HeimdallrProxy) ConfigForMain() (*corev1.ConfigMap, error) {
Provider: r.Spec.IdentityProvider.Provider,
ClientId: r.Spec.IdentityProvider.ClientId,
ClientSecretFile: fmt.Sprintf("%s/%s", identityProviderSecretPath, r.Spec.IdentityProvider.ClientSecretRef.Key),
ExtraScopes: []string{"email"},
ExtraScopes: append([]string{"email"}, r.Spec.IdentityProvider.ExtraScopes...),
RedirectUrl: r.Spec.IdentityProvider.RedirectUrl,
Issuer: r.Spec.IdentityProvider.Issuer,
Domain: r.Spec.IdentityProvider.Domain,
},
Datastore: &configv2.Datastore{
DatastoreEtcd: &configv2.DatastoreEtcd{
Expand Down