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

Avoid exception when CRD doesn't follow Pod spec shape #1195

Merged
merged 2 commits into from
Oct 5, 2020
Merged

Avoid exception when CRD doesn't follow Pod spec shape #1195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64825ed
Avoid exception when CRD doesn't follow Pod spec shape
anggao Sep 24, 2020
cc2f92a
fix log msg and update ResolveAuthRef
anggao Sep 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkg/scaling/resolver/scale_resolvers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ func ResolveAuthRef(client client.Client, logger logr.Logger, triggerAuthRef *ke
}
if triggerAuth.Spec.Env != nil {
for _, e := range triggerAuth.Spec.Env {
if podSpec == nil {
result[e.Parameter] = ""
continue
}
env, err := ResolveContainerEnv(client, logger, podSpec, e.ContainerName, namespace)
if err != nil {
result[e.Parameter] = ""
Expand Down
16 changes: 9 additions & 7 deletions pkg/scaling/scale_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,15 +296,17 @@ func min(x, y int64) int64 {
func (h *scaleHandler) buildScalers(withTriggers *kedav1alpha1.WithTriggers, podTemplateSpec *corev1.PodTemplateSpec, containerName string) ([]scalers.Scaler, error) {
logger := h.logger.WithValues("type", withTriggers.Kind, "namespace", withTriggers.Namespace, "name", withTriggers.Name)
var scalersRes []scalers.Scaler

resolvedEnv, err := resolver.ResolveContainerEnv(h.client, logger, &podTemplateSpec.Spec, containerName, withTriggers.Namespace)
if err != nil {
return scalersRes, fmt.Errorf("error resolving secrets for ScaleTarget: %s", err)
var err error
resolvedEnv := make(map[string]string)
if podTemplateSpec != nil {
resolvedEnv, err = resolver.ResolveContainerEnv(h.client, logger, &podTemplateSpec.Spec, containerName, withTriggers.Namespace)
if err != nil {
return scalersRes, fmt.Errorf("error resolving secrets for ScaleTarget: %s", err)
}
}

for i, trigger := range withTriggers.Spec.Triggers {
authParams, podIdentity := resolver.ResolveAuthRef(h.client, logger, trigger.AuthenticationRef, &podTemplateSpec.Spec, withTriggers.Namespace)

if podIdentity == kedav1alpha1.PodIdentityProviderAwsEKS {
serviceAccountName := podTemplateSpec.Spec.ServiceAccountName
serviceAccount := &corev1.ServiceAccount{}
Expand Down Expand Up @@ -347,8 +349,8 @@ func (h *scaleHandler) getPods(scalableObject interface{}) (*corev1.PodTemplateS
}

if withPods.Spec.Template.Spec.Containers == nil {
h.logger.Info("There aren't any containers in the ScaleTarget", "resource", obj.Status.ScaleTargetGVKR.GVKString(), "name", obj.Spec.ScaleTargetRef.Name)
return nil, "", fmt.Errorf("no containers found")
h.logger.V(1).Info("There aren't any containers found in the ScaleTarget, therefore it is no possible to inject environment properties", "resource", obj.Status.ScaleTargetGVKR.GVKString(), "name", obj.Spec.ScaleTargetRef.Name)
return nil, "", nil
}

podTemplateSpec := corev1.PodTemplateSpec{
Expand Down