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
The following commit(s) were added to refs/heads/master by this push:
new 4db6dd8 Unified operator deployment
4db6dd8 is described below
commit 4db6dd8e252a50b43e90e80e3fa1ec5900709fd3
Author: Antonin Stefanutti <anto...@stefanutti.fr>
AuthorDate: Tue May 14 16:31:31 2019 +0200
Unified operator deployment
---
deploy/olm-catalog/csv-config.yaml | 2 +-
deploy/operator-deployment-kubernetes.yaml | 38 ---------
...ent-openshift.yaml => operator-deployment.yaml} | 0
deploy/resources.go | 90 ++++++----------------
pkg/install/operator.go | 4 +-
5 files changed, 27 insertions(+), 107 deletions(-)
diff --git a/deploy/olm-catalog/csv-config.yaml
b/deploy/olm-catalog/csv-config.yaml
index 3974c87..5f8e9d8 100644
--- a/deploy/olm-catalog/csv-config.yaml
+++ b/deploy/olm-catalog/csv-config.yaml
@@ -1,4 +1,4 @@
-operator-path: deploy/operator-deployment-kubernetes.yaml
+operator-path: deploy/operator-deployment.yaml
crd-cr-paths:
- deploy/crd-build.yaml
- deploy/crd-camel-catalog.yaml
diff --git a/deploy/operator-deployment-kubernetes.yaml
b/deploy/operator-deployment-kubernetes.yaml
deleted file mode 100644
index 21f7ed6..0000000
--- a/deploy/operator-deployment-kubernetes.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: camel-k-operator
- labels:
- app: "camel-k"
- camel.apache.org/component: operator
-spec:
- replicas: 1
- strategy:
- type: Recreate
- selector:
- matchLabels:
- name: camel-k-operator
- template:
- metadata:
- labels:
- name: camel-k-operator
- camel.apache.org/component: operator
- spec:
- serviceAccountName: camel-k-operator
- containers:
- - name: camel-k-operator
- image: docker.io/apache/camel-k:0.3.4-SNAPSHOT
- command:
- - camel-k
- imagePullPolicy: IfNotPresent
- env:
- - name: WATCH_NAMESPACE
- valueFrom:
- fieldRef:
- fieldPath: metadata.namespace
- - name: OPERATOR_NAME
- value: "camel-k"
- - name: POD_NAME
- valueFrom:
- fieldRef:
- fieldPath: metadata.name
diff --git a/deploy/operator-deployment-openshift.yaml
b/deploy/operator-deployment.yaml
similarity index 100%
rename from deploy/operator-deployment-openshift.yaml
rename to deploy/operator-deployment.yaml
diff --git a/deploy/resources.go b/deploy/resources.go
index e918150..882550a 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -8352,6 +8352,29 @@ spec:
passive: false
`
+ 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-build.yaml"] =
`
apiVersion: apiextensions.k8s.io/v1beta1
@@ -8518,72 +8541,7 @@ 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
-kind: Deployment
-metadata:
- name: camel-k-operator
- labels:
- app: "camel-k"
- camel.apache.org/component: operator
-spec:
- replicas: 1
- strategy:
- type: Recreate
- selector:
- matchLabels:
- name: camel-k-operator
- template:
- metadata:
- labels:
- name: camel-k-operator
- camel.apache.org/component: operator
- spec:
- serviceAccountName: camel-k-operator
- containers:
- - name: camel-k-operator
- image: docker.io/apache/camel-k:0.3.4-SNAPSHOT
- command:
- - camel-k
- imagePullPolicy: IfNotPresent
- env:
- - name: WATCH_NAMESPACE
- valueFrom:
- fieldRef:
- fieldPath: metadata.namespace
- - name: OPERATOR_NAME
- value: "camel-k"
- - name: POD_NAME
- valueFrom:
- fieldRef:
- fieldPath: metadata.name
-
-`
- Resources["operator-deployment-openshift.yaml"] =
+ Resources["operator-deployment.yaml"] =
`
apiVersion: apps/v1
kind: Deployment
diff --git a/pkg/install/operator.go b/pkg/install/operator.go
index 7fea75e..aa2be13 100644
--- a/pkg/install/operator.go
+++ b/pkg/install/operator.go
@@ -66,7 +66,7 @@ func installOpenshift(ctx context.Context, c client.Client,
namespace string, co
"operator-service-account.yaml",
"operator-role-openshift.yaml",
"operator-role-binding.yaml",
- "operator-deployment-openshift.yaml",
+ "operator-deployment.yaml",
)
}
@@ -75,7 +75,7 @@ func installKubernetes(ctx context.Context, c client.Client,
namespace string, c
"operator-service-account.yaml",
"operator-role-kubernetes.yaml",
"operator-role-binding.yaml",
- "operator-deployment-kubernetes.yaml",
+ "operator-deployment.yaml",
)
}
