Skip to content

Commit c3b8925

Browse files
committed
Regenerate bundle using make bundle
Signed-off-by: Andrew McDermott <[email protected]>
1 parent 554a202 commit c3b8925

10 files changed

+153
-43
lines changed
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
apiVersion: monitoring.coreos.com/v1
2+
kind: ServiceMonitor
3+
metadata:
4+
labels:
5+
app.kubernetes.io/component: metrics
6+
app.kubernetes.io/created-by: bpfman-operator
7+
app.kubernetes.io/instance: agent-metrics-monitor
8+
app.kubernetes.io/managed-by: kustomize
9+
app.kubernetes.io/name: agent-metrics-monitor
10+
app.kubernetes.io/part-of: bpfman-operator
11+
name: bpfman-agent-metrics-monitor
12+
spec:
13+
endpoints:
14+
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
15+
path: /metrics
16+
port: https-metrics
17+
scheme: https
18+
tlsConfig:
19+
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
20+
insecureSkipVerify: false
21+
serverName: bpfman-agent-metrics-service.bpfman.svc
22+
selector:
23+
matchLabels:
24+
app.kubernetes.io/component: metrics
25+
app.kubernetes.io/instance: agent-metrics-service
26+
app.kubernetes.io/name: agent-metrics-service
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
annotations:
5+
service.beta.openshift.io/serving-cert-secret-name: agent-metrics-tls
6+
creationTimestamp: null
7+
labels:
8+
app.kubernetes.io/component: metrics
9+
app.kubernetes.io/created-by: bpfman-operator
10+
app.kubernetes.io/instance: agent-metrics-service
11+
app.kubernetes.io/managed-by: kustomize
12+
app.kubernetes.io/name: agent-metrics-service
13+
app.kubernetes.io/part-of: bpfman-operator
14+
name: bpfman-agent-metrics-service
15+
spec:
16+
ports:
17+
- name: https-metrics
18+
port: 8443
19+
protocol: TCP
20+
targetPort: https-metrics
21+
selector:
22+
name: bpfman-daemon
23+
status:
24+
loadBalancer: {}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
apiVersion: rbac.authorization.k8s.io/v1
2+
kind: ClusterRoleBinding
3+
metadata:
4+
creationTimestamp: null
5+
labels:
6+
app.kubernetes.io/component: metrics
7+
app.kubernetes.io/created-by: bpfman-operator
8+
app.kubernetes.io/instance: auth-delegator
9+
app.kubernetes.io/managed-by: kustomize
10+
app.kubernetes.io/name: clusterrolebinding
11+
app.kubernetes.io/part-of: bpfman-operator
12+
name: bpfman-auth-delegator
13+
roleRef:
14+
apiGroup: rbac.authorization.k8s.io
15+
kind: ClusterRole
16+
name: system:auth-delegator
17+
subjects:
18+
- kind: ServiceAccount
19+
name: bpfman-operator
20+
namespace: bpfman
21+
- kind: ServiceAccount
22+
name: bpfman-daemon
23+
namespace: bpfman

bundle/manifests/bpfman-config_v1_configmap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ data:
33
bpfman.agent.healthprobe.addr: :8175
44
bpfman.agent.image: quay.io/bpfman/bpfman-agent:latest
55
bpfman.agent.log.level: info
6-
bpfman.agent.metric.addr: 127.0.0.1:8174
6+
bpfman.agent.metric.addr: :8443
77
bpfman.image: quay.io/bpfman/bpfman:latest
88
bpfman.log.level: info
99
bpfman.toml: |
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
apiVersion: monitoring.coreos.com/v1
2+
kind: ServiceMonitor
3+
metadata:
4+
labels:
5+
app.kubernetes.io/component: metrics
6+
app.kubernetes.io/created-by: bpfman-operator
7+
app.kubernetes.io/instance: controller-manager-metrics-monitor
8+
app.kubernetes.io/managed-by: kustomize
9+
app.kubernetes.io/name: servicemonitor
10+
app.kubernetes.io/part-of: bpfman-operator
11+
control-plane: controller-manager
12+
name: bpfman-controller-manager-metrics-monitor
13+
spec:
14+
endpoints:
15+
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
16+
path: /metrics
17+
port: https-metrics
18+
scheme: https
19+
tlsConfig:
20+
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
21+
insecureSkipVerify: false
22+
serverName: bpfman-controller-manager-metrics-service.bpfman.svc
23+
selector:
24+
matchLabels:
25+
control-plane: controller-manager

bundle/manifests/bpfman-controller-manager-metrics-service_v1_service.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
apiVersion: v1
22
kind: Service
33
metadata:
4+
annotations:
5+
service.beta.openshift.io/serving-cert-secret-name: controller-manager-metrics-tls
46
creationTimestamp: null
57
labels:
6-
app.kubernetes.io/component: kube-rbac-proxy
8+
app.kubernetes.io/component: metrics
79
app.kubernetes.io/created-by: bpfman-operator
810
app.kubernetes.io/instance: controller-manager-metrics-service
911
app.kubernetes.io/managed-by: kustomize
@@ -13,10 +15,10 @@ metadata:
1315
name: bpfman-controller-manager-metrics-service
1416
spec:
1517
ports:
16-
- name: https
18+
- name: https-metrics
1719
port: 8443
1820
protocol: TCP
19-
targetPort: https
21+
targetPort: https-metrics
2022
selector:
2123
control-plane: controller-manager
2224
status:

bundle/manifests/bpfman-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: ClusterRole
33
metadata:
44
creationTimestamp: null
55
labels:
6-
app.kubernetes.io/component: kube-rbac-proxy
6+
app.kubernetes.io/component: metrics
77
app.kubernetes.io/created-by: bpfman-operator
88
app.kubernetes.io/instance: metrics-reader
99
app.kubernetes.io/managed-by: kustomize

bundle/manifests/bpfman-operator.clusterserviceversion.yaml

Lines changed: 17 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -998,7 +998,7 @@ metadata:
998998
capabilities: Basic Install
999999
categories: OpenShift Optional
10001000
containerImage: quay.io/bpfman/bpfman-operator:latest
1001-
createdAt: "2025-04-02T21:50:16Z"
1001+
createdAt: "2025-04-30T12:52:57Z"
10021002
description: The bpfman Operator is designed to manage eBPF programs for applications.
10031003
features.operators.openshift.io/cnf: "false"
10041004
features.operators.openshift.io/cni: "false"
@@ -1511,18 +1511,6 @@ spec:
15111511
- get
15121512
- list
15131513
- watch
1514-
- apiGroups:
1515-
- authentication.k8s.io
1516-
resources:
1517-
- tokenreviews
1518-
verbs:
1519-
- create
1520-
- apiGroups:
1521-
- authorization.k8s.io
1522-
resources:
1523-
- subjectaccessreviews
1524-
verbs:
1525-
- create
15261514
serviceAccountName: bpfman-operator
15271515
deployments:
15281516
- label:
@@ -1544,6 +1532,7 @@ spec:
15441532
metadata:
15451533
annotations:
15461534
kubectl.kubernetes.io/default-container: manager
1535+
service.beta.openshift.io/serving-cert-secret-name: controller-manager-metrics-tls
15471536
labels:
15481537
control-plane: controller-manager
15491538
spec:
@@ -1564,33 +1553,11 @@ spec:
15641553
values:
15651554
- linux
15661555
containers:
1567-
- args:
1568-
- --secure-listen-address=0.0.0.0:8443
1569-
- --upstream=http://127.0.0.1:8174/
1570-
- --logtostderr=true
1571-
- --v=0
1572-
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.0
1573-
name: kube-rbac-proxy
1574-
ports:
1575-
- containerPort: 8443
1576-
name: https
1577-
protocol: TCP
1578-
resources:
1579-
limits:
1580-
cpu: 500m
1581-
memory: 128Mi
1582-
requests:
1583-
cpu: 5m
1584-
memory: 64Mi
1585-
securityContext:
1586-
allowPrivilegeEscalation: false
1587-
capabilities:
1588-
drop:
1589-
- ALL
15901556
- args:
15911557
- --health-probe-bind-address=:8175
1592-
- --metrics-bind-address=127.0.0.1:8174
1558+
- --metrics-bind-address=:8443
15931559
- --leader-elect
1560+
- --cert-dir=/tmp/k8s-webhook-server/serving-certs
15941561
command:
15951562
- /bpfman-operator
15961563
env:
@@ -1605,6 +1572,10 @@ spec:
16051572
initialDelaySeconds: 15
16061573
periodSeconds: 20
16071574
name: bpfman-operator
1575+
ports:
1576+
- containerPort: 8443
1577+
name: https-metrics
1578+
protocol: TCP
16081579
readinessProbe:
16091580
httpGet:
16101581
path: /readyz
@@ -1616,17 +1587,25 @@ spec:
16161587
cpu: 500m
16171588
memory: 128Mi
16181589
requests:
1619-
cpu: 10m
1590+
cpu: 5m
16201591
memory: 64Mi
16211592
securityContext:
16221593
allowPrivilegeEscalation: false
16231594
capabilities:
16241595
drop:
16251596
- ALL
1597+
volumeMounts:
1598+
- mountPath: /tmp/k8s-webhook-server/serving-certs
1599+
name: controller-manager-metrics-tls
1600+
readOnly: true
16261601
securityContext:
16271602
runAsNonRoot: true
16281603
serviceAccountName: bpfman-operator
16291604
terminationGracePeriodSeconds: 10
1605+
volumes:
1606+
- name: controller-manager-metrics-tls
1607+
secret:
1608+
secretName: controller-manager-metrics-tls
16301609
permissions:
16311610
- rules:
16321611
- apiGroups:
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
apiVersion: rbac.authorization.k8s.io/v1
2+
kind: Role
3+
metadata:
4+
creationTimestamp: null
5+
name: bpfman-prometheus-k8s
6+
rules:
7+
- apiGroups:
8+
- ""
9+
resources:
10+
- pods
11+
- services
12+
- endpoints
13+
- configmaps
14+
- secrets
15+
verbs:
16+
- get
17+
- list
18+
- watch
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
apiVersion: rbac.authorization.k8s.io/v1
2+
kind: RoleBinding
3+
metadata:
4+
creationTimestamp: null
5+
name: bpfman-prometheus-k8s
6+
roleRef:
7+
apiGroup: rbac.authorization.k8s.io
8+
kind: Role
9+
name: bpfman-prometheus-k8s
10+
subjects:
11+
- kind: ServiceAccount
12+
name: prometheus-k8s
13+
namespace: openshift-monitoring

0 commit comments

Comments
 (0)