You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2019/06/27 16:34:27 UTC
[camel-k] branch master updated (3a4c882 -> bccf1f9)
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git.
from 3a4c882 chore(integration controller): replace custom reconcile trigger with watch
new 8733d6d chore(lint): run golanci-lint on travis
new 0f6da46 chore(lint): set modules-download-mode
new dd25784 chore(build): run go mod vendor
new ea5fc6a chore(build): set 1.12.x as go version to use in travis
new 3e6bd50 chore(lint): fix findings
new 8a32140 chore(build): attemp to fixnt on travis
new bccf1f9 chore(lint): fix findings
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 11 ++-
pkg/cmd/run.go | 6 +-
pkg/controller/integration/initialize.go | 2 +-
.../integration/integration_controller.go | 9 +-
pkg/controller/integrationkit/build.go | 2 +-
pkg/controller/integrationplatform/initialize.go | 108 +++++++++++----------
.../integrationplatform/initialize_test.go | 15 +--
pkg/util/kubernetes/log/pod_scraper.go | 13 ++-
pkg/util/maven/maven.go | 8 +-
9 files changed, 101 insertions(+), 73 deletions(-)
[camel-k] 04/07: chore(build): set 1.12.x as go version to use in
travis
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit ea5fc6a1578ffa53db6ba24c35537c9c2ac9e445
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Thu Jun 27 10:21:00 2019 +0200
chore(build): set 1.12.x as go version to use in travis
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index b4a94bc..48b1ba8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ sudo: required
language: go
go:
- - "1.11.4"
+ - 1.12.x
install:
- go mod vendor
[camel-k] 01/07: chore(lint): run golanci-lint on travis
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 8733d6d8abd02914f15c0983b8d91440348a375f
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Wed Jun 26 11:05:50 2019 +0200
chore(lint): run golanci-lint on travis
---
.travis.yml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/.travis.yml b/.travis.yml
index 5ad38ed..6315996 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,6 +23,8 @@ language: go
go:
- "1.11.4"
+install: true
+
env:
global:
- GO111MODULE="on"
@@ -33,5 +35,9 @@ env:
services:
- docker
+before_script:
+ - curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b . v1.17.1
+
script:
+ - ./golangci-lint run || travis_terminate 1;
- ./script/travis_build.sh
[camel-k] 07/07: chore(lint): fix findings
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit bccf1f964bc1c2cccb903c1a06cc532f976513e4
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Thu Jun 27 15:53:25 2019 +0200
chore(lint): fix findings
---
.../integration/integration_controller.go | 9 +-
pkg/controller/integrationkit/build.go | 2 +-
pkg/controller/integrationplatform/initialize.go | 108 +++++++++++----------
.../integrationplatform/initialize_test.go | 15 +--
pkg/util/maven/maven.go | 8 +-
5 files changed, 79 insertions(+), 63 deletions(-)
diff --git a/pkg/controller/integration/integration_controller.go b/pkg/controller/integration/integration_controller.go
index b02a450..8fc4b5a 100644
--- a/pkg/controller/integration/integration_controller.go
+++ b/pkg/controller/integration/integration_controller.go
@@ -104,7 +104,9 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
// during image build
return oldBuild.Status.Phase != newBuild.Status.Phase
},
- })
+ },
+ )
+
if err != nil {
return err
}
@@ -142,6 +144,10 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
}),
})
+ if err != nil {
+ return err
+ }
+
// Watch for IntegrationPlatform phase transitioning to ready and enqueue
// requests for any integrations that are in phase waiting for platform
err = c.Watch(&source.Kind{Type: &v1alpha1.IntegrationPlatform{}}, &handler.EnqueueRequestsFromMapFunc{
@@ -173,6 +179,7 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
return requests
}),
})
+
if err != nil {
return err
}
diff --git a/pkg/controller/integrationkit/build.go b/pkg/controller/integrationkit/build.go
index 4ea5664..97b7caf 100644
--- a/pkg/controller/integrationkit/build.go
+++ b/pkg/controller/integrationkit/build.go
@@ -21,10 +21,10 @@ import (
"context"
"fmt"
- "github.com/apache/camel-k/pkg/util/kubernetes"
"github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
"github.com/apache/camel-k/pkg/builder"
"github.com/apache/camel-k/pkg/trait"
+ "github.com/apache/camel-k/pkg/util/kubernetes"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/controller/integrationplatform/initialize.go b/pkg/controller/integrationplatform/initialize.go
index 2fc150b..7f52c5e 100644
--- a/pkg/controller/integrationplatform/initialize.go
+++ b/pkg/controller/integrationplatform/initialize.go
@@ -111,58 +111,7 @@ func (action *initializeAction) Handle(ctx context.Context, ip *v1alpha1.Integra
action.L.Info("No registry specified for publishing images")
}
- if target.Spec.Profile == "" {
- target.Spec.Profile = platform.GetProfile(target)
- }
- if target.Spec.Build.CamelVersion == "" {
- target.Spec.Build.CamelVersion = defaults.CamelVersionConstraint
- }
- if target.Spec.Build.RuntimeVersion == "" {
- target.Spec.Build.RuntimeVersion = defaults.RuntimeVersion
- }
- if target.Spec.Build.BaseImage == "" {
- target.Spec.Build.BaseImage = defaults.BaseImage
- }
- if target.Spec.Build.LocalRepository == "" {
- target.Spec.Build.LocalRepository = defaults.LocalRepository
- }
- if target.Spec.Build.PersistentVolumeClaim == "" {
- target.Spec.Build.PersistentVolumeClaim = target.Name
- }
-
- if target.Spec.Build.Timeout.Duration != 0 {
- d := target.Spec.Build.Timeout.Duration.Truncate(time.Second)
-
- if target.Spec.Build.Timeout.Duration != d {
- action.L.Infof("Build timeout minimum unit is sec (configured: %s, truncated: %s)", target.Spec.Build.Timeout.Duration, d)
- }
-
- target.Spec.Build.Timeout.Duration = d
- }
- if target.Spec.Build.Timeout.Duration == 0 {
- target.Spec.Build.Timeout.Duration = 5 * time.Minute
- }
-
- if target.Spec.Build.Maven.Timeout.Duration != 0 {
- d := target.Spec.Build.Maven.Timeout.Duration.Truncate(time.Second)
-
- if target.Spec.Build.Maven.Timeout.Duration != d {
- action.L.Infof("Maven timeout minimum unit is sec (configured: %s, truncated: %s)", target.Spec.Build.Maven.Timeout.Duration, d)
- }
-
- target.Spec.Build.Maven.Timeout.Duration = d
- }
- if target.Spec.Build.Maven.Timeout.Duration == 0 {
- n := target.Spec.Build.Timeout.Duration.Seconds() * 0.75
- target.Spec.Build.Maven.Timeout.Duration = (time.Duration(n) * time.Second).Truncate(time.Second)
- }
-
- action.L.Infof("CamelVersion set to %s", target.Spec.Build.CamelVersion)
- action.L.Infof("RuntimeVersion set to %s", target.Spec.Build.RuntimeVersion)
- action.L.Infof("BaseImage set to %s", target.Spec.Build.BaseImage)
- action.L.Infof("LocalRepository set to %s", target.Spec.Build.LocalRepository)
- action.L.Infof("Timeout set to %s", target.Spec.Build.Timeout)
- action.L.Infof("Maven Timeout set to %s", target.Spec.Build.Maven.Timeout.Duration)
+ action.setDefaults(target)
if target.Spec.Build.Maven.Timeout.Duration != 0 {
action.L.Infof("Maven Timeout set to %s", target.Spec.Build.Maven.Timeout.Duration)
@@ -221,6 +170,61 @@ func (action *initializeAction) isDuplicate(ctx context.Context, thisPlatform *v
return false, nil
}
+func (action *initializeAction) setDefaults(target *v1alpha1.IntegrationPlatform) {
+ if target.Spec.Profile == "" {
+ target.Spec.Profile = platform.GetProfile(target)
+ }
+ if target.Spec.Build.CamelVersion == "" {
+ target.Spec.Build.CamelVersion = defaults.CamelVersionConstraint
+ }
+ if target.Spec.Build.RuntimeVersion == "" {
+ target.Spec.Build.RuntimeVersion = defaults.RuntimeVersion
+ }
+ if target.Spec.Build.BaseImage == "" {
+ target.Spec.Build.BaseImage = defaults.BaseImage
+ }
+ if target.Spec.Build.LocalRepository == "" {
+ target.Spec.Build.LocalRepository = defaults.LocalRepository
+ }
+ if target.Spec.Build.PersistentVolumeClaim == "" {
+ target.Spec.Build.PersistentVolumeClaim = target.Name
+ }
+
+ if target.Spec.Build.Timeout.Duration != 0 {
+ d := target.Spec.Build.Timeout.Duration.Truncate(time.Second)
+
+ if target.Spec.Build.Timeout.Duration != d {
+ action.L.Infof("Build timeout minimum unit is sec (configured: %s, truncated: %s)", target.Spec.Build.Timeout.Duration, d)
+ }
+
+ target.Spec.Build.Timeout.Duration = d
+ }
+ if target.Spec.Build.Timeout.Duration == 0 {
+ target.Spec.Build.Timeout.Duration = 5 * time.Minute
+ }
+
+ if target.Spec.Build.Maven.Timeout.Duration != 0 {
+ d := target.Spec.Build.Maven.Timeout.Duration.Truncate(time.Second)
+
+ if target.Spec.Build.Maven.Timeout.Duration != d {
+ action.L.Infof("Maven timeout minimum unit is sec (configured: %s, truncated: %s)", target.Spec.Build.Maven.Timeout.Duration, d)
+ }
+
+ target.Spec.Build.Maven.Timeout.Duration = d
+ }
+ if target.Spec.Build.Maven.Timeout.Duration == 0 {
+ n := target.Spec.Build.Timeout.Duration.Seconds() * 0.75
+ target.Spec.Build.Maven.Timeout.Duration = (time.Duration(n) * time.Second).Truncate(time.Second)
+ }
+
+ action.L.Infof("CamelVersion set to %s", target.Spec.Build.CamelVersion)
+ action.L.Infof("RuntimeVersion set to %s", target.Spec.Build.RuntimeVersion)
+ action.L.Infof("BaseImage set to %s", target.Spec.Build.BaseImage)
+ action.L.Infof("LocalRepository set to %s", target.Spec.Build.LocalRepository)
+ action.L.Infof("Timeout set to %s", target.Spec.Build.Timeout)
+ action.L.Infof("Maven Timeout set to %s", target.Spec.Build.Maven.Timeout.Duration)
+}
+
func createPersistentVolumeClaim(ctx context.Context, client client.Client, platform *v1alpha1.IntegrationPlatform) error {
volumeSize, err := resource.ParseQuantity("1Gi")
if err != nil {
diff --git a/pkg/controller/integrationplatform/initialize_test.go b/pkg/controller/integrationplatform/initialize_test.go
index 8260f3a..2a1e4b0 100644
--- a/pkg/controller/integrationplatform/initialize_test.go
+++ b/pkg/controller/integrationplatform/initialize_test.go
@@ -22,19 +22,22 @@ import (
"testing"
"time"
+ "github.com/rs/xid"
+
"github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
"github.com/apache/camel-k/pkg/util/log"
"github.com/apache/camel-k/pkg/util/test"
+
"github.com/stretchr/testify/assert"
- metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
)
func TestTimeouts_Default(t *testing.T) {
ip := v1alpha1.IntegrationPlatform{}
ip.Namespace = "ns"
- ip.Name = "camel-k"
+ ip.Name = xid.New().String()
ip.Spec.Cluster = v1alpha1.IntegrationPlatformClusterOpenShift
c, err := test.NewFakeClient(&ip)
@@ -67,7 +70,7 @@ func TestTimeouts_Default(t *testing.T) {
func TestTimeouts_MavenComputedFromBuild(t *testing.T) {
ip := v1alpha1.IntegrationPlatform{}
ip.Namespace = "ns"
- ip.Name = "camel-k"
+ ip.Name = xid.New().String()
ip.Spec.Cluster = v1alpha1.IntegrationPlatformClusterOpenShift
timeout, err := time.ParseDuration("1m1ms")
@@ -107,7 +110,7 @@ func TestTimeouts_MavenComputedFromBuild(t *testing.T) {
func TestTimeouts_Truncated(t *testing.T) {
ip := v1alpha1.IntegrationPlatform{}
ip.Namespace = "ns"
- ip.Name = "camel-k"
+ ip.Name = xid.New().String()
ip.Spec.Cluster = v1alpha1.IntegrationPlatformClusterOpenShift
bt, err := time.ParseDuration("5m1ms")
@@ -144,6 +147,6 @@ func TestTimeouts_Truncated(t *testing.T) {
err = c.Get(context.TODO(), key, &answer)
assert.Nil(t, err)
- assert.Equal(t, time.Duration(2*time.Minute), answer.Spec.Build.Maven.Timeout.Duration)
- assert.Equal(t, time.Duration(5*time.Minute), answer.Spec.Build.Timeout.Duration)
+ assert.Equal(t, 2*time.Minute, answer.Spec.Build.Maven.Timeout.Duration)
+ assert.Equal(t, 5*time.Minute, answer.Spec.Build.Timeout.Duration)
}
diff --git a/pkg/util/maven/maven.go b/pkg/util/maven/maven.go
index 757df37..8fbe80f 100644
--- a/pkg/util/maven/maven.go
+++ b/pkg/util/maven/maven.go
@@ -89,12 +89,14 @@ func Run(ctx Context) error {
mvnCmd = c
}
- args := append(ctx.AdditionalArguments, "--batch-mode")
+ args := make([]string, 0)
+ args = append(args, ctx.AdditionalArguments...)
+ args = append(args, "--batch-mode")
if ctx.LocalRepository == "" {
- args = append(ctx.AdditionalArguments, "-Dcamel.noop=true")
+ args = append(args, "-Dcamel.noop=true")
} else if _, err := os.Stat(ctx.LocalRepository); err == nil {
- args = append(ctx.AdditionalArguments, "-Dmaven.repo.local="+ctx.LocalRepository)
+ args = append(args, "-Dmaven.repo.local="+ctx.LocalRepository)
}
settingsPath := path.Join(ctx.Path, "settings.xml")
[camel-k] 02/07: chore(lint): set modules-download-mode
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 0f6da46032b08e1ee189a675b72e456dfd3a842c
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Thu Jun 27 09:14:26 2019 +0200
chore(lint): set modules-download-mode
---
.golangci.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.golangci.yml b/.golangci.yml
index a67fb8d..3be44c8 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,3 +1,5 @@
+run:
+ modules-download-mode: vendor
linters-settings:
lll:
line-length: 170
[camel-k] 03/07: chore(build): run go mod vendor
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit dd25784718b884ad76c10a339fb6da7040e6e306
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Thu Jun 27 10:03:15 2019 +0200
chore(build): run go mod vendor
---
.travis.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 6315996..b4a94bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,8 @@ language: go
go:
- "1.11.4"
-install: true
+install:
+ - go mod vendor
env:
global:
[camel-k] 05/07: chore(lint): fix findings
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 3e6bd50caf27138567fbcbe415ae7634d46d48f6
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Thu Jun 27 12:00:36 2019 +0200
chore(lint): fix findings
---
.golangci.yml | 2 --
pkg/cmd/run.go | 6 +++++-
pkg/controller/integration/initialize.go | 2 +-
pkg/util/kubernetes/log/pod_scraper.go | 13 ++++++-------
4 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/.golangci.yml b/.golangci.yml
index 3be44c8..a67fb8d 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,5 +1,3 @@
-run:
- modules-download-mode: vendor
linters-settings:
lll:
line-length: 170
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index 374aba5..dee78b0 100644
--- a/pkg/cmd/run.go
+++ b/pkg/cmd/run.go
@@ -138,8 +138,12 @@ func (o *runCmdOptions) validateArgs(_ *cobra.Command, args []string) error {
return errors.Wrap(err, "error while accessing file "+fileName)
}
} else {
- /* #nosec */
+ // nolint: gosec
resp, err := http.Get(fileName)
+ if resp != nil && resp.Body != nil {
+ resp.Body.Close()
+ }
+
if err != nil {
return errors.Wrap(err, "The URL provided is not reachable")
} else if resp.StatusCode != 200 {
diff --git a/pkg/controller/integration/initialize.go b/pkg/controller/integration/initialize.go
index 3e5f921..b8cbac7 100644
--- a/pkg/controller/integration/initialize.go
+++ b/pkg/controller/integration/initialize.go
@@ -55,7 +55,7 @@ func (action *initializeAction) Handle(ctx context.Context, integration *v1alpha
}
// The integration platform needs to be ready before starting to create integrations
- if err != nil || pl.Status.Phase != v1alpha1.IntegrationPlatformPhaseReady {
+ if pl.Status.Phase != v1alpha1.IntegrationPlatformPhaseReady {
action.L.Info("Waiting for the integration platform to be initialized")
if integration.Status.Phase != v1alpha1.IntegrationPhaseWaitingForPlatform {
diff --git a/pkg/util/kubernetes/log/pod_scraper.go b/pkg/util/kubernetes/log/pod_scraper.go
index 094e5bc..162e26c 100644
--- a/pkg/util/kubernetes/log/pod_scraper.go
+++ b/pkg/util/kubernetes/log/pod_scraper.go
@@ -89,21 +89,20 @@ func (s *PodScraper) doScrape(ctx context.Context, out *bufio.Writer, clientClos
}
reader := bufio.NewReader(byteReader)
- err = nil
- for err == nil {
- str, err := reader.ReadString('\n')
+ for {
+ data, err := reader.ReadBytes('\n')
+ if err == io.EOF {
+ return
+ }
if err != nil {
break
}
- _, err = out.WriteString(str)
+ _, err = out.Write(data)
if err != nil {
break
}
out.Flush()
}
- if err == io.EOF {
- return
- }
s.handleAndRestart(ctx, err, 5*time.Second, out, clientCloser)
}
[camel-k] 06/07: chore(build): attemp to fixnt on travis
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 8a321401120a8e97c08c4257d27733c6ee1f1c9b
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Thu Jun 27 14:37:20 2019 +0200
chore(build): attemp to fixnt on travis
---
.travis.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 48b1ba8..a6fda07 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,9 @@ services:
before_script:
- curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b . v1.17.1
+ - ./golangci-lint config path
+ - ./golangci-lint --version
script:
- - ./golangci-lint run || travis_terminate 1;
+ - ./golangci-lint run --verbose --config .golangci.yml || travis_terminate 1;
- ./script/travis_build.sh