Skip to content

Commit 938b858

Browse files
authored
Merge pull request kubernetes#2548 from jiahuif/kep-2436/config-fix
(KEP-2436) fix errors in sample configuration and formatting.
2 parents 0e4d5df + 0625740 commit 938b858

File tree

1 file changed

+14
-13
lines changed
  • keps/sig-cloud-provider/2436-controller-manager-leader-migration

1 file changed

+14
-13
lines changed

keps/sig-cloud-provider/2436-controller-manager-leader-migration/README.md

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -157,24 +157,25 @@ type LeaderMigrationConfiguration struct {
157157
LeaderName string `json:"leaderName"`
158158

159159
// ResourceLock indicates the resource object type that will be used to lock
160-
// Must be either "leases" or "endpoints", defaults to 'leases'
161-
// No other types (e.g. "endpointsleases" or "configmapsleases") are allowed
162-
ResourceLock string
160+
// Must be either "leases" or "endpoints", defaults to 'leases'
161+
// No other types (e.g. "endpointsleases" or "configmapsleases") are allowed
162+
ResourceLock string
163163

164-
// ControllerLeaders contains a list of migrating leader lock configurations
165-
ControllerLeaders []ControllerLeaderConfiguration `json:"controllerLeaders"`
164+
// ControllerLeaders contains a list of migrating leader lock configurations
165+
ControllerLeaders []ControllerLeaderConfiguration `json:"controllerLeaders"`
166166
}
167167

168168
// ControllerLeaderConfiguration provides the configuration for a migrating leader lock.
169169
type ControllerLeaderConfiguration struct {
170-
// Name is the name of the controller being migrated
171-
// E.g. service-controller, route-controller, cloud-node-controller, etc
172-
Name string `json:"name"`
170+
// Name is the name of the controller being migrated
171+
// E.g. service-controller, route-controller, cloud-node-controller, etc
172+
Name string `json:"name"`
173173

174-
// Component is the name of the component in which the controller will be running.
175-
// E.g. kube-controller-manager, cloud-controller-manager, etc
176-
Component string `json:"component"`
174+
// Component is the name of the component in which the controller will be running.
175+
// E.g. kube-controller-manager, cloud-controller-manager, etc
176+
Component string `json:"component"`
177177
}
178+
178179
```
179180

180181
#### Default LeaderMigrationConfiguration
@@ -228,7 +229,7 @@ The provided default configuration will be equivalent to the following:
228229

229230
```yaml
230231
kind: LeaderMigrationConfiguration
231-
apiVersion: v1alpha1
232+
apiVersion: controllermanager.config.k8s.io/v1alpha1
232233
leaderName: cloud-provider-extraction-migration
233234
resourceLock: leases
234235
controllerLeaders:
@@ -266,7 +267,7 @@ following:
266267

267268
```yaml
268269
kind: LeaderMigrationConfiguration
269-
apiVersion: v1alpha1
270+
apiVersion: controllermanager.config.k8s.io/v1alpha1
270271
leaderName: cloud-provider-extraction-migration
271272
resourceLock: leases
272273
controllerLeaders:

0 commit comments

Comments
 (0)