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

Add AWS pod identity support #499

Merged
merged 3 commits into from
Mar 4, 2020
Merged

Add AWS pod identity support #499

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
759c955
Add AWS pod identity support
zach-dunton-sf Nov 14, 2019
14bc06f
Rename pod identity providers
zach-dunton-sf Dec 9, 2019
ca9cfa4
Merge branch 'master' into feature/aws_pod_identity
ahmelsayed Mar 4, 2020
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
7 changes: 7 additions & 0 deletions pkg/apis/keda/v1alpha1/triggerauthentication_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,13 @@ const (
PodIdentityProviderAzure = "azure"
PodIdentityProviderGCP = "gcp"
PodIdentityProviderSpiffe = "spiffe"
PodIdentityProviderEKS = "eks"
zach-dunton-sf marked this conversation as resolved.
Show resolved Hide resolved
PodIdentityProviderKIAM = "kiam"
)

const (
PodIdentityAnnotationEKS = "eks.amazonaws.com/role-arn"
PodIdentityAnnotationKiam = "iam.amazonaws.com/role"
)

// AuthPodIdentity allows users to select the platform native identity
Expand Down
14 changes: 14 additions & 0 deletions pkg/handler/scale_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"github.com/go-logr/logr"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down Expand Up @@ -182,6 +183,19 @@ func (h *ScaleHandler) GetDeploymentScalers(scaledObject *kedav1alpha1.ScaledObj

for i, trigger := range scaledObject.Spec.Triggers {
authParams, podIdentity := h.parseDeploymentAuthRef(trigger.AuthenticationRef, scaledObject, deployment)

if podIdentity == "eks" {
serviceAccountName := deployment.Spec.Template.Spec.ServiceAccountName
serviceAccount := &v1.ServiceAccount{}
err = h.client.Get(context.TODO(), types.NamespacedName{Name: serviceAccountName, Namespace: scaledObject.GetNamespace()}, serviceAccount)
zach-dunton-sf marked this conversation as resolved.
Show resolved Hide resolved
if err != nil {
return scalers, nil, fmt.Errorf("error getting deployment: %s", err)
}
authParams["awsRoleArn"] = serviceAccount.Annotations[kedav1alpha1.PodIdentityAnnotationEKS]
} else if podIdentity == "kiam" {
authParams["awsRoleArn"] = deployment.Spec.Template.ObjectMeta.Annotations[kedav1alpha1.PodIdentityAnnotationKiam]
}

scaler, err := h.getScaler(scaledObject.Name, scaledObject.Namespace, trigger.Type, resolvedEnv, trigger.Metadata, authParams, podIdentity)
if err != nil {
return scalers, nil, fmt.Errorf("error getting scaler for trigger #%d: %s", i, err)
Expand Down