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/07 13:20:14 UTC
[camel-k] tag 0.3.4 created (now c47fb2c)
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a change to tag 0.3.4
in repository https://gitbox.apache.org/repos/asf/camel-k.git.
at c47fb2c (commit)
This tag includes the following new commits:
new a4d9bab Fix #683: add staging workflow
new c47fb2c Release 0.3.4
The 2 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.
[camel-k] 02/02: Release 0.3.4
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to tag 0.3.4
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit c47fb2c85e89852f0fd111d1662f57917030ced5
Author: nferraro <ni...@gmail.com>
AuthorDate: Fri Jun 7 15:20:02 2019 +0200
Release 0.3.4
---
deploy/camel-catalog-2.23.0.yaml | 17 --
deploy/camel-catalog-2.23.1.yaml | 17 --
deploy/camel-catalog-2.23.2.yaml | 17 --
deploy/camel-catalog-2.24.0.yaml | 17 --
deploy/camel-catalog-3.0.0-M2.yaml | 17 --
deploy/olm-catalog/camel-k.package.yaml | 2 +-
.../camel-k.v0.3.3.clusterserviceversion.yaml | 4 +-
.../camel-k.v0.3.4.clusterserviceversion.yaml} | 8 +-
.../{0.3.4-SNAPSHOT => 0.3.4}/crd-build.yaml | 0
.../crd-camel-catalog.yaml | 0
.../crd-integration-context.yaml | 0
.../crd-integration-platform.yaml | 0
.../{0.3.4-SNAPSHOT => 0.3.4}/crd-integration.yaml | 0
deploy/operator-deployment.yaml | 2 +-
deploy/resources.go | 325 ++++++++++++++++++++-
go.mod | 2 +-
pkg/util/defaults/defaults.go | 18 +-
script/Makefile | 25 +-
18 files changed, 336 insertions(+), 135 deletions(-)
diff --git a/deploy/camel-catalog-2.23.0.yaml b/deploy/camel-catalog-2.23.0.yaml
index a6b5cd6..d9947cb 100644
--- a/deploy/camel-catalog-2.23.0.yaml
+++ b/deploy/camel-catalog-2.23.0.yaml
@@ -1,20 +1,3 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-
apiVersion: camel.apache.org/v1alpha1
kind: CamelCatalog
metadata:
diff --git a/deploy/camel-catalog-2.23.1.yaml b/deploy/camel-catalog-2.23.1.yaml
index d3da662..ea1c0d8 100644
--- a/deploy/camel-catalog-2.23.1.yaml
+++ b/deploy/camel-catalog-2.23.1.yaml
@@ -1,20 +1,3 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-
apiVersion: camel.apache.org/v1alpha1
kind: CamelCatalog
metadata:
diff --git a/deploy/camel-catalog-2.23.2.yaml b/deploy/camel-catalog-2.23.2.yaml
index 1b14950..d56c5e6 100644
--- a/deploy/camel-catalog-2.23.2.yaml
+++ b/deploy/camel-catalog-2.23.2.yaml
@@ -1,20 +1,3 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-
apiVersion: camel.apache.org/v1alpha1
kind: CamelCatalog
metadata:
diff --git a/deploy/camel-catalog-2.24.0.yaml b/deploy/camel-catalog-2.24.0.yaml
index 064e399..23b2739 100644
--- a/deploy/camel-catalog-2.24.0.yaml
+++ b/deploy/camel-catalog-2.24.0.yaml
@@ -1,20 +1,3 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-
apiVersion: camel.apache.org/v1alpha1
kind: CamelCatalog
metadata:
diff --git a/deploy/camel-catalog-3.0.0-M2.yaml b/deploy/camel-catalog-3.0.0-M2.yaml
index 6d7eec4..a9c501a 100644
--- a/deploy/camel-catalog-3.0.0-M2.yaml
+++ b/deploy/camel-catalog-3.0.0-M2.yaml
@@ -1,20 +1,3 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-
apiVersion: camel.apache.org/v1alpha1
kind: CamelCatalog
metadata:
diff --git a/deploy/olm-catalog/camel-k.package.yaml b/deploy/olm-catalog/camel-k.package.yaml
index e061dab..7acdee7 100644
--- a/deploy/olm-catalog/camel-k.package.yaml
+++ b/deploy/olm-catalog/camel-k.package.yaml
@@ -18,4 +18,4 @@
packageName: camel-k
channels:
- name: alpha
- currentCSV: camel-k-operator.v0.3.4-SNAPSHOT
+ currentCSV: camel-k-operator.v0.3.4
diff --git a/deploy/olm-catalog/camel-k/0.3.3/camel-k.v0.3.3.clusterserviceversion.yaml b/deploy/olm-catalog/camel-k/0.3.3/camel-k.v0.3.3.clusterserviceversion.yaml
index 24d44de..739a162 100644
--- a/deploy/olm-catalog/camel-k/0.3.3/camel-k.v0.3.3.clusterserviceversion.yaml
+++ b/deploy/olm-catalog/camel-k/0.3.3/camel-k.v0.3.3.clusterserviceversion.yaml
@@ -22,7 +22,7 @@ metadata:
capabilities: Basic Install
categories: "Integration & Delivery"
repository: https://github.com/apache/camel-k
- containerImage: docker.io/apache/camel-k:0.3.3
+ containerImage: docker.io/apache/camel-k:0.3.4
support: Camel
createdAt: 2019-05-06T16:45:00Z
certified: "false"
@@ -203,7 +203,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.name
- image: docker.io/apache/camel-k:0.3.3
+ image: docker.io/apache/camel-k:0.3.4
imagePullPolicy: IfNotPresent
name: camel-k-operator
serviceAccountName: camel-k-operator
diff --git a/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/camel-k.v0.3.4-SNAPSHOT.clusterserviceversion.yaml b/deploy/olm-catalog/camel-k/0.3.4/camel-k.v0.3.4.clusterserviceversion.yaml
similarity index 98%
rename from deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/camel-k.v0.3.4-SNAPSHOT.clusterserviceversion.yaml
rename to deploy/olm-catalog/camel-k/0.3.4/camel-k.v0.3.4.clusterserviceversion.yaml
index a5af236..4f7e89f 100644
--- a/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/camel-k.v0.3.4-SNAPSHOT.clusterserviceversion.yaml
+++ b/deploy/olm-catalog/camel-k/0.3.4/camel-k.v0.3.4.clusterserviceversion.yaml
@@ -47,13 +47,13 @@ metadata:
capabilities: Basic Install
categories: Integration & Delivery
certified: "false"
- containerImage: docker.io/apache/camel-k:0.3.4-SNAPSHOT
+ containerImage: docker.io/apache/camel-k:0.3.4
createdAt: "2019-05-06T16:45:00Z"
description: Apache Camel K is a lightweight integration platform, born on Kubernetes,
with serverless superpowers.
repository: https://github.com/apache/camel-k
support: Camel
- name: camel-k-operator.v0.3.4-SNAPSHOT
+ name: camel-k-operator.v0.3.4
namespace: placeholder
spec:
apiservicedefinitions: {}
@@ -164,7 +164,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: docker.io/apache/camel-k:0.3.4-SNAPSHOT
+ image: docker.io/apache/camel-k:0.3.4
imagePullPolicy: IfNotPresent
name: camel-k-operator
resources: {}
@@ -377,4 +377,4 @@ spec:
selector:
matchLabels:
name: camel-k-operator
- version: 0.3.4-SNAPSHOT
+ version: 0.3.4
diff --git a/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-build.yaml b/deploy/olm-catalog/camel-k/0.3.4/crd-build.yaml
similarity index 100%
rename from deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-build.yaml
rename to deploy/olm-catalog/camel-k/0.3.4/crd-build.yaml
diff --git a/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-camel-catalog.yaml b/deploy/olm-catalog/camel-k/0.3.4/crd-camel-catalog.yaml
similarity index 100%
rename from deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-camel-catalog.yaml
rename to deploy/olm-catalog/camel-k/0.3.4/crd-camel-catalog.yaml
diff --git a/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-integration-context.yaml b/deploy/olm-catalog/camel-k/0.3.4/crd-integration-context.yaml
similarity index 100%
rename from deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-integration-context.yaml
rename to deploy/olm-catalog/camel-k/0.3.4/crd-integration-context.yaml
diff --git a/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-integration-platform.yaml b/deploy/olm-catalog/camel-k/0.3.4/crd-integration-platform.yaml
similarity index 100%
rename from deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-integration-platform.yaml
rename to deploy/olm-catalog/camel-k/0.3.4/crd-integration-platform.yaml
diff --git a/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-integration.yaml b/deploy/olm-catalog/camel-k/0.3.4/crd-integration.yaml
similarity index 100%
rename from deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-integration.yaml
rename to deploy/olm-catalog/camel-k/0.3.4/crd-integration.yaml
diff --git a/deploy/operator-deployment.yaml b/deploy/operator-deployment.yaml
index 4857802..17595eb 100644
--- a/deploy/operator-deployment.yaml
+++ b/deploy/operator-deployment.yaml
@@ -38,7 +38,7 @@ spec:
serviceAccountName: camel-k-operator
containers:
- name: camel-k-operator
- image: docker.io/apache/camel-k:0.3.4-SNAPSHOT
+ image: docker.io/apache/camel-k:0.3.4
command:
- camel-k
imagePullPolicy: IfNotPresent
diff --git a/deploy/resources.go b/deploy/resources.go
index c328be0..6183b75 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -10633,6 +10633,23 @@ spec:
`
Resources["crd-build.yaml"] =
`
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
@@ -10674,6 +10691,23 @@ spec:
`
Resources["crd-camel-catalog.yaml"] =
`
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
@@ -10703,6 +10737,23 @@ spec:
`
Resources["crd-integration-context.yaml"] =
`
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
@@ -10739,6 +10790,23 @@ spec:
`
Resources["crd-integration-platform.yaml"] =
`
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
@@ -10767,6 +10835,23 @@ spec:
`
Resources["crd-integration.yaml"] =
`
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
@@ -10799,6 +10884,23 @@ spec:
`
Resources["cr-example.yaml"] =
`
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
apiVersion: camel.apache.org/v1alpha1
kind: Integration
metadata:
@@ -10822,6 +10924,23 @@ spec:
`
Resources["operator-deployment.yaml"] =
`
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
apiVersion: apps/v1
kind: Deployment
metadata:
@@ -10845,7 +10964,7 @@ spec:
serviceAccountName: camel-k-operator
containers:
- name: camel-k-operator
- image: docker.io/apache/camel-k:0.3.4-SNAPSHOT
+ image: docker.io/apache/camel-k:0.3.4
command:
- camel-k
imagePullPolicy: IfNotPresent
@@ -10869,6 +10988,23 @@ spec:
`
Resources["operator-role-binding-knative.yaml"] =
`
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:
@@ -10886,6 +11022,23 @@ roleRef:
`
Resources["operator-role-binding.yaml"] =
`
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:
@@ -10903,6 +11056,23 @@ roleRef:
`
Resources["operator-role-knative.yaml"] =
`
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
kind: Role
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:
@@ -10940,6 +11110,23 @@ rules:
`
Resources["operator-role-kubernetes.yaml"] =
`
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
kind: Role
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:
@@ -11221,6 +11408,23 @@ rules:
`
Resources["operator-role-openshift.yaml"] =
`
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
kind: Role
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:
@@ -11369,6 +11573,23 @@ rules:
`
Resources["operator-service-account.yaml"] =
`
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
apiVersion: v1
kind: ServiceAccount
metadata:
@@ -11379,6 +11600,23 @@ metadata:
`
Resources["platform-cr.yaml"] =
`
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
apiVersion: camel.apache.org/v1alpha1
kind: IntegrationPlatform
metadata:
@@ -11389,6 +11627,23 @@ metadata:
`
Resources["platform-integration-context-groovy.yaml"] =
`
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
apiVersion: camel.apache.org/v1alpha1
kind: IntegrationContext
metadata:
@@ -11406,6 +11661,23 @@ spec:
`
Resources["platform-integration-context-jvm.yaml"] =
`
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
apiVersion: camel.apache.org/v1alpha1
kind: IntegrationContext
metadata:
@@ -11422,6 +11694,23 @@ spec:
`
Resources["platform-integration-context-knative.yaml"] =
`
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
apiVersion: camel.apache.org/v1alpha1
kind: IntegrationContext
metadata:
@@ -11440,6 +11729,23 @@ spec:
`
Resources["platform-integration-context-kotlin.yaml"] =
`
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
apiVersion: camel.apache.org/v1alpha1
kind: IntegrationContext
metadata:
@@ -11457,6 +11763,23 @@ spec:
`
Resources["user-cluster-role.yaml"] =
`
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
diff --git a/go.mod b/go.mod
index 297ed29..1a54e19 100644
--- a/go.mod
+++ b/go.mod
@@ -30,7 +30,7 @@ require (
github.com/knative/eventing v0.4.0
github.com/knative/pkg v0.0.0-20190214162945-0183bf9cdc73
github.com/knative/serving v0.4.0
- github.com/magiconair/properties v1.8.0
+ github.com/magiconair/properties v1.8.0 // indirect
github.com/mailru/easyjson v0.0.0-20190221075403-6243d8e04c3f // indirect
github.com/markbates/inflect v1.0.4 // indirect
github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a // indirect
diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index 69d6a1a..91ebad4 100644
--- a/pkg/util/defaults/defaults.go
+++ b/pkg/util/defaults/defaults.go
@@ -1,19 +1,3 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
package defaults
// ***********************
@@ -22,7 +6,7 @@ package defaults
const (
// Version --
- Version = "0.3.4-SNAPSHOT"
+ Version = "0.3.4"
// CamelVersionConstraint --
CamelVersionConstraint = "~2.24.x"
diff --git a/script/Makefile b/script/Makefile
index 09142df..94d2f4f 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -14,7 +14,7 @@
# limitations under the License.
VERSIONFILE := pkg/util/defaults/defaults.go
-VERSION := 0.3.4-SNAPSHOT
+VERSION := 0.3.4
RUNTIME_VERSION := 0.3.3
CAMEL_VERSION := 2.24.0
CAMEL_VERSION_CONSTRAINT := ~2.24.x
@@ -33,34 +33,13 @@ STAGING_IMAGE_NAME := docker.io/camelk/camel-k
GOLDFLAGS += -X main.GitCommit=$(GIT_COMMIT)
GOFLAGS = -ldflags "$(GOLDFLAGS)"
-define LICENSE_HEADER
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-endef
-
-export LICENSE_HEADER
default: test
#
# Generates the version file
#
codegen:
- @echo "/*" > $(VERSIONFILE)
- @echo "$$LICENSE_HEADER" >> $(VERSIONFILE)
- @echo "*/" >> $(VERSIONFILE)
- @echo "package defaults" >> $(VERSIONFILE)
+ @echo "package defaults" > $(VERSIONFILE)
@echo "" >> $(VERSIONFILE)
@echo "// ***********************" >> $(VERSIONFILE)
@echo "// DO NOT EDIT THIS FILE" >> $(VERSIONFILE)
[camel-k] 01/02: Fix #683: add staging workflow
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to tag 0.3.4
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit a4d9babcd60aac8e624a904168abfc08337e1fd4
Author: nferraro <ni...@gmail.com>
AuthorDate: Fri Jun 7 15:15:28 2019 +0200
Fix #683: add staging workflow
---
script/Makefile | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/script/Makefile b/script/Makefile
index 5c6b51c..09142df 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -27,6 +27,9 @@ GIT_COMMIT := $(shell git rev-list -1 HEAD)
# For signing binary artifacts
GPG_PASS := $(GPG_PASS)
+# Used to push pre-relase artifacts
+STAGING_IMAGE_NAME := docker.io/camelk/camel-k
+
GOLDFLAGS += -X main.GitCommit=$(GIT_COMMIT)
GOFLAGS = -ldflags "$(GOLDFLAGS)"
@@ -167,6 +170,10 @@ images-dev: test package-artifacts
images-push:
docker push $(IMAGE_NAME):$(VERSION)
+images-push-staging:
+ docker tag $(IMAGE_NAME):$(VERSION) $(STAGING_IMAGE_NAME):$(VERSION)
+ docker push $(STAGING_IMAGE_NAME):$(VERSION)
+
set-version:
./script/set_version.sh $(VERSION) $(IMAGE_NAME)
@@ -187,9 +194,11 @@ unsnapshot-olm:
release: clean codegen set-version build-resources unsnapshot-olm build images images-push cross-compile package-examples git-tag
+release-staging: clean codegen set-version build-resources unsnapshot-olm build images images-push-staging cross-compile package-examples git-tag
+
install-minishift:
./script/install_minishift.sh
install-minikube:
./script/install_minikube.sh
-.PHONY: build build-operator build-kamel build-resources build-builder build-olm unsnapshot-olm dep codegen images images-dec images-push test check test-integration clean release cross-compile package-examples set-version git-tag
+.PHONY: build build-operator build-kamel build-resources build-builder build-olm unsnapshot-olm dep codegen images images-dec images-push images-push-staging test check test-integration clean release cross-compile package-examples set-version git-tag