Skip to content

Conversation

@deads2k
Copy link
Contributor

@deads2k deads2k commented Mar 18, 2015

Fixes #1336

This pulls the bootstrap policy out into a separate config stanza. It changes the bootstrapping rules to prevent the "ensure" loop from running. Bootstrap policy is written to a file and that file is referenced from the master config.

Two new commands are added for create-bootstrap-policy-file and overwrite-policy. The names aren't congruent because they do different things. One of them creates a template file based on the bootstrap policy in code. The other takes any template file containing policy and forcibly writes it directly into etcd.

Both commands are called from inside of starting the master. A separate integration test makes sure that overwriting the created file works correctly after all permissions are removed.

@liggitt

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

default these or make them specify them? I'm hesitant to default anything for this command

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that it can be generated with the create-bootstrap-policy-file command if they don't have one handy

@deads2k
Copy link
Contributor Author

deads2k commented Mar 18, 2015

comments addressed. Fixing all references to "master" is a separate pull.

@deads2k deads2k force-pushed the deads-write-bootstrap-config branch 2 times, most recently from 1fd6533 to 662a1c5 Compare March 18, 2015 17:52
@deads2k
Copy link
Contributor Author

deads2k commented Mar 18, 2015

grrr, commit -a versus add . . Added for real this time.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what does this mean?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what does this mean?

Depends on which visitors you chain to, but in this case, "skip any file you can't read". It made a lot more sense when using a directory.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed.

@liggitt
Copy link
Contributor

liggitt commented Mar 18, 2015

LGTM

@deads2k deads2k force-pushed the deads-write-bootstrap-config branch from 912807b to 50e29ee Compare March 18, 2015 18:07
@liggitt
Copy link
Contributor

liggitt commented Mar 18, 2015

Actually, did you want to take ensureComponentAuthorizationRules out of the forever loop in this PR?

@deads2k
Copy link
Contributor Author

deads2k commented Mar 18, 2015

[merge]

@deads2k
Copy link
Contributor Author

deads2k commented Mar 18, 2015

Actually, did you want to take ensureComponentAuthorizationRules out of the forever loop in this PR?

already did.

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_openshift3/1210/) (Image: devenv-fedora_1072)

@deads2k deads2k force-pushed the deads-write-bootstrap-config branch from 50e29ee to 625baf4 Compare March 18, 2015 18:11
@deads2k
Copy link
Contributor Author

deads2k commented Mar 18, 2015

[merge] just in case I missed the boat.

@deads2k deads2k force-pushed the deads-write-bootstrap-config branch from 625baf4 to ad916a8 Compare March 18, 2015 19:27
@deads2k
Copy link
Contributor Author

deads2k commented Mar 18, 2015

gofmt [merge]

@openshift-bot
Copy link
Contributor

Evaluated for origin up to ad916a8

openshift-bot pushed a commit that referenced this pull request Mar 18, 2015
@openshift-bot openshift-bot merged commit f21cce2 into openshift:master Mar 18, 2015
@deads2k deads2k deleted the deads-write-bootstrap-config branch March 31, 2015 18:52
jboyd01 pushed a commit to jboyd01/origin that referenced this pull request Oct 17, 2017
…service-catalog/' changes from 3aacfedec6..aa27078754

aa27078754 origin build: add origin tooling
bcf37fd 0.1.0-rc2 chart updates (openshift#1410)
4ab0a0a add back 'Processing' message for instance deletion (openshift#1332)
0ecbcb1 Update logs for Cluster service plans. (openshift#1389)
8b491ef Fix a quoting nit (openshift#1400)
63685e4 add orphan mitigation-specific conditions for instances (openshift#1378)
adee662 Updated missed fields in service and plan specs (openshift#1406)
2095919 Handle default plan setting when using k8s names (openshift#1405)
607ba66 Document rbacEnable. (openshift#1404)
268294e Adding rbac definition for v1 api endpoint. (openshift#1284)
103288d differentiate between failed updates and provisions during deletion (openshift#1383)
eba8ba4 enable API aggregation and Service Catalog RBAC on Jenkins (openshift#1333)
5a93315 Validate relistDuration is non-negative (openshift#1395)
e279d21 Fix log messages for secrets (openshift#1385)
87fa8c9 fix status update when starting orphan mitigation (openshift#1372)
11f18f3 Switch to wget for integration apiserver checks (openshift#1384)
8c44a7d update OSB client to 2.13 (openshift#1392)
e64bbd1 default plan admission controller: filter list of service plans/service classes by the class name (openshift#1351)
6648c0e Check field names. Fix issue 1291 (openshift#1379)
5319841 update comment for instance generation check (openshift#1382)
7d5823f remove internal poll method (openshift#1381)
07d3068 Rework the logging for controller_instance. (openshift#1371)
5f4ca01 address PR comment as a followup (openshift#1380)
485d5e6 Add support for specifying plan using K8S names. (openshift#1377)
662bba8 Log number of secret keys created for binding credential (openshift#1375)
8ad6a31 Move controller constants into correct files (openshift#1373)
7bd66dd Adding type to log. (openshift#1339)
1ce5c4d Remove k8s/k8s dependency (openshift#1355)
b458323 Adding log formatting for BindingController. (openshift#1352)
275eb11 rename test variables to be consistent (openshift#1315)
ffd6b8b travis: skip cleanup before deploy (openshift#1368)
d5ecc04 fix travis tag checker (openshift#1365)
2cae0ee Minor updates to README (openshift#1360)
REVERT: 3aacfedec6 carry: Set external plan name for service-catalog walkthrough
REVERT: 3ec9e5b07a origin build: add origin tooling

git-subtree-dir: cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog
git-subtree-split: aa2707875461dd51be3731b1d94b5cfc3b9a3976
jpeeler pushed a commit to jpeeler/origin that referenced this pull request Feb 1, 2018
* Copy used types from k8s/k8s repo to Service Catalog codebase

* Remove dependency on k8s/k8s repo

* Update vendor dir (remove vendored k8s/k8s)

* FIx conversion-gen, stop importing k8s/k8s packages

* Copy init scripts from k8s/k8s, needed for running integration tests

* Update etcd version

* Removed unused scripts
sttts pushed a commit to sttts/origin that referenced this pull request Aug 26, 2019
…-mount-prop-fix-flexvolume

Revert "UPSTREAM: 65549: Fix flexvolumes in containerized envs"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

config - write out bootstrap roles and role bindings

3 participants