[camel-k] branch master updated: fix: Kaniko cache default spec is not updated when calling the status endpoint

[astefanutti]

This is an automated email from the ASF dual-hosted git repository.

astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git


The following commit(s) were added to refs/heads/master by this push:
     new 946e390  fix: Kaniko cache default spec is not updated when calling 
the status endpoint
946e390 is described below

commit 946e3901987714afb295853c96d441e4a362c813
Author: Antonin Stefanutti <anto...@stefanutti.fr>
AuthorDate: Tue Oct 1 09:40:25 2019 +0200

    fix: Kaniko cache default spec is not updated when calling the status 
endpoint
---
 pkg/controller/integrationplatform/initialize.go | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkg/controller/integrationplatform/initialize.go 
b/pkg/controller/integrationplatform/initialize.go
index a331027..d90a06c 100644
--- a/pkg/controller/integrationplatform/initialize.go
+++ b/pkg/controller/integrationplatform/initialize.go
@@ -55,7 +55,6 @@ func (action *initializeAction) CanHandle(platform 
*v1alpha1.IntegrationPlatform
 }
 
 func (action *initializeAction) Handle(ctx context.Context, platform 
*v1alpha1.IntegrationPlatform) (*v1alpha1.IntegrationPlatform, error) {
-
        duplicate, err := action.isDuplicate(ctx, platform)
        if err != nil {
                return nil, err
@@ -109,15 +108,15 @@ func (action *initializeAction) Handle(ctx 
context.Context, platform *v1alpha1.I
                }
        }
 
-       if platform.Spec.Build.PublishStrategy == 
v1alpha1.IntegrationPlatformBuildPublishStrategyKaniko && 
platform.Spec.Build.Registry.Address == "" {
-               action.L.Info("No registry specified for publishing images")
-       }
-
        err = action.setDefaults(ctx, platform)
        if err != nil {
                return nil, err
        }
 
+       if platform.Spec.Build.PublishStrategy == 
v1alpha1.IntegrationPlatformBuildPublishStrategyKaniko && 
platform.Spec.Build.Registry.Address == "" {
+               action.L.Info("No registry specified for publishing images")
+       }
+
        if platform.Spec.Build.Maven.Timeout.Duration != 0 {
                action.L.Infof("Maven Timeout set to %s", 
platform.Spec.Build.Maven.Timeout.Duration)
        }
@@ -136,13 +135,6 @@ func (action *initializeAction) Handle(ctx 
context.Context, platform *v1alpha1.I
                        return nil, err
                }
 
-               defaultKanikoBuildCache := true
-               // Check if the KanikoBuildCache has been initialized
-               if platform.Spec.Build.KanikoBuildCache == nil {
-                       //if not initialized then default it to true
-                       platform.Spec.Build.KanikoBuildCache = 
&defaultKanikoBuildCache
-               }
-
                // Check if the operator is running in the same namespace 
before starting the cache warmer
                if platform.Namespace == platformutil.GetOperatorNamespace() && 
*platform.Spec.Build.KanikoBuildCache {
                        // Create the Kaniko warmer pod that caches the base 
image into the Camel K builder volume
@@ -255,6 +247,13 @@ func (action *initializeAction) setDefaults(ctx 
context.Context, platform *v1alp
                }
        }
 
+       if platform.Spec.Build.PublishStrategy == 
v1alpha1.IntegrationPlatformBuildPublishStrategyKaniko && 
platform.Spec.Build.KanikoBuildCache == nil {
+               // Default to using Kaniko cache warmer
+               defaultKanikoBuildCache := true
+               platform.Spec.Build.KanikoBuildCache = &defaultKanikoBuildCache
+               action.L.Infof("Kaniko cache set to %t", 
*platform.Spec.Build.KanikoBuildCache)
+       }
+
        action.L.Infof("CamelVersion set to %s", 
platform.Spec.Build.CamelVersion)
        action.L.Infof("RuntimeVersion set to %s", 
platform.Spec.Build.RuntimeVersion)
        action.L.Infof("BaseImage set to %s", platform.Spec.Build.BaseImage)