From 01c88bc7d1a75fa81a0f9a57e8f9ec0f51edc168 Mon Sep 17 00:00:00 2001 From: haanhvu Date: Fri, 13 May 2022 13:35:19 +0700 Subject: [PATCH] Revert "Push generated things" This reverts commit 7e5fb16b57c8dc5d5e4d6ba8461e7c56c3555ab9. --- .../duck/v1alpha1/zz_generated.deepcopy.go | 1 - .../duck/v1beta2/zz_generated.deepcopy.go | 1 - .../ROOT/partials/apis/camel-k-crds.adoc | 82 ------------------- docs/modules/traits/pages/mount.adoc | 4 - pkg/apis/camel/v1/zz_generated.deepcopy.go | 1 - .../camel/v1alpha1/zz_generated.deepcopy.go | 1 - resources/traits.yaml | 4 - 7 files changed, 94 deletions(-) diff --git a/addons/keda/duck/v1alpha1/zz_generated.deepcopy.go b/addons/keda/duck/v1alpha1/zz_generated.deepcopy.go index 7bbeb3f446..9762e390a8 100644 --- a/addons/keda/duck/v1alpha1/zz_generated.deepcopy.go +++ b/addons/keda/duck/v1alpha1/zz_generated.deepcopy.go @@ -1,4 +1,3 @@ -//go:build !ignore_autogenerated // +build !ignore_autogenerated // Code generated by controller-gen. DO NOT EDIT. diff --git a/addons/strimzi/duck/v1beta2/zz_generated.deepcopy.go b/addons/strimzi/duck/v1beta2/zz_generated.deepcopy.go index 3a04649356..6a7dd3b77b 100644 --- a/addons/strimzi/duck/v1beta2/zz_generated.deepcopy.go +++ b/addons/strimzi/duck/v1beta2/zz_generated.deepcopy.go @@ -1,4 +1,3 @@ -//go:build !ignore_autogenerated // +build !ignore_autogenerated // Code generated by controller-gen. DO NOT EDIT. diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc index 3b66ff8440..f2bd9a4dcb 100644 --- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc +++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc @@ -2301,13 +2301,6 @@ base Maven specification additional repositories -|`servers` + -*xref:#_camel_apache_org_v1_Server[[\]Server]* -| - - -Servers (auth) - |=== @@ -2353,7 +2346,6 @@ the Maven settings. | -Deprecated: use CASecrets The Secret name and key, containing the CA certificate(s) used to connect to remote Maven repositories. It can contain X.509 certificates, and PKCS#7 formatted certificate chains. @@ -2361,18 +2353,6 @@ A JKS formatted keystore is automatically created to store the CA certificate(s) and configured to be used as a trusted certificate(s) by the Maven commands. Note that the root CA certificates are also imported into the created keystore. -|`caSecrets` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#secretkeyselector-v1-core[[\]Kubernetes core/v1.SecretKeySelector]* -| - - -The Secrets name and key, containing the CA certificate(s) used to connect -to remote Maven repositories. -It can contain X.509 certificates, and PKCS#7 formatted certificate chains. -A JKS formatted keystore is automatically created to store the CA certificate(s), -and configured to be used as a trusted certificate(s) by the Maven commands. -Note that the root CA certificates are also imported into the created keystore. - |`extension` + *xref:#_camel_apache_org_v1_MavenArtifact[[\]MavenArtifact]* | @@ -2504,16 +2484,6 @@ the specification |=== -[#_camel_apache_org_v1_Properties] -=== Properties(`map[string]string` alias) - -*Appears on:* - -* <<#_camel_apache_org_v1_Server, Server>> - - - - [#_camel_apache_org_v1_PublishTask] === PublishTask @@ -2886,58 +2856,6 @@ string used by the ImageStream -|=== - -[#_camel_apache_org_v1_Server] -=== Server - -*Appears on:* - -* <<#_camel_apache_org_v1_MavenBuildSpec, MavenBuildSpec>> - - - -[cols="2,2a",options="header"] -|=== -|Field -|Description - -|`-` + -encoding/xml.Name -| - - - - -|`id` + -string -| - - - - -|`username` + -string -| - - - - -|`password` + -string -| - - - - -|`configuration` + -*xref:#_camel_apache_org_v1_Properties[Properties]* -| - - - - - |=== [#_camel_apache_org_v1_SourceSpec] diff --git a/docs/modules/traits/pages/mount.adoc b/docs/modules/traits/pages/mount.adoc index fe5a40f8b0..cd9d549490 100644 --- a/docs/modules/traits/pages/mount.adoc +++ b/docs/modules/traits/pages/mount.adoc @@ -45,10 +45,6 @@ Syntax: [configmap\|secret]:name[/key][@path], where name represents the resourc | []string | A list of Persistent Volume Claims to be mounted. Syntax: [pvcname:/container/path] -| mount.pvcs -| []string -| A list of Persistent Volume Claims to be created and mounted. Syntax: [pvcname:storageClassName:requestedQuantity:/container/path] - |=== // End of autogenerated code - DO NOT EDIT! (configuration) diff --git a/pkg/apis/camel/v1/zz_generated.deepcopy.go b/pkg/apis/camel/v1/zz_generated.deepcopy.go index e787e152d4..b1f04c1f68 100644 --- a/pkg/apis/camel/v1/zz_generated.deepcopy.go +++ b/pkg/apis/camel/v1/zz_generated.deepcopy.go @@ -1,4 +1,3 @@ -//go:build !ignore_autogenerated // +build !ignore_autogenerated // Code generated by controller-gen. DO NOT EDIT. diff --git a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go index e760a6b422..b2148b9e29 100644 --- a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go @@ -1,4 +1,3 @@ -//go:build !ignore_autogenerated // +build !ignore_autogenerated // Code generated by controller-gen. DO NOT EDIT. diff --git a/resources/traits.yaml b/resources/traits.yaml index 930a63da47..8317239b51 100755 --- a/resources/traits.yaml +++ b/resources/traits.yaml @@ -837,10 +837,6 @@ traits: - name: volumes type: '[]string' description: 'A list of Persistent Volume Claims to be mounted. Syntax: [pvcname:/container/path]' - - name: pvcs - type: '[]string' - description: 'A list of Persistent Volume Claims to be created and mounted. Syntax: - [pvcname:storageClassName:requestedQuantity:/container/path]' - name: openapi platform: true profiles: