Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix make generate-strimzi #3331

Merged
merged 2 commits into from
Jun 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions addons/keda/duck/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions addons/strimzi/duck/v1beta2/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

82 changes: 82 additions & 0 deletions docs/modules/ROOT/partials/apis/camel-k-crds.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2301,6 +2301,13 @@ base Maven specification

additional repositories

|`servers` +
*xref:#_camel_apache_org_v1_Server[[\]Server]*
|


Servers (auth)


|===

Expand Down Expand Up @@ -2346,13 +2353,26 @@ 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.
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]*
|
Expand Down Expand Up @@ -2484,6 +2504,16 @@ 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

Expand Down Expand Up @@ -2856,6 +2886,58 @@ 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]
Expand Down
1 change: 1 addition & 0 deletions pkg/apis/camel/v1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions script/gen_client_strimzi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ go run k8s.io/code-generator/cmd/client-gen \
-h script/headers/default.txt \
--input duck/v1beta2 \
--input-base=github.com/apache/camel-k/addons/strimzi \
--output-base=. \
--output-package=github.com/apache/camel-k/addons/strimzi/duck/client

rm -r ./addons/strimzi/duck/client || true
Expand Down