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.

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

fix(operator): Fixed starting deployments, when no corresponding app-version is available #210

Merged
merged 1 commit into from
Oct 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion examples/podtatohead-deployment/app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
version: 0.2.7
- name: podtato-head-right-arm
version: 0.1.0
- name: podtato-head-left-arm
- name: podtato-head-right-leg
version: 0.2.7
- name: podtato-head-hat
version: 0.1.0
Expand Down
47 changes: 39 additions & 8 deletions operator/controllers/keptnworkloadinstance/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package keptnworkloadinstance
import (
"context"
"fmt"
"golang.org/x/mod/semver"
"time"

"github.com/keptn-sandbox/lifecycle-controller/operator/api/v1alpha1/semconv"
Expand Down Expand Up @@ -101,15 +102,15 @@ func (r *KeptnWorkloadInstanceReconciler) Reconcile(ctx context.Context, req ctr
//Wait for pre-evaluation checks of App
phase := common.PhaseAppPreEvaluation

appVersion, err := r.getAppVersion(ctx, types.NamespacedName{Namespace: req.Namespace, Name: workloadInstance.Spec.AppName})
if errors.IsNotFound(err) {
r.recordEvent(phase, "Warning", workloadInstance, "AppVersionNotFound", "has failed since app could not be found")
r.Log.Error(err, "Related App Version not found")
return reconcile.Result{Requeue: true, RequeueAfter: 20 * time.Second}, nil
} else if err != nil {
found, appVersion, err := r.getAppVersionForWorkloadInstance(ctx, workloadInstance)
if err != nil {
span.SetStatus(codes.Error, err.Error())
r.recordEvent(phase, "Warning", workloadInstance, "GetAppVersionFailed", "has failed since app could not be retrieved")
r.Log.Error(err, "Could not retrieve App Version")
return reconcile.Result{}, fmt.Errorf("could not fetch AppVersion: %+v", err)
return reconcile.Result{Requeue: true, RequeueAfter: 10 * time.Second}, fmt.Errorf("could not fetch AppVersion for KeptnWorkloadInstance: %+v", err)
} else if !found {
span.SetStatus(codes.Error, err.Error())
r.recordEvent(phase, "Warning", workloadInstance, "AppVersionNotFound", "has failed since app could not be found")
return reconcile.Result{Requeue: true, RequeueAfter: 10 * time.Second}, fmt.Errorf("could not find AppVersion for KeptnWorkloadInstance")
}

appPreEvalStatus := appVersion.Status.PreDeploymentEvaluationStatus
Expand Down Expand Up @@ -276,3 +277,33 @@ func (r *KeptnWorkloadInstanceReconciler) getAppVersion(ctx context.Context, app
err = r.Get(ctx, GetAppVersionName(appName.Namespace, appName.Name, app.Spec.Version), appVersion)
return appVersion, err
}

func (r *KeptnWorkloadInstanceReconciler) getAppVersionForWorkloadInstance(ctx context.Context, wli *klcv1alpha1.KeptnWorkloadInstance) (bool, klcv1alpha1.KeptnAppVersion, error) {
apps := &klcv1alpha1.KeptnAppVersionList{}
if err := r.Client.List(ctx, apps, client.InNamespace(wli.Namespace)); err != nil {
return false, klcv1alpha1.KeptnAppVersion{}, err
}
latestVersion := klcv1alpha1.KeptnAppVersion{}
for _, app := range apps.Items {
if app.Spec.AppName == wli.Spec.AppName {
for _, appWorkload := range app.Spec.Workloads {
workloadName := fmt.Sprintf("%s-%s", app.Spec.AppName, appWorkload.Name)
if appWorkload.Version == wli.Spec.Version && workloadName == wli.Spec.WorkloadName {
if latestVersion.Spec.Version == "" {
latestVersion = app
} else {
if semver.Compare(latestVersion.Spec.Version, app.Spec.Version) < 0 {
latestVersion = app
}
}
}
}
}
}

r.Log.Info("Selected Version " + latestVersion.Spec.Version + " for KeptnApp " + wli.Spec.AppName)
if latestVersion.Spec.Version == "" {
return false, klcv1alpha1.KeptnAppVersion{}, nil
}
return true, latestVersion, nil
}
1 change: 1 addition & 0 deletions operator/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ require (
go.opentelemetry.io/otel/sdk v1.10.0
go.opentelemetry.io/otel/sdk/metric v0.32.1
go.opentelemetry.io/otel/trace v1.10.0
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3
google.golang.org/grpc v1.46.2
k8s.io/api v0.24.2
k8s.io/apimachinery v0.24.2
Expand Down
1 change: 1 addition & 0 deletions operator/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,7 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o=
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
Expand Down