This is an automated email from the ASF dual-hosted git repository. astefanutti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 7b1be60368f69b0cdfac07903bdb51c99aa36aab Author: phantomjinx <[email protected]> AuthorDate: Tue Jul 13 16:39:29 2021 +0100 Renames the deploy directory to resources --- .gitignore | 2 +- .golangci.yml | 2 +- cmd/util/doc-gen/main.go | 2 +- pkg/resources/resources_support.go | 2 +- release.adoc | 6 +++--- {deploy => resources}/addons/master/master-role-binding.tmpl | 0 {deploy => resources}/addons/master/master-role-configmap.tmpl | 0 {deploy => resources}/addons/master/master-role-lease.tmpl | 0 {deploy => resources}/camel-catalog-1.9.0.yaml | 0 {deploy => resources}/templates/groovy.tmpl | 0 {deploy => resources}/templates/java.tmpl | 0 {deploy => resources}/templates/js.tmpl | 0 {deploy => resources}/templates/kamelet.tmpl | 0 {deploy => resources}/templates/kts.tmpl | 0 {deploy => resources}/templates/xml.tmpl | 0 {deploy => resources}/templates/yaml.tmpl | 0 {deploy => resources}/traits.yaml | 0 script/build_catalog.sh | 2 +- script/check_licenses.sh | 2 +- 19 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index ce89209..b6b2195 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,7 @@ /release-notes.md # Unuseful file -/deploy/operator.yaml +/resources/operator.yaml # Bundle directory /bundle diff --git a/.golangci.yml b/.golangci.yml index 2d901b8..2dd521a 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -58,7 +58,7 @@ issues: - unparam - varcheck - unused - - path: deploy/resources.go + - path: pkg/resources/resources.go linters: - stylecheck - golint diff --git a/cmd/util/doc-gen/main.go b/cmd/util/doc-gen/main.go index 2b56b9a..9cde53f 100644 --- a/cmd/util/doc-gen/main.go +++ b/cmd/util/doc-gen/main.go @@ -31,7 +31,7 @@ func main() { // Custom args. customArgs := &generators.CustomArgs{} pflag.CommandLine.StringVar(&customArgs.DocDir, "doc-dir", "./docs", "Root of the document directory.") - pflag.CommandLine.StringVar(&customArgs.DeployDir, "deploy-dir", "./deploy", "Root of the deploy directory.") + pflag.CommandLine.StringVar(&customArgs.DeployDir, "deploy-dir", "./resources", "Root of the deploy directory.") pflag.CommandLine.StringVar(&customArgs.TraitPath, "traits-path", "modules/traits/pages", "Path to the traits directory.") pflag.CommandLine.StringVar(&customArgs.NavPath, "nav-path", "modules/ROOT/nav.adoc", "Path to the navigation file.") pflag.CommandLine.StringVar(&customArgs.ListPath, "list-path", "modules/traits/pages/traits.adoc", "Path to the trait list file.") diff --git a/pkg/resources/resources_support.go b/pkg/resources/resources_support.go index 7caa892..e724c55 100644 --- a/pkg/resources/resources_support.go +++ b/pkg/resources/resources_support.go @@ -28,7 +28,7 @@ import ( ) // -//go:generate go run ../../cmd/util/vfs-gen deploy config +//go:generate go run ../../cmd/util/vfs-gen resources config // // ResourceAsString returns the named resource content as string func ResourceAsString(name string) string { diff --git a/release.adoc b/release.adoc index 8ac74bb..1b7e1fa 100644 --- a/release.adoc +++ b/release.adoc @@ -89,9 +89,9 @@ Rebuild auto-generated data, including trait info: make generate ``` -Remove all snapshot files in the `/deploy` directory, then run again: +Remove all snapshot files in the `/resources` directory, then run again: ``` -# After removing snapshots from /deploy +# After removing snapshots from /resources make clean build-resources ``` @@ -236,7 +236,7 @@ Wait for them to be available on https://hub.helm.sh/. The https://brew.sh/[HomeBrew] formula for _kamel_ must be synced to download and build the latest version of https://github.com/apache/camel-k[Camel-K], so it can be easily installed on _macOs_ and _Linux_ platforms. -To do so, the content of https://github.com/Homebrew/homebrew-core/blob/master/Formula/kamel.rb[homebrew-core/Formula/kamel.rb] _(the package definition)_ should be updated to point the latest release of https://github.com/apache/camel-k[Camel-K]. +To do so, the content of https://github.com/Homebrew/homebrew-core/blob/master/Formula/kamel.rb[homebrew-core/Formula/kamel.rb] _(the package definition)_ should be updated to point the latest release of https://github.com/apache/camel-k[Camel-K]. More importantly the _tag_ and _revision_ section configuration should change for a new release e.g ``` diff --git a/deploy/addons/master/master-role-binding.tmpl b/resources/addons/master/master-role-binding.tmpl similarity index 100% rename from deploy/addons/master/master-role-binding.tmpl rename to resources/addons/master/master-role-binding.tmpl diff --git a/deploy/addons/master/master-role-configmap.tmpl b/resources/addons/master/master-role-configmap.tmpl similarity index 100% rename from deploy/addons/master/master-role-configmap.tmpl rename to resources/addons/master/master-role-configmap.tmpl diff --git a/deploy/addons/master/master-role-lease.tmpl b/resources/addons/master/master-role-lease.tmpl similarity index 100% rename from deploy/addons/master/master-role-lease.tmpl rename to resources/addons/master/master-role-lease.tmpl diff --git a/deploy/camel-catalog-1.9.0.yaml b/resources/camel-catalog-1.9.0.yaml similarity index 100% rename from deploy/camel-catalog-1.9.0.yaml rename to resources/camel-catalog-1.9.0.yaml diff --git a/deploy/templates/groovy.tmpl b/resources/templates/groovy.tmpl similarity index 100% rename from deploy/templates/groovy.tmpl rename to resources/templates/groovy.tmpl diff --git a/deploy/templates/java.tmpl b/resources/templates/java.tmpl similarity index 100% rename from deploy/templates/java.tmpl rename to resources/templates/java.tmpl diff --git a/deploy/templates/js.tmpl b/resources/templates/js.tmpl similarity index 100% rename from deploy/templates/js.tmpl rename to resources/templates/js.tmpl diff --git a/deploy/templates/kamelet.tmpl b/resources/templates/kamelet.tmpl similarity index 100% rename from deploy/templates/kamelet.tmpl rename to resources/templates/kamelet.tmpl diff --git a/deploy/templates/kts.tmpl b/resources/templates/kts.tmpl similarity index 100% rename from deploy/templates/kts.tmpl rename to resources/templates/kts.tmpl diff --git a/deploy/templates/xml.tmpl b/resources/templates/xml.tmpl similarity index 100% rename from deploy/templates/xml.tmpl rename to resources/templates/xml.tmpl diff --git a/deploy/templates/yaml.tmpl b/resources/templates/yaml.tmpl similarity index 100% rename from deploy/templates/yaml.tmpl rename to resources/templates/yaml.tmpl diff --git a/deploy/traits.yaml b/resources/traits.yaml similarity index 100% rename from deploy/traits.yaml rename to resources/traits.yaml diff --git a/script/build_catalog.sh b/script/build_catalog.sh index dc5f8ca..6240655 100755 --- a/script/build_catalog.sh +++ b/script/build_catalog.sh @@ -23,7 +23,7 @@ if [ "$#" -ge 1 ]; then shift 1 $rootdir/mvnw -q \ -f ${rootdir}/build/maven/pom-catalog.xml \ - -Dcatalog.path=${rootdir}/deploy \ + -Dcatalog.path=${rootdir}/resources \ -Druntime.version=$runtimeVersion \ -B \ -U \ diff --git a/script/check_licenses.sh b/script/check_licenses.sh index eb3dbc6..ce7d5f3 100755 --- a/script/check_licenses.sh +++ b/script/check_licenses.sh @@ -18,7 +18,7 @@ location=$(dirname $0) rootdir=$location/../ -blacklist=("zz_generated" "zz_desc_generated" "./.mvn/wrapper" "./docs/" "./.idea" "./build/" "./deploy/traits.yaml") +blacklist=("zz_generated" "zz_desc_generated" "./.mvn/wrapper" "./docs/" "./.idea" "./build/" "./resources/traits.yaml") cd $rootdir go build ./cmd/util/license-check/
