mirror of
https://github.com/kubernetes-sigs/node-feature-discovery.git
synced 2024-12-14 11:57:51 +00:00
deployment/kustomize: support nfd-gc
Rename the old "topology-gc" to just "gc". Simplify the setup a bit by including the RBAC rules in the "gc" base. Note: we don't enable nfd-gc in the default overlay, yet, as the NodeFeature API isn't enabled (gc is not needed).
This commit is contained in:
parent
f9fadd2102
commit
6cf29bd8ef
8 changed files with 24 additions and 25 deletions
|
@ -1,7 +1,7 @@
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
metadata:
|
metadata:
|
||||||
name: nfd-topology-gc
|
name: nfd-gc
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
- ""
|
- ""
|
||||||
|
@ -23,3 +23,10 @@ rules:
|
||||||
verbs:
|
verbs:
|
||||||
- delete
|
- delete
|
||||||
- list
|
- list
|
||||||
|
- apiGroups:
|
||||||
|
- nfd.k8s-sigs.io
|
||||||
|
resources:
|
||||||
|
- nodefeatures
|
||||||
|
verbs:
|
||||||
|
- delete
|
||||||
|
- list
|
|
@ -1,12 +1,12 @@
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: ClusterRoleBinding
|
kind: ClusterRoleBinding
|
||||||
metadata:
|
metadata:
|
||||||
name: nfd-topology-gc
|
name: nfd-gc
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
name: nfd-topology-gc
|
name: nfd-gc
|
||||||
subjects:
|
subjects:
|
||||||
- kind: ServiceAccount
|
- kind: ServiceAccount
|
||||||
name: nfd-topology-gc
|
name: nfd-gc
|
||||||
namespace: default
|
namespace: default
|
|
@ -1,4 +1,4 @@
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ServiceAccount
|
kind: ServiceAccount
|
||||||
metadata:
|
metadata:
|
||||||
name: nfd-topology-gc
|
name: nfd-gc
|
|
@ -3,21 +3,21 @@ kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
app: nfd
|
app: nfd
|
||||||
name: nfd-topology-gc
|
name: nfd-gc
|
||||||
spec:
|
spec:
|
||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
app: nfd-topology-gc
|
app: nfd-gc
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
app: nfd-topology-gc
|
app: nfd-gc
|
||||||
spec:
|
spec:
|
||||||
dnsPolicy: ClusterFirstWithHostNet
|
dnsPolicy: ClusterFirstWithHostNet
|
||||||
serviceAccount: nfd-topology-gc
|
serviceAccount: nfd-gc
|
||||||
containers:
|
containers:
|
||||||
- name: nfd-topology-gc
|
- name: nfd-gc
|
||||||
image: gcr.io/k8s-staging-nfd/node-feature-discovery:master
|
image: gcr.io/k8s-staging-nfd/node-feature-discovery:master
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
command:
|
command:
|
||||||
- "nfd-topology-gc"
|
- "nfd-gc"
|
|
@ -4,4 +4,7 @@ kind: Kustomization
|
||||||
namespace: node-feature-discovery
|
namespace: node-feature-discovery
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
- topology-gc.yaml
|
- gc-clusterrole.yaml
|
||||||
|
- gc-clusterrolebinding.yaml
|
||||||
|
- gc-serviceaccount.yaml
|
||||||
|
- gc.yaml
|
|
@ -1,9 +0,0 @@
|
||||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
|
||||||
kind: Kustomization
|
|
||||||
|
|
||||||
namespace: node-feature-discovery
|
|
||||||
|
|
||||||
resources:
|
|
||||||
- topology-gc-clusterrole.yaml
|
|
||||||
- topology-gc-clusterrolebinding.yaml
|
|
||||||
- topology-gc-serviceaccount.yaml
|
|
|
@ -6,13 +6,12 @@ namespace: node-feature-discovery
|
||||||
resources:
|
resources:
|
||||||
- ../../base/rbac
|
- ../../base/rbac
|
||||||
- ../../base/rbac-topologyupdater
|
- ../../base/rbac-topologyupdater
|
||||||
- ../../base/rbac-topology-gc
|
|
||||||
- ../../base/nfd-crds
|
- ../../base/nfd-crds
|
||||||
- ../../base/master
|
- ../../base/master
|
||||||
- ../../base/worker-daemonset
|
- ../../base/worker-daemonset
|
||||||
- ../../base/noderesourcetopologies-crd
|
- ../../base/noderesourcetopologies-crd
|
||||||
- ../../base/topologyupdater-daemonset
|
- ../../base/topologyupdater-daemonset
|
||||||
- ../../base/topology-gc
|
- ../../base/gc
|
||||||
- namespace.yaml
|
- namespace.yaml
|
||||||
|
|
||||||
components:
|
components:
|
||||||
|
|
|
@ -5,10 +5,9 @@ namespace: node-feature-discovery
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
- ../../base/rbac-topologyupdater
|
- ../../base/rbac-topologyupdater
|
||||||
- ../../base/rbac-topology-gc
|
|
||||||
- ../../base/noderesourcetopologies-crd
|
- ../../base/noderesourcetopologies-crd
|
||||||
- ../../base/topologyupdater-daemonset
|
- ../../base/topologyupdater-daemonset
|
||||||
- ../../base/topology-gc
|
- ../../base/gc
|
||||||
- namespace.yaml
|
- namespace.yaml
|
||||||
|
|
||||||
components:
|
components:
|
||||||
|
|
Loading…
Reference in a new issue