You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by as...@apache.org on 2020/11/10 10:20:06 UTC
[camel-k] 06/25: chore: Declare metrics container port
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 01eb712e6fcb48898ac63a28eb7182ac95b538ed
Author: Antonin Stefanutti <an...@stefanutti.fr>
AuthorDate: Fri Oct 16 11:30:05 2020 +0200
chore: Declare metrics container port
---
.../camel-k.v1.3.0-snapshot.clusterserviceversion.yaml | 3 +++
deploy/operator-deployment.yaml | 5 ++++-
helm/camel-k/templates/operator.yaml | 5 +++--
pkg/cmd/operator/operator.go | 5 +++--
4 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/deploy/olm-catalog/camel-k-dev/1.3.0-snapshot/camel-k.v1.3.0-snapshot.clusterserviceversion.yaml b/deploy/olm-catalog/camel-k-dev/1.3.0-snapshot/camel-k.v1.3.0-snapshot.clusterserviceversion.yaml
index af3bdc4..fdf069e 100644
--- a/deploy/olm-catalog/camel-k-dev/1.3.0-snapshot/camel-k.v1.3.0-snapshot.clusterserviceversion.yaml
+++ b/deploy/olm-catalog/camel-k-dev/1.3.0-snapshot/camel-k.v1.3.0-snapshot.clusterserviceversion.yaml
@@ -315,6 +315,9 @@ spec:
image: docker.io/apache/camel-k:1.3.0-SNAPSHOT
imagePullPolicy: IfNotPresent
name: camel-k-operator
+ ports:
+ - containerPort: 8080
+ name: metrics
resources: {}
serviceAccountName: camel-k-operator
permissions:
diff --git a/deploy/operator-deployment.yaml b/deploy/operator-deployment.yaml
index ea88763..ce8e9e1 100644
--- a/deploy/operator-deployment.yaml
+++ b/deploy/operator-deployment.yaml
@@ -40,10 +40,13 @@ spec:
containers:
- name: camel-k-operator
image: docker.io/apache/camel-k:1.3.0-SNAPSHOT
+ imagePullPolicy: IfNotPresent
command:
- kamel
- operator
- imagePullPolicy: IfNotPresent
+ ports:
+ - containerPort: 8080
+ name: metrics
env:
- name: WATCH_NAMESPACE
valueFrom:
diff --git a/helm/camel-k/templates/operator.yaml b/helm/camel-k/templates/operator.yaml
index cee272f..3a870ed 100644
--- a/helm/camel-k/templates/operator.yaml
+++ b/helm/camel-k/templates/operator.yaml
@@ -18,7 +18,6 @@
apiVersion: apps/v1
kind: Deployment
metadata:
- creationTimestamp: null
labels:
app: camel-k
camel.apache.org/component: operator
@@ -33,7 +32,6 @@ spec:
type: Recreate
template:
metadata:
- creationTimestamp: null
labels:
app: camel-k
camel.apache.org/component: operator
@@ -61,5 +59,8 @@ spec:
image: {{ .Values.operator.image }}
imagePullPolicy: IfNotPresent
name: camel-k-operator
+ ports:
+ - containerPort: 8080
+ name: metrics
resources: {}
serviceAccountName: camel-k-operator
diff --git a/pkg/cmd/operator/operator.go b/pkg/cmd/operator/operator.go
index b11c021..a858b30 100644
--- a/pkg/cmd/operator/operator.go
+++ b/pkg/cmd/operator/operator.go
@@ -31,10 +31,10 @@ import (
typedcorev1 "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/client-go/tools/record"
+ ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client/config"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
- "sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/manager/signals"
"github.com/operator-framework/operator-lib/leader"
@@ -122,9 +122,10 @@ func Run() {
}
// Create a new Cmd to provide shared dependencies and start components
- mgr, err := manager.New(cfg, manager.Options{
+ mgr, err := ctrl.NewManager(cfg, ctrl.Options{
Namespace: namespace,
EventBroadcaster: eventBroadcaster,
+ MetricsBindAddress: ":8080",
})
if err != nil {
log.Error(err, "")