This is an automated email from the ASF dual-hosted git repository. tsato pushed a commit to branch release-1.9.x in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit bd88d4ad675c89805d9b876716309810f084c450 Author: Tadayoshi Sato <[email protected]> AuthorDate: Tue Jul 19 18:50:45 2022 +0900 fix(olm): fix profile name: Openshift -> OpenShift Also fixes every occurrence of "Openshift" to "OpenShift" in the docs. --- .../camel.apache.org_integrationplatforms.yaml | 4 +- config/samples/patch-integration-platform.yaml | 2 +- docs/modules/ROOT/pages/architecture/traits.adoc | 4 +- .../pages/contributing/local-deployment-olm.adoc | 2 +- docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 89 +++++++++++++++++++++- docs/modules/traits/pages/route.adoc | 8 +- e2e/yaks/openshift/monitoring/alerting.feature | 2 +- helm/camel-k/crds/crd-integration-platform.yaml | 4 +- install/Makefile | 2 +- pkg/apis/camel/v1/integrationplatform_types.go | 4 +- pkg/trait/pull_secret.go | 6 +- pkg/trait/route.go | 2 +- release.adoc | 2 +- resources/traits.yaml | 2 +- 14 files changed, 107 insertions(+), 26 deletions(-) diff --git a/config/crd/bases/camel.apache.org_integrationplatforms.yaml b/config/crd/bases/camel.apache.org_integrationplatforms.yaml index 91884f24f..5c33a7d11 100644 --- a/config/crd/bases/camel.apache.org_integrationplatforms.yaml +++ b/config/crd/bases/camel.apache.org_integrationplatforms.yaml @@ -268,7 +268,7 @@ spec: type: object cluster: description: what kind of cluster you're running (ie, plain Kubernetes - or Openshift) + or OpenShift) type: string configuration: description: list of configuration properties to be attached to all @@ -543,7 +543,7 @@ spec: type: object cluster: description: what kind of cluster you're running (ie, plain Kubernetes - or Openshift) + or OpenShift) type: string conditions: description: which are the conditions met (particularly useful when diff --git a/config/samples/patch-integration-platform.yaml b/config/samples/patch-integration-platform.yaml index 0f60cd2ab..4af3fedc8 100644 --- a/config/samples/patch-integration-platform.yaml +++ b/config/samples/patch-integration-platform.yaml @@ -24,7 +24,7 @@ spec: # The profile to be implemented by default # ie. OpenShift, Kubernetes, Knative # - profile: Openshift + profile: OpenShift # # # Options propagated to integrations diff --git a/docs/modules/ROOT/pages/architecture/traits.adoc b/docs/modules/ROOT/pages/architecture/traits.adoc index 203445c06..23c154a32 100644 --- a/docs/modules/ROOT/pages/architecture/traits.adoc +++ b/docs/modules/ROOT/pages/architecture/traits.adoc @@ -19,10 +19,10 @@ Traits are typically used to tune several aspects of an `Integration`. However, Another important concept related to the trait lifecycle is the **trait profile**. At this time, Camel K is supporting the following profiles: * Kubernetes -* Openshift +* OpenShift * Knative -A profile is useful to identify on which kind of cluster a trait has to run: vanilla `Kubernetes`, `Openshift` or OpenShift/Kubernetes clusters powered by `Knative`. The default is to allow a trait on any profile; each trait can specify a different behavior (ie, running a trait only for a profile as it happens with `Knative`). +A profile is useful to identify on which kind of cluster a trait has to run: vanilla `Kubernetes`, `OpenShift` or OpenShift/Kubernetes clusters powered by `Knative`. The default is to allow a trait on any profile; each trait can specify a different behavior (ie, running a trait only for a profile as it happens with `Knative`). [[traits-configuration]] === Trait configuration diff --git a/docs/modules/ROOT/pages/contributing/local-deployment-olm.adoc b/docs/modules/ROOT/pages/contributing/local-deployment-olm.adoc index fc42ff012..996c8b731 100644 --- a/docs/modules/ROOT/pages/contributing/local-deployment-olm.adoc +++ b/docs/modules/ROOT/pages/contributing/local-deployment-olm.adoc @@ -6,7 +6,7 @@ The following steps assume that - you've already built the camel-k image using `make images` and made it available in the cluster as an imagestream - you've already built the bundle image using `make bundle` and have pushed it to some registry -To perform OLM (Operator Lifecycle Manager) based deployment of camel-k, built from source locally on an Openshift cluster, you can follow the steps below. +To perform OLM (Operator Lifecycle Manager) based deployment of camel-k, built from source locally on an OpenShift cluster, you can follow the steps below. Login to the cluster using the standard "oc" tool, create new project, complete the basic setup process. Reference commands below diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc index f770369f6..6bf12fdb0 100644 --- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc +++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc @@ -1792,7 +1792,7 @@ IntegrationPlatformSpec defines the desired state of IntegrationPlatform | -what kind of cluster you're running (ie, plain Kubernetes or Openshift) +what kind of cluster you're running (ie, plain Kubernetes or OpenShift) |`profile` + *xref:#_camel_apache_org_v1_TraitProfile[TraitProfile]* @@ -2301,6 +2301,13 @@ base Maven specification additional repositories +|`servers` + +*xref:#_camel_apache_org_v1_Server[[\]Server]* +| + + +Servers (auth) + |=== @@ -2346,6 +2353,7 @@ 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. @@ -2353,6 +2361,18 @@ 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]* | @@ -2457,9 +2477,8 @@ NodeSelector TopologySpreadConstraints - |`securityContext` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#podsecuritycontext-v1-core[[\]Kubernetes core/v1.PodSecurityContext]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#podsecuritycontext-v1-core[Kubernetes core/v1.PodSecurityContext]* | @@ -2492,6 +2511,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 @@ -2864,6 +2893,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] @@ -3114,4 +3195,4 @@ Selects a key of a ConfigMap. Selects a key of a secret. -|=== +|=== \ No newline at end of file diff --git a/docs/modules/traits/pages/route.adoc b/docs/modules/traits/pages/route.adoc index 493586cef..dbb3ceb76 100755 --- a/docs/modules/traits/pages/route.adoc +++ b/docs/modules/traits/pages/route.adoc @@ -3,7 +3,7 @@ // Start of autogenerated code - DO NOT EDIT! (description) The Route trait can be used to configure the creation of OpenShift routes for the integration. -The certificate and key contents may be sourced either from the local filesystem or in a Openshift `secret` object. +The certificate and key contents may be sourced either from the local filesystem or in a OpenShift `secret` object. The user may use the parameters ending in `-secret` (example: `tls-certificate-secret`) to reference a certificate stored in a `secret`. Parameters ending in `-secret` have higher priorities and in case the same route parameter is set, for example: `tls-key-secret` and `tls-key`, then `tls-key-secret` is used. @@ -107,7 +107,7 @@ Refer to the OpenShift route documentation for additional information. == Examples -These examples uses *secrets* to store the certificates and keys to be referenced in the integrations. Read Openshift route documentation for detailed information about routes. The https://github.com/apache/camel-k/blob/main/examples/http/PlatformHttpServer.java[PlatformHttpServer.java] is the integration example. +These examples uses *secrets* to store the certificates and keys to be referenced in the integrations. Read OpenShift route documentation for detailed information about routes. The https://github.com/apache/camel-k/blob/main/examples/http/PlatformHttpServer.java[PlatformHttpServer.java] is the integration example. As a requirement to run these examples, you should have a `secret` with a key and certificate. @@ -141,12 +141,12 @@ kamel run --dev PlatformHttpServer.java --resource secret:my-combined-certs@/etc [source,console] kamel run --dev PlatformHttpServer.java --resource secret:my-combined-certs@/etc/ssl/my-combined-certs -p quarkus.http.ssl.certificate.file=/etc/ssl/my-combined-certs/tls.crt -p quarkus.http.ssl.certificate.key-file=/etc/ssl/my-combined-certs/tls.key -t route.tls-termination=reencrypt -t route.tls-destination-ca-certificate-secret=my-combined-certs/tls.crt -t route.tls-certificate-secret=my-combined-certs/tls.crt -t route.tls-key-secret=my-combined-certs/tls.key -t container.port=8443 -* To add a *reencrypt* route using a specific certificate from a secret for the route and https://docs.openshift.com/container-platform/4.8/security/certificates/service-serving-certificate.html#add-service-certificate_service-serving-certificate[Openshift service serving certificates] for the integration endpoint. This way the Openshift service serving certificates is set up only in the integration pod. The keys and certificates should be visible in the running integration pod, to achie [...] +* To add a *reencrypt* route using a specific certificate from a secret for the route and https://docs.openshift.com/container-platform/4.8/security/certificates/service-serving-certificate.html#add-service-certificate_service-serving-certificate[OpenShift service serving certificates] for the integration endpoint. This way the OpenShift service serving certificates is set up only in the integration pod. The keys and certificates should be visible in the running integration pod, to achie [...] + [source,console] kamel run --dev PlatformHttpServer.java --resource secret:cert-from-openshift@/etc/ssl/cert-from-openshift -p quarkus.http.ssl.certificate.file=/etc/ssl/cert-from-openshift/tls.crt -p quarkus.http.ssl.certificate.key-file=/etc/ssl/cert-from-openshift/tls.key -t route.tls-termination=reencrypt -t route.tls-certificate-secret=my-combined-certs/tls.crt -t route.tls-key-secret=my-combined-certs/tls.key -t container.port=8443 + -Then you should annotate the integration service to inject the Openshift service serving certificates +Then you should annotate the integration service to inject the OpenShift service serving certificates + [source,console] oc annotate service platform-http-server service.beta.openshift.io/serving-cert-secret-name=cert-from-openshift diff --git a/e2e/yaks/openshift/monitoring/alerting.feature b/e2e/yaks/openshift/monitoring/alerting.feature index 3a5750998..04b5d4a6b 100644 --- a/e2e/yaks/openshift/monitoring/alerting.feature +++ b/e2e/yaks/openshift/monitoring/alerting.feature @@ -1,4 +1,4 @@ -Feature: Alerts from Camel K are propagated to Openshift Prometheus +Feature: Alerts from Camel K are propagated to OpenShift Prometheus Background: Prepare Thanos-ruler URL Given URL: https://thanos-ruler.openshift-user-workload-monitoring:9091 diff --git a/helm/camel-k/crds/crd-integration-platform.yaml b/helm/camel-k/crds/crd-integration-platform.yaml index 91884f24f..5c33a7d11 100644 --- a/helm/camel-k/crds/crd-integration-platform.yaml +++ b/helm/camel-k/crds/crd-integration-platform.yaml @@ -268,7 +268,7 @@ spec: type: object cluster: description: what kind of cluster you're running (ie, plain Kubernetes - or Openshift) + or OpenShift) type: string configuration: description: list of configuration properties to be attached to all @@ -543,7 +543,7 @@ spec: type: object cluster: description: what kind of cluster you're running (ie, plain Kubernetes - or Openshift) + or OpenShift) type: string conditions: description: which are the conditions met (particularly useful when diff --git a/install/Makefile b/install/Makefile index faf8466d6..2838115d9 100644 --- a/install/Makefile +++ b/install/Makefile @@ -307,7 +307,7 @@ endif # Customizes the samples patches for openshift # .platform-openshift-patch: - @sed -i 's/.*profile:.*/ profile: Openshift/' $(SAMPLES)/$(INT_PLATFORM_PATCH).$(YAML) + @sed -i 's/.*profile:.*/ profile: OpenShift/' $(SAMPLES)/$(INT_PLATFORM_PATCH).$(YAML) # # Install the integration platform diff --git a/pkg/apis/camel/v1/integrationplatform_types.go b/pkg/apis/camel/v1/integrationplatform_types.go index c78af0388..2bf9f8f4b 100644 --- a/pkg/apis/camel/v1/integrationplatform_types.go +++ b/pkg/apis/camel/v1/integrationplatform_types.go @@ -27,7 +27,7 @@ import ( // IntegrationPlatformSpec defines the desired state of IntegrationPlatform type IntegrationPlatformSpec struct { - // what kind of cluster you're running (ie, plain Kubernetes or Openshift) + // what kind of cluster you're running (ie, plain Kubernetes or OpenShift) Cluster IntegrationPlatformCluster `json:"cluster,omitempty"` // the profile you wish to use. It will apply certain traits which are required by the specific profile chosen. // It usually relates the Cluster with the optional definition of special profiles (ie, Knative) @@ -176,7 +176,7 @@ const ( IntegrationPlatformBuildPublishStrategyKaniko IntegrationPlatformBuildPublishStrategy = "Kaniko" // IntegrationPlatformBuildPublishStrategyS2I uses the Source to Images (S2I) feature // (https://docs.openshift.com/container-platform/4.9/openshift_images/create-images.html#images-create-s2i_create-images) - // provided by an Openshift cluster in order to create and push the images to the registry. It is the default choice on Openshift cluster + // provided by an OpenShift cluster in order to create and push the images to the registry. It is the default choice on OpenShift cluster IntegrationPlatformBuildPublishStrategyS2I IntegrationPlatformBuildPublishStrategy = "S2I" // IntegrationPlatformBuildPublishStrategySpectrum uses Spectrum project (https://github.com/container-tools/spectrum) // in order to push the incremental images to the image repository. It is the default choice on vanilla Kubernetes cluster diff --git a/pkg/trait/pull_secret.go b/pkg/trait/pull_secret.go index 10414e5ff..bc108c6c4 100644 --- a/pkg/trait/pull_secret.go +++ b/pkg/trait/pull_secret.go @@ -85,17 +85,17 @@ func (t *pullSecretTrait) Configure(e *Environment) (bool, error) { } } if t.ImagePullerDelegation == nil { - var isOpenshift bool + var isOpenShift bool if t.Client != nil { var err error - isOpenshift, err = openshift.IsOpenShift(t.Client) + isOpenShift, err = openshift.IsOpenShift(t.Client) if err != nil { return false, err } } isOperatorGlobal := platform.IsCurrentOperatorGlobal() isKitExternal := e.Integration.GetIntegrationKitNamespace(e.Platform) != e.Integration.Namespace - needsDelegation := isOpenshift && isOperatorGlobal && isKitExternal + needsDelegation := isOpenShift && isOperatorGlobal && isKitExternal t.ImagePullerDelegation = &needsDelegation } } diff --git a/pkg/trait/route.go b/pkg/trait/route.go index c3d541789..3f5b494c6 100644 --- a/pkg/trait/route.go +++ b/pkg/trait/route.go @@ -34,7 +34,7 @@ import ( // The Route trait can be used to configure the creation of OpenShift routes for the integration. // -// The certificate and key contents may be sourced either from the local filesystem or in a Openshift `secret` object. +// The certificate and key contents may be sourced either from the local filesystem or in a OpenShift `secret` object. // The user may use the parameters ending in `-secret` (example: `tls-certificate-secret`) to reference a certificate stored in a `secret`. // Parameters ending in `-secret` have higher priorities and in case the same route parameter is set, for example: `tls-key-secret` and `tls-key`, // then `tls-key-secret` is used. diff --git a/release.adoc b/release.adoc index 8ba2600f8..1a7de581d 100644 --- a/release.adoc +++ b/release.adoc @@ -245,7 +245,7 @@ The https://github.com/k8s-operatorhub/community-operators/[OperatorHub] downstr of Camel K, so that it can be easily installed on platforms that support Operator Hub. The https://github.com/redhat-openshift-ecosystem/community-operators-prod/[Embedded OperatorHub in OpenShift and OKD] downstream channel should be synced to publish the latest version -of Camel K, so that it can be easily installed on Openshift and OKD. +of Camel K, so that it can be easily installed on OpenShift and OKD. You can create the bundle using the `make bundle` command. diff --git a/resources/traits.yaml b/resources/traits.yaml index 15183bb70..d006ef569 100755 --- a/resources/traits.yaml +++ b/resources/traits.yaml @@ -1038,7 +1038,7 @@ traits: - OpenShift description: 'The Route trait can be used to configure the creation of OpenShift routes for the integration. The certificate and key contents may be sourced either - from the local filesystem or in a Openshift `secret` object. The user may use + from the local filesystem or in a OpenShift `secret` object. The user may use the parameters ending in `-secret` (example: `tls-certificate-secret`) to reference a certificate stored in a `secret`. Parameters ending in `-secret` have higher priorities and in case the same route parameter is set, for example: `tls-key-secret`
