Skip to content

Commit 720d3e3

Browse files
committed
fix(kustomize): update stale RBAC resource filename
The file was renamed from rbgs_controller_role.yaml to role.yaml in 23dd17d but the kustomization.yaml reference was not updated, breaking `kustomize build config/default`.
1 parent fa5c8d5 commit 720d3e3

4 files changed

Lines changed: 77 additions & 69 deletions

File tree

config/crd/kustomization.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,15 @@
22
# since it depends on service name and namespace that are out of this kustomize package.
33
# It should be run by config/default
44
resources:
5-
- bases/workloads.x-k8s.io_rolebasedgroups.yaml
6-
- bases/workloads.x-k8s.io_rolebasedgroupsets.yaml
75
- bases/workloads.x-k8s.io_clusterengineruntimeprofiles.yaml
6+
- bases/workloads.x-k8s.io_coordinatedpolicies.yaml
7+
- bases/workloads.x-k8s.io_instances.yaml
8+
- bases/workloads.x-k8s.io_instancesets.yaml
9+
- bases/workloads.x-k8s.io_rolebasedgroups.yaml
810
- bases/workloads.x-k8s.io_rolebasedgroupscalingadapters.yaml
11+
- bases/workloads.x-k8s.io_rolebasedgroupsets.yaml
12+
- bases/workloads.x-k8s.io_roleinstances.yaml
13+
- bases/workloads.x-k8s.io_roleinstancesets.yaml
914
# +kubebuilder:scaffold:crdkustomizeresource
1015

1116
patches:

config/manager/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ resources:
55
images:
66
- name: controller
77
newName: rolebasedgroup/rbgs-controller
8-
newTag: v0.3.2-4c0f843
8+
newTag: v0.7.0-c1350c82

config/rbac/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
resources:
2-
- rbgs_controller_role.yaml
2+
- role.yaml
33
- role_binding.yaml
44
- service_account.yaml

deploy/kubectl/manifests.yaml

Lines changed: 68 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ apiVersion: v1
22
kind: Namespace
33
metadata:
44
labels:
5+
app.kubernetes.io/managed-by: kustomize
56
app.kubernetes.io/name: rbgs
67
control-plane: rbgs-controller
78
name: rbgs-system
89
---
9-
---
1010
apiVersion: apiextensions.k8s.io/v1
1111
kind: CustomResourceDefinition
1212
metadata:
@@ -8649,7 +8649,6 @@ spec:
86498649
subresources:
86508650
status: {}
86518651
---
8652-
---
86538652
apiVersion: apiextensions.k8s.io/v1
86548653
kind: CustomResourceDefinition
86558654
metadata:
@@ -8702,6 +8701,10 @@ spec:
87028701
description: CoordinatedPolicyRule defines the coordination policy
87038702
rule for a set of roles.
87048703
properties:
8704+
name:
8705+
description: Name specifies the name of this policy rule.
8706+
minLength: 1
8707+
type: string
87058708
roles:
87068709
description: Roles specifies the names of the roles that this
87078710
policy applies to.
@@ -8764,11 +8767,15 @@ spec:
87648767
type: object
87658768
type: object
87668769
required:
8770+
- name
87678771
- roles
87688772
- strategy
87698773
type: object
87708774
minItems: 1
87718775
type: array
8776+
x-kubernetes-list-map-keys:
8777+
- name
8778+
x-kubernetes-list-type: map
87728779
required:
87738780
- policies
87748781
type: object
@@ -8839,7 +8846,6 @@ spec:
88398846
subresources:
88408847
status: {}
88418848
---
8842-
---
88438849
apiVersion: apiextensions.k8s.io/v1
88448850
kind: CustomResourceDefinition
88458851
metadata:
@@ -8890,7 +8896,7 @@ spec:
88908896
metadata:
88918897
type: object
88928898
spec:
8893-
description: InstanceSpec defines the desired state ofInstance
8899+
description: InstanceSpec defines the desired state of Instance
88948900
properties:
88958901
components:
88968902
description: Components is a list of components, each of which specifies
@@ -8981,7 +8987,7 @@ spec:
89818987
- components
89828988
type: object
89838989
status:
8984-
description: InstanceStatus defines the observed state ofInstance
8990+
description: InstanceStatus defines the observed state of Instance
89858991
properties:
89868992
collisionCount:
89878993
description: CollisionCount is the count of hash collisions for the
@@ -9007,8 +9013,8 @@ spec:
90079013
format: int32
90089014
type: integer
90099015
replicas:
9010-
description: Size is the number of Pod for Instance that match
9011-
the component.
9016+
description: Replicas is the number of Pod for Instance that
9017+
match the component.
90129018
format: int32
90139019
type: integer
90149020
scheduledReplicas:
@@ -9090,7 +9096,6 @@ spec:
90909096
subresources:
90919097
status: {}
90929098
---
9093-
---
90949099
apiVersion: apiextensions.k8s.io/v1
90959100
kind: CustomResourceDefinition
90969101
metadata:
@@ -9461,7 +9466,6 @@ spec:
94619466
statusReplicasPath: .status.replicas
94629467
status: {}
94639468
---
9464-
---
94659469
apiVersion: apiextensions.k8s.io/v1
94669470
kind: CustomResourceDefinition
94679471
metadata:
@@ -49855,11 +49859,11 @@ spec:
4985549859
The underlying workload will use InstanceSet.
4985649860
properties:
4985749861
apiVersion:
49858-
default: workloads.x-k8s.io/v1alpha1
49862+
default: workloads.x-k8s.io/v1alpha2
4985949863
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/v[0-9]+((alpha|beta)[0-9]+)?$
4986049864
type: string
4986149865
kind:
49862-
default: InstanceSet
49866+
default: RoleInstanceSet
4986349867
type: string
4986449868
type: object
4986549869
required:
@@ -49974,7 +49978,6 @@ spec:
4997449978
subresources:
4997549979
status: {}
4997649980
---
49977-
---
4997849981
apiVersion: apiextensions.k8s.io/v1
4997949982
kind: CustomResourceDefinition
4998049983
metadata:
@@ -50169,7 +50172,6 @@ spec:
5016950172
statusReplicasPath: .status.replicas
5017050173
status: {}
5017150174
---
50172-
---
5017350175
apiVersion: apiextensions.k8s.io/v1
5017450176
kind: CustomResourceDefinition
5017550177
metadata:
@@ -91663,11 +91665,11 @@ spec:
9166391665
The underlying workload will use InstanceSet.
9166491666
properties:
9166591667
apiVersion:
91666-
default: workloads.x-k8s.io/v1alpha1
91668+
default: workloads.x-k8s.io/v1alpha2
9166791669
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/v[0-9]+((alpha|beta)[0-9]+)?$
9166891670
type: string
9166991671
kind:
91670-
default: InstanceSet
91672+
default: RoleInstanceSet
9167191673
type: string
9167291674
type: object
9167391675
required:
@@ -91772,7 +91774,6 @@ spec:
9177291774
statusReplicasPath: .status.replicas
9177391775
status: {}
9177491776
---
91775-
---
9177691777
apiVersion: apiextensions.k8s.io/v1
9177791778
kind: CustomResourceDefinition
9177891779
metadata:
@@ -91991,7 +91992,6 @@ spec:
9199191992
subresources:
9199291993
status: {}
9199391994
---
91994-
---
9199591995
apiVersion: apiextensions.k8s.io/v1
9199691996
kind: CustomResourceDefinition
9199791997
metadata:
@@ -92129,10 +92129,12 @@ spec:
9212992129
format: int32
9213092130
type: integer
9213192131
revisionHistoryLimit:
92132+
default: 10
9213292133
description: |-
9213392134
RevisionHistoryLimit is the maximum number of revisions that will
9213492135
be maintained in the RoleInstanceSet's revision history.
9213592136
format: int32
92137+
minimum: 0
9213692138
type: integer
9213792139
roleInstanceTemplate:
9213892140
description: RoleInstanceTemplate describes the data a role instance
@@ -92370,11 +92372,19 @@ spec:
9237092372
statusReplicasPath: .status.replicas
9237192373
status: {}
9237292374
---
92373-
# Source: rbgs/templates/clusterrole.yaml
92375+
apiVersion: v1
92376+
kind: ServiceAccount
92377+
metadata:
92378+
labels:
92379+
app.kubernetes.io/managed-by: kustomize
92380+
app.kubernetes.io/name: rbgs
92381+
name: rbgs-rbgs-controller-sa
92382+
namespace: rbgs-system
92383+
---
9237492384
apiVersion: rbac.authorization.k8s.io/v1
9237592385
kind: ClusterRole
9237692386
metadata:
92377-
name: rbgs-controller-role
92387+
name: rbgs-rbgs-controller-role
9237892388
rules:
9237992389
- apiGroups:
9238092390
- ""
@@ -92539,65 +92549,58 @@ rules:
9253992549
verbs:
9254092550
- update
9254192551
---
92542-
# Source: rbgs/templates/manager.yaml
92552+
apiVersion: rbac.authorization.k8s.io/v1
92553+
kind: ClusterRoleBinding
92554+
metadata:
92555+
labels:
92556+
app.kubernetes.io/managed-by: kustomize
92557+
app.kubernetes.io/name: rbgs
92558+
name: rbgs-rbgs-controller-rolebinding
92559+
roleRef:
92560+
apiGroup: rbac.authorization.k8s.io
92561+
kind: ClusterRole
92562+
name: rbgs-rbgs-controller-role
92563+
subjects:
92564+
- kind: ServiceAccount
92565+
name: rbgs-rbgs-controller-sa
92566+
namespace: rbgs-system
92567+
---
9254392568
apiVersion: apps/v1
9254492569
kind: Deployment
9254592570
metadata:
92546-
name: rbgs-controller-manager
92547-
namespace: rbgs-system
9254892571
labels:
92572+
app.kubernetes.io/managed-by: kustomize
92573+
app.kubernetes.io/name: rbgs
9254992574
control-plane: rbgs-controller
92575+
name: rbgs-rbgs-controller-manager
92576+
namespace: rbgs-system
9255092577
spec:
9255192578
replicas: 2
9255292579
selector:
9255392580
matchLabels:
92581+
app.kubernetes.io/name: rbgs
9255492582
control-plane: rbgs-controller
9255592583
template:
9255692584
metadata:
9255792585
labels:
92586+
app.kubernetes.io/name: rbgs
9255892587
control-plane: rbgs-controller
9255992588
spec:
92560-
serviceAccountName: rbgs-controller-sa
92561-
securityContext:
92562-
{}
9256392589
containers:
92564-
- name: rbgs
92565-
args:
92566-
- --metrics-bind-address=:8443
92567-
- --leader-elect
92568-
- --health-probe-bind-address=:8081
92569-
- --scheduler-name=scheduler-plugins
92570-
command:
92571-
- /manager
92572-
securityContext:
92573-
{}
92574-
image: "rolebasedgroup/rbgs-controller:v0.7.0-91bfb7e"
92575-
imagePullPolicy: IfNotPresent
92576-
resources:
92577-
limits:
92578-
cpu: 1000m
92579-
memory: 1536Mi
92580-
requests:
92581-
cpu: 100m
92582-
memory: 256Mi
92583-
---
92584-
# Source: rbgs/templates/rolebinding.yaml
92585-
apiVersion: rbac.authorization.k8s.io/v1
92586-
kind: ClusterRoleBinding
92587-
metadata:
92588-
name: rbgs-controller-rolebinding
92589-
roleRef:
92590-
apiGroup: rbac.authorization.k8s.io
92591-
kind: ClusterRole
92592-
name: rbgs-controller-role
92593-
subjects:
92594-
- kind: ServiceAccount
92595-
name: rbgs-controller-sa
92596-
namespace: rbgs-system
92597-
---
92598-
# Source: rbgs/templates/serviceaccount.yaml
92599-
apiVersion: v1
92600-
kind: ServiceAccount
92601-
metadata:
92602-
name: rbgs-controller-sa
92603-
namespace: rbgs-system
92590+
- args:
92591+
- --metrics-bind-address=:8443
92592+
- --leader-elect
92593+
- --health-probe-bind-address=:8081
92594+
command:
92595+
- /manager
92596+
image: rolebasedgroup/rbgs-controller:v0.7.0-c1350c82
92597+
imagePullPolicy: IfNotPresent
92598+
name: rbgs
92599+
resources:
92600+
limits:
92601+
cpu: 1000m
92602+
memory: 1536Mi
92603+
requests:
92604+
cpu: 100m
92605+
memory: 256Mi
92606+
serviceAccountName: rbgs-rbgs-controller-sa

0 commit comments

Comments
 (0)