You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2019/01/21 11:19:18 UTC

[camel-k] branch master updated: chore: regenerated resources.go

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

lburgazzoli 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 1f91e50  chore: regenerated resources.go
1f91e50 is described below

commit 1f91e50fcdd0e8b6d0bd067343693f3d57e3e688
Author: Roland Huß <ro...@ro14nd.de>
AuthorDate: Mon Jan 21 11:31:48 2019 +0100

    chore: regenerated resources.go
    
    ... and ensure that the resources are picked up in alphabetical order
---
 deploy/resources.go       | 46 +++++++++++++++++++++++-----------------------
 script/embed_resources.sh |  2 +-
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/deploy/resources.go b/deploy/resources.go
index aafa565..29ad3ec 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -2798,6 +2798,29 @@ artifacts:
     version: 2.23.1
 
 `
+	Resources["cr-example.yaml"] =
+		`
+apiVersion: camel.apache.org/v1alpha1
+kind: Integration
+metadata:
+  name: example
+spec:
+  source:
+    content: |-
+      // This is Camel K Groovy example route
+
+      rnd = new Random()
+
+      from('timer:groovy?period=1s')
+          .routeId('groovy')
+          .setBody()
+              .constant('Hello Camel K!')
+          .process {
+              it.in.headers['RandomValue'] = rnd.nextInt()
+          }
+          .to('log:info?showHeaders=true')
+    name: routes.groovy
+`
 	Resources["crd-integration-context.yaml"] =
 		`
 apiVersion: apiextensions.k8s.io/v1beta1
@@ -2888,29 +2911,6 @@ spec:
       JSONPath: .status.context
 
 `
-	Resources["cr-example.yaml"] =
-		`
-apiVersion: camel.apache.org/v1alpha1
-kind: Integration
-metadata:
-  name: example
-spec:
-  source:
-    content: |-
-      // This is Camel K Groovy example route
-
-      rnd = new Random()
-
-      from('timer:groovy?period=1s')
-          .routeId('groovy')
-          .setBody()
-              .constant('Hello Camel K!')
-          .process {
-              it.in.headers['RandomValue'] = rnd.nextInt()
-          }
-          .to('log:info?showHeaders=true')
-    name: routes.groovy
-`
 	Resources["operator-deployment-kubernetes.yaml"] =
 		`
 apiVersion: apps/v1
diff --git a/script/embed_resources.sh b/script/embed_resources.sh
index eec75c9..95ab888 100755
--- a/script/embed_resources.sh
+++ b/script/embed_resources.sh
@@ -38,7 +38,7 @@ func init() {
 
 EOM
 
-for f in $(ls $destdir | grep ".yaml" | grep -v -e "^operator.yaml$"); do
+for f in $(ls $destdir | grep ".yaml" | grep -v -e "^operator.yaml$" | sort); do
 	printf "\tResources[\"$f\"] =\n\t\t\`\n" >> $destfile
 	cat $destdir/$f >> $destfile
 	printf "\n\`\n" >> $destfile