Probes not bound to Knative services apache#1341

deploy/camel-catalog-1.2.0-SNAPSHOT-main.yaml

@@ -3094,6 +3094,8 @@ spec:
       dependencies:
       - groupId: org.apache.camel.k
         artifactId: camel-knative-api
+      - groupId: org.apache.camel.k
+        artifactId: camel-knative
       - groupId: org.apache.camel.k
         artifactId: camel-knative-http
   loaders:

deploy/camel-catalog-1.2.0-SNAPSHOT-quarkus.yaml

@@ -819,13 +819,9 @@ spec:
       artifactId: camel-k-runtime-knative
       dependencies:
       - groupId: org.apache.camel.k
-        artifactId: camel-k-loader-yaml
+        artifactId: camel-k-quarkus-knative
       - groupId: org.apache.camel.k
-        artifactId: camel-knative-api
-      - groupId: org.apache.camel.k
-        artifactId: camel-knative
-      - groupId: org.apache.camel.k
-        artifactId: camel-knative-http
+        artifactId: camel-k-quarkus-loader-yaml
     camel-knative:
       groupId: org.apache.camel.k
       artifactId: camel-knative
@@ -835,9 +831,7 @@ spec:
         passive: false
       dependencies:
       - groupId: org.apache.camel.k
-        artifactId: camel-knative-api
-      - groupId: org.apache.camel.k
-        artifactId: camel-knative-http
+        artifactId: camel-k-quarkus-knative
   loaders:
     yaml:
       groupId: org.apache.camel.k

docs/modules/ROOT/nav.adoc

@@ -35,7 +35,6 @@
 ** xref:traits/master.adoc[Master]
 ** xref:traits/owner.adoc[Owner]
 ** xref:traits/platform.adoc[Platform]
-** xref:traits/probes.adoc[Probes]
 ** xref:traits/prometheus.adoc[Prometheus]
 ** xref:traits/pull-secret.adoc[Pull Secret]
 ** xref:traits/quarkus.adoc[Quarkus]

docs/modules/ROOT/pages/traits/traits.adoc

@@ -53,7 +53,6 @@ See the trait description pages for more information on a specific trait:
 * xref:traits/master.adoc[Master Trait]
 * xref:traits/owner.adoc[Owner Trait]
 * xref:traits/platform.adoc[Platform Trait]
-* xref:traits/probes.adoc[Probes Trait]
 * xref:traits/prometheus.adoc[Prometheus Trait]
 * xref:traits/pull-secret.adoc[Pull Secret Trait]
 * xref:traits/quarkus.adoc[Quarkus Trait]

e2e/openapi_test.go

@@ -31,7 +31,7 @@ import (
 )
 
 func TestOpenAPIService(t *testing.T) {
-	withNewTestNamespaceWithKnativeBroker(t, func(ns string) {
+	withNewTestNamespace(t, func(ns string) {
 		Expect(kamel("install", "-n", ns, "--trait-profile", string(v1.TraitProfileKnative)).Execute()).Should(BeNil())
 		Expect(kamel(
 			"run",
@@ -56,7 +56,7 @@ func TestOpenAPIService(t *testing.T) {
 }
 
 func TestOpenAPIDeployment(t *testing.T) {
-	withNewTestNamespaceWithKnativeBroker(t, func(ns string) {
+	withNewTestNamespace(t, func(ns string) {
 		Expect(kamel("install", "-n", ns, "--trait-profile", string(v1.TraitProfileKubernetes)).Execute()).Should(BeNil())
 		Expect(kamel(
 			"run",

go.sum

@@ -148,6 +148,7 @@ github.com/containerd/console v0.0.0-20170925154832-84eeaae905fa/go.mod h1:Tj/on
 github.com/containerd/containerd v1.0.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
 github.com/containerd/containerd v1.2.7/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
 github.com/containerd/containerd v1.3.0-beta.2.0.20190823190603-4a2f61c4f2b4/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
+github.com/containerd/containerd v1.3.0 h1:xjvXQWABwS2uiv3TWgQt5Uth60Gu86LTGZXMJkjc7rY=
 github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
 github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 h1:4BX8f882bXEDKfWIf0wa8HRvpnBoPszJJXL+TVbBw4M=
 github.com/containerd/continuity v0.0.0-20181203112020-004b46473808/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
@@ -199,11 +200,13 @@ github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017 h1:2HQmlpI3yI9deH18Q6xi
 github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v2.7.0+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
+github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug=
 github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/docker-credential-helpers v0.6.1/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
 github.com/docker/docker-credential-helpers v0.6.3 h1:zI2p9+1NQYdnG6sMU26EX4aVGlqbInSQxQXLvzJ4RPQ=
 github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
 github.com/docker/go-connections v0.3.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
+github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI=
 github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=

pkg/apis/camel/v1/integration_types.go

@@ -191,6 +191,8 @@ const (
 	IntegrationConditionPrometheusAvailable IntegrationConditionType = "PrometheusAvailable"
 	// IntegrationConditionJolokiaAvailable --
 	IntegrationConditionJolokiaAvailable IntegrationConditionType = "JolokiaAvailable"
+	// IntegrationConditionProbesAvailable --
+	IntegrationConditionProbesAvailable IntegrationConditionType = "ProbesAvailable"
 
 	// IntegrationConditionKitAvailableReason --
 	IntegrationConditionKitAvailableReason string = "IntegrationKitAvailable"
@@ -226,6 +228,8 @@ const (
 	IntegrationConditionPrometheusAvailableReason string = "PrometheusAvailable"
 	// IntegrationConditionJolokiaAvailableReason --
 	IntegrationConditionJolokiaAvailableReason string = "JolokiaAvailable"
+	// IntegrationConditionProbesAvailableReason --
+	IntegrationConditionProbesAvailableReason string = "ProbesAvailable"
 )
 
 // IntegrationCondition describes the state of a resource at a certain point.