This is an automated email from the ASF dual-hosted git repository. astefanutti pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 87d23539918633503f52a21158bc9b036c894b88 Author: Antonin Stefanutti <[email protected]> AuthorDate: Thu Mar 25 11:13:35 2021 +0100 chore(build): regen CRDs with CA certificate support --- config/crd/bases/camel.apache.org_builds.yaml | 23 +++++++++++ .../camel.apache.org_integrationplatforms.yaml | 44 ++++++++++++++++++++++ .../1.4.0-snapshot/camel.apache.org_builds.yaml | 23 +++++++++++ .../camel.apache.org_integrationplatforms.yaml | 44 ++++++++++++++++++++++ helm/camel-k/crds/crd-build.yaml | 23 +++++++++++ helm/camel-k/crds/crd-integration-platform.yaml | 44 ++++++++++++++++++++++ pkg/apis/camel/v1/common_types.go | 11 ++++-- pkg/apis/camel/v1/zz_generated.deepcopy.go | 5 +++ pkg/resources/resources.go | 8 ++-- 9 files changed, 217 insertions(+), 8 deletions(-) diff --git a/config/crd/bases/camel.apache.org_builds.yaml b/config/crd/bases/camel.apache.org_builds.yaml index e883c36..0ddd9ed 100644 --- a/config/crd/bases/camel.apache.org_builds.yaml +++ b/config/crd/bases/camel.apache.org_builds.yaml @@ -127,6 +127,29 @@ spec: maven: description: MavenSpec -- properties: + caCert: + description: The Secret key containing the CA certificate + used to connect to remote repositories. A JKS formatted + keystore is automatically created to store the CA + certificate, and configured to be used as a trusted + certificate by the Maven command. + properties: + key: + description: The key of the secret to select from. Must + be a valid secret key. + type: string + name: + description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, kind, + uid?' + type: string + optional: + description: Specify whether the Secret or its key + must be defined + type: boolean + required: + - key + type: object localRepository: type: string settings: diff --git a/config/crd/bases/camel.apache.org_integrationplatforms.yaml b/config/crd/bases/camel.apache.org_integrationplatforms.yaml index 7d1e156..bf34421 100644 --- a/config/crd/bases/camel.apache.org_integrationplatforms.yaml +++ b/config/crd/bases/camel.apache.org_integrationplatforms.yaml @@ -81,6 +81,28 @@ spec: maven: description: MavenSpec -- properties: + caCert: + description: The Secret key containing the CA certificate + used to connect to remote repositories. A JKS formatted + keystore is automatically created to store the CA certificate, + and configured to be used as a trusted certificate by the + Maven command. + properties: + key: + description: The key of the secret to select from. Must + be a valid secret key. + type: string + name: + description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: + description: Specify whether the Secret or its key must + be defined + type: boolean + required: + - key + type: object localRepository: type: string settings: @@ -229,6 +251,28 @@ spec: maven: description: MavenSpec -- properties: + caCert: + description: The Secret key containing the CA certificate + used to connect to remote repositories. A JKS formatted + keystore is automatically created to store the CA certificate, + and configured to be used as a trusted certificate by the + Maven command. + properties: + key: + description: The key of the secret to select from. Must + be a valid secret key. + type: string + name: + description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: + description: Specify whether the Secret or its key must + be defined + type: boolean + required: + - key + type: object localRepository: type: string settings: diff --git a/deploy/olm-catalog/camel-k-dev/1.4.0-snapshot/camel.apache.org_builds.yaml b/deploy/olm-catalog/camel-k-dev/1.4.0-snapshot/camel.apache.org_builds.yaml index e883c36..0ddd9ed 100644 --- a/deploy/olm-catalog/camel-k-dev/1.4.0-snapshot/camel.apache.org_builds.yaml +++ b/deploy/olm-catalog/camel-k-dev/1.4.0-snapshot/camel.apache.org_builds.yaml @@ -127,6 +127,29 @@ spec: maven: description: MavenSpec -- properties: + caCert: + description: The Secret key containing the CA certificate + used to connect to remote repositories. A JKS formatted + keystore is automatically created to store the CA + certificate, and configured to be used as a trusted + certificate by the Maven command. + properties: + key: + description: The key of the secret to select from. Must + be a valid secret key. + type: string + name: + description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, kind, + uid?' + type: string + optional: + description: Specify whether the Secret or its key + must be defined + type: boolean + required: + - key + type: object localRepository: type: string settings: diff --git a/deploy/olm-catalog/camel-k-dev/1.4.0-snapshot/camel.apache.org_integrationplatforms.yaml b/deploy/olm-catalog/camel-k-dev/1.4.0-snapshot/camel.apache.org_integrationplatforms.yaml index 7d1e156..bf34421 100644 --- a/deploy/olm-catalog/camel-k-dev/1.4.0-snapshot/camel.apache.org_integrationplatforms.yaml +++ b/deploy/olm-catalog/camel-k-dev/1.4.0-snapshot/camel.apache.org_integrationplatforms.yaml @@ -81,6 +81,28 @@ spec: maven: description: MavenSpec -- properties: + caCert: + description: The Secret key containing the CA certificate + used to connect to remote repositories. A JKS formatted + keystore is automatically created to store the CA certificate, + and configured to be used as a trusted certificate by the + Maven command. + properties: + key: + description: The key of the secret to select from. Must + be a valid secret key. + type: string + name: + description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: + description: Specify whether the Secret or its key must + be defined + type: boolean + required: + - key + type: object localRepository: type: string settings: @@ -229,6 +251,28 @@ spec: maven: description: MavenSpec -- properties: + caCert: + description: The Secret key containing the CA certificate + used to connect to remote repositories. A JKS formatted + keystore is automatically created to store the CA certificate, + and configured to be used as a trusted certificate by the + Maven command. + properties: + key: + description: The key of the secret to select from. Must + be a valid secret key. + type: string + name: + description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: + description: Specify whether the Secret or its key must + be defined + type: boolean + required: + - key + type: object localRepository: type: string settings: diff --git a/helm/camel-k/crds/crd-build.yaml b/helm/camel-k/crds/crd-build.yaml index e883c36..0ddd9ed 100644 --- a/helm/camel-k/crds/crd-build.yaml +++ b/helm/camel-k/crds/crd-build.yaml @@ -127,6 +127,29 @@ spec: maven: description: MavenSpec -- properties: + caCert: + description: The Secret key containing the CA certificate + used to connect to remote repositories. A JKS formatted + keystore is automatically created to store the CA + certificate, and configured to be used as a trusted + certificate by the Maven command. + properties: + key: + description: The key of the secret to select from. Must + be a valid secret key. + type: string + name: + description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, kind, + uid?' + type: string + optional: + description: Specify whether the Secret or its key + must be defined + type: boolean + required: + - key + type: object localRepository: type: string settings: diff --git a/helm/camel-k/crds/crd-integration-platform.yaml b/helm/camel-k/crds/crd-integration-platform.yaml index 7d1e156..bf34421 100644 --- a/helm/camel-k/crds/crd-integration-platform.yaml +++ b/helm/camel-k/crds/crd-integration-platform.yaml @@ -81,6 +81,28 @@ spec: maven: description: MavenSpec -- properties: + caCert: + description: The Secret key containing the CA certificate + used to connect to remote repositories. A JKS formatted + keystore is automatically created to store the CA certificate, + and configured to be used as a trusted certificate by the + Maven command. + properties: + key: + description: The key of the secret to select from. Must + be a valid secret key. + type: string + name: + description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: + description: Specify whether the Secret or its key must + be defined + type: boolean + required: + - key + type: object localRepository: type: string settings: @@ -229,6 +251,28 @@ spec: maven: description: MavenSpec -- properties: + caCert: + description: The Secret key containing the CA certificate + used to connect to remote repositories. A JKS formatted + keystore is automatically created to store the CA certificate, + and configured to be used as a trusted certificate by the + Maven command. + properties: + key: + description: The key of the secret to select from. Must + be a valid secret key. + type: string + name: + description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: + description: Specify whether the Secret or its key must + be defined + type: boolean + required: + - key + type: object localRepository: type: string settings: diff --git a/pkg/apis/camel/v1/common_types.go b/pkg/apis/camel/v1/common_types.go index ae0413b..f09d21d 100644 --- a/pkg/apis/camel/v1/common_types.go +++ b/pkg/apis/camel/v1/common_types.go @@ -83,10 +83,13 @@ type PlatformInjectable interface { // MavenSpec -- type MavenSpec struct { - LocalRepository string `json:"localRepository,omitempty"` - Settings ValueSource `json:"settings,omitempty"` - CaCert *corev1.SecretKeySelector `json:"caCert,omitempty"` - Timeout *metav1.Duration `json:"timeout,omitempty"` + LocalRepository string `json:"localRepository,omitempty"` + Settings ValueSource `json:"settings,omitempty"` + // The Secret key containing the CA certificate used to connect to remote repositories. + // A JKS formatted keystore is automatically created to store the CA certificate, + // and configured to be used as a trusted certificate by the Maven command. + CaCert *corev1.SecretKeySelector `json:"caCert,omitempty"` + Timeout *metav1.Duration `json:"timeout,omitempty"` } // ValueSource -- diff --git a/pkg/apis/camel/v1/zz_generated.deepcopy.go b/pkg/apis/camel/v1/zz_generated.deepcopy.go index 9f0410e..c8e1ff6 100644 --- a/pkg/apis/camel/v1/zz_generated.deepcopy.go +++ b/pkg/apis/camel/v1/zz_generated.deepcopy.go @@ -1264,6 +1264,11 @@ func (in *MavenArtifact) DeepCopy() *MavenArtifact { func (in *MavenSpec) DeepCopyInto(out *MavenSpec) { *out = *in in.Settings.DeepCopyInto(&out.Settings) + if in.CaCert != nil { + in, out := &in.CaCert, &out.CaCert + *out = new(corev1.SecretKeySelector) + (*in).DeepCopyInto(*out) + } if in.Timeout != nil { in, out := &in.Timeout, &out.Timeout *out = new(metav1.Duration) diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go index 26f7a55..80763e2 100644 --- a/pkg/resources/resources.go +++ b/pkg/resources/resources.go @@ -78,9 +78,9 @@ var assets = func() http.FileSystem { "/crd/bases/camel.apache.org_builds.yaml": &vfsgen۰CompressedFileInfo{ name: "camel.apache.org_builds.yaml", modTime: time.Time{}, - uncompressedSize: 20998, + uncompressedSize: 22436, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x3c\x5d\x6f\xdb\x38\xb6\xef\xfe\x15\x07\xf5\x43\x5b\x20\x96\xa7\x33\x73\x2f\x06\xbe\x0f\x17\x1e\xb7\xc5\x35\xda\x26\x41\xec\x76\x30\x8f\xb4\x74\x2c\x71\x2c\x91\xba\x24\x65\xc7\xb3\xd8\xff\xbe\x20\x29\xd9\x52\xac\x0f\x2a\x51\x67\xb3\xbb\xe1\x4b\x62\x89\x3c\xdf\x3c\x1f\x24\xc5\x31\x4c\x86\x6b\xa3\x31\x7c\xa6\x3e\x32\x89\x01\x28\x0e\x2a\x42\x98\xa7\xc4\x8f\x10\x56\x7c\xab\x0e\x44\x20\x7c\xe4\x19\x0b\x88\xa2\x9c\xc1\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5c\xdf\x73\xdb\x36\xf2\x7f\xd7\x5f\xb1\x13\x3f\x24\x99\xb1\xa8\xa6\xed\xf7\x3b\x1d\xdd\xc3\x8d\x2a\x27\x73\xba\x24\xb6\xc7\x72\xd2\xe9\xe3\x8a\x5c\x51\xa8\x48\x80\x07\x80\x96\xd5\x9b\xfb\xdf\x6f\x00\x90\x12\x65\xf1\x07\x68\x2b\xad\xef\xce\x78\x49\x4c\x01\x8b\xfd\x85\xcf\xee\x82\x20\xce\x60\x78\xba\x36\x38\x83\x4f\x2c\x24\xae\x28\x02\x2d\x40\xaf\x08\x26\x19\x86\x2b\x82\xb9\x58\xea\x0d\x4a\x82\x0f\x22\xe7\x11\x6a\x [...] }, "/crd/bases/camel.apache.org_camelcatalogs.yaml": &vfsgen۰CompressedFileInfo{ name: "camel.apache.org_camelcatalogs.yaml", @@ -99,9 +99,9 @@ var assets = func() http.FileSystem { "/crd/bases/camel.apache.org_integrationplatforms.yaml": &vfsgen۰CompressedFileInfo{ name: "camel.apache.org_integrationplatforms.yaml", modTime: time.Time{}, - uncompressedSize: 16884, + uncompressedSize: 19424, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5b\xdf\x8f\xe2\x38\xf2\x7f\xcf\x5f\x51\x1a\x1e\x66\x57\x6a\x60\xe7\xfb\xbd\x87\x13\xf7\x70\xea\x65\x66\x74\x68\x66\xba\x5b\x0d\x33\xab\x7d\x34\x49\x11\xbc\x38\x76\xce\x3f\x9a\x61\x4f\xf7\xbf\x9f\x5c\x4e\x20\x40\x12\x42\x77\xaf\x4e\xba\x8d\x5f\xba\x21\x76\xb9\x7e\x7e\x5c\xae\x22\x03\x18\xbe\xde\x88\x06\xf0\x99\xc7\x28\x0d\x26\x60\x15\xd8\x35\xc2\x6d\xce\xe2\x35\xc2\x5c\xad\xec\x96\x69\x84\x8f\xca\xc9\x84\x59\xae\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5c\x5f\x8f\xdb\xb8\x11\x7f\xd7\xa7\x18\xc4\x0f\xb9\x03\xd6\xf2\xa5\xed\x43\xe1\x3e\x14\x3e\x27\x41\xdd\x24\xbb\x8b\xb5\x93\xc3\x3d\xd2\xd2\x58\xe6\x99\x22\x55\x92\x5a\xc7\x57\xf4\xbb\x17\x43\x4a\xb6\xbc\xd6\xbf\xf5\xe6\xd0\xf6\x2a\xbe\x24\x96\xc8\xe1\xfc\xfd\x71\xc8\xa1\x76\x04\xe3\x6f\xd7\x82\x11\x7c\xe4\x11\x4a\x83\x31\x58\x05\x76\x8b\x30\xcb\x58\xb4\x45\x58\xaa\x8d\xdd\x33\x8d\xf0\x5e\xe5\x32\x66\x96\x2b\x09\x [...] }, "/crd/bases/camel.apache.org_integrations.yaml": &vfsgen۰CompressedFileInfo{ name: "camel.apache.org_integrations.yaml",
