Skip to content

Commit

Permalink
do not include runtime artefacts in operator image by default apache#468
Browse files Browse the repository at this point in the history
  • Loading branch information
lburgazzoli authored and valdar committed May 21, 2019
1 parent 27d14e6 commit d682f65
Show file tree
Hide file tree
Showing 39 changed files with 585 additions and 226 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
[submodule "runtime"]
path = runtime
url = https://github.com/apache/camel-k-runtime.git
104 changes: 104 additions & 0 deletions build/maven/pom-catalog.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">


<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-catalog-generator</artifactId>
<version>1.0.0</version>

<build>
<defaultGoal>generate-resources</defaultGoal>
<plugins>
<plugin>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-maven-plugin</artifactId>
<version>${runtime.version}</version>
<executions>
<execution>
<id>generate-catalog</id>
<goals>
<goal>generate-catalog</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-catalog</artifactId>
<version>${catalog.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>

<repositories>
<repository>
<id>apache.snapshots</id>
<name>Apache Development Snapshot Repository</name>
<url>https://repository.apache.org/content/repositories/snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>oss.snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>

<pluginRepositories>
<pluginRepository>
<id>apache.snapshots</id>
<name>Apache Development Snapshot Repository</name>
<url>https://repository.apache.org/content/repositories/snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>oss.snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>

</project>
146 changes: 146 additions & 0 deletions build/maven/pom-runtime.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">


<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-catalog-generator</artifactId>
<version>1.0.0</version>

<dependencies>
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-maven-plugin</artifactId>
<version>${runtime.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-knative</artifactId>
<version>${runtime.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-knative-http</artifactId>
<version>${runtime.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-runtime-core</artifactId>
<version>${runtime.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-runtime-jvm</artifactId>
<version>${runtime.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-runtime-groovy</artifactId>
<version>${runtime.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-runtime-kotlin</artifactId>
<version>${runtime.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-runtime-yaml</artifactId>
<version>${runtime.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-runtime-spring-boot</artifactId>
<version>${runtime.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-runtime-spring-boot-layout</artifactId>
<version>${runtime.version}</version>
</dependency>
</dependencies>

<repositories>
<repository>
<id>apache.snapshots</id>
<name>Apache Development Snapshot Repository</name>
<url>https://repository.apache.org/content/repositories/snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>oss.snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>

<pluginRepositories>
<pluginRepository>
<id>apache.snapshots</id>
<name>Apache Development Snapshot Repository</name>
<url>https://repository.apache.org/content/repositories/snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>oss.snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.1</version>
<configuration>
<useRepositoryLayout>true</useRepositoryLayout>
<addParentPoms>true</addParentPoms>
<copyPom>true</copyPom>
</configuration>
</plugin>
</plugins>
</build>

</project>
6 changes: 0 additions & 6 deletions build/maven/settings.xml

This file was deleted.

10 changes: 9 additions & 1 deletion cmd/util/json-schema-gen/jsonschemagen.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import (
"github.com/spf13/cobra"
)

// Publishes predefined images for all Camel components
func main() {
sources := []interface{}{
v1alpha1.Integration{},
Expand All @@ -54,6 +53,15 @@ func main() {
fmt.Println("error:", err)
}

if _, err := os.Stat(out); err != nil {
if os.IsNotExist(err) {
if err := os.MkdirAll(out, os.ModePerm); err != nil {
fmt.Println("error:", err)
return
}
}
}

v := reflect.ValueOf(source)
t := reflect.Indirect(v).Type().Name()
o := path.Join(out, t+".json")
Expand Down
8 changes: 4 additions & 4 deletions deploy/camel-catalog-2.23.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1110,21 +1110,21 @@ spec:
camel-k-runtime-groovy:
groupId: org.apache.camel.k
artifactId: camel-k-runtime-groovy
version: 0.3.0-SNAPSHOT
version: 1.0.0
dependencies:
- groupId: org.apache.camel
artifactId: camel-groovy
camel-k-runtime-jvm:
groupId: org.apache.camel.k
artifactId: camel-k-runtime-jvm
version: 0.3.0-SNAPSHOT
version: 1.0.0
dependencies:
- groupId: org.apache.camel
artifactId: camel-core
camel-k-runtime-kotlin:
groupId: org.apache.camel.k
artifactId: camel-k-runtime-kotlin
version: 0.3.0-SNAPSHOT
version: 1.0.0
camel-kafka:
groupId: org.apache.camel
artifactId: camel-kafka
Expand All @@ -1142,7 +1142,7 @@ spec:
camel-knative:
groupId: org.apache.camel.k
artifactId: camel-knative
version: 0.3.0-SNAPSHOT
version: 1.0.0
schemes:
- id: knative
http: true
Expand Down
8 changes: 4 additions & 4 deletions deploy/camel-catalog-2.23.1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1110,21 +1110,21 @@ spec:
camel-k-runtime-groovy:
groupId: org.apache.camel.k
artifactId: camel-k-runtime-groovy
version: 0.3.0-SNAPSHOT
version: 1.0.0
dependencies:
- groupId: org.apache.camel
artifactId: camel-groovy
camel-k-runtime-jvm:
groupId: org.apache.camel.k
artifactId: camel-k-runtime-jvm
version: 0.3.0-SNAPSHOT
version: 1.0.0
dependencies:
- groupId: org.apache.camel
artifactId: camel-core
camel-k-runtime-kotlin:
groupId: org.apache.camel.k
artifactId: camel-k-runtime-kotlin
version: 0.3.0-SNAPSHOT
version: 1.0.0
camel-kafka:
groupId: org.apache.camel
artifactId: camel-kafka
Expand All @@ -1142,7 +1142,7 @@ spec:
camel-knative:
groupId: org.apache.camel.k
artifactId: camel-knative
version: 0.3.0-SNAPSHOT
version: 1.0.0
schemes:
- id: knative
http: true
Expand Down
Loading

0 comments on commit d682f65

Please sign in to comment.