Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump v2 registry #1772

Merged
merged 8 commits into from
Apr 28, 2015
Merged

Bump v2 registry #1772

merged 8 commits into from
Apr 28, 2015

Conversation

ncdc
Copy link
Contributor

@ncdc ncdc commented Apr 16, 2015

No description provided.

@ncdc ncdc force-pushed the bump-v2-reg branch 3 times, most recently from 86f7716 to b9d98eb Compare April 16, 2015 20:07
@ncdc
Copy link
Contributor Author

ncdc commented Apr 16, 2015

Requires #1774 and Docker 1.6 before this can be merged

@ncdc ncdc force-pushed the bump-v2-reg branch 2 times, most recently from fd31b5f to 4d7ab18 Compare April 17, 2015 11:10
@ncdc
Copy link
Contributor Author

ncdc commented Apr 17, 2015

@smarterclayton I just added a commit that removes the simulated pull by id generator for the DockerImageReference struct. Now, if the referenced ID parses a digest, it uses v2 pull by id. Otherwise, it treats it as a tag (simulated v1 pull by id via tag).

@ncdc
Copy link
Contributor Author

ncdc commented Apr 17, 2015

I've got another force push coming that updates the registry codebase to the v2.0.0 tag...

@sdodson
Copy link
Member

sdodson commented Apr 20, 2015

@ncdc when you merge this please merge #1748

@ncdc
Copy link
Contributor Author

ncdc commented Apr 20, 2015

@sdodson thanks for the notice. I'm also wondering if we need some code in origin somewhere that prints a fatal message if the user tries to start up master/node with Docker < 1.6?

@markturansky
Copy link
Member

Thanks for the lesson on Fatal logging. LGTM from what I can tell :)

@sdodson
Copy link
Member

sdodson commented Apr 20, 2015

@ncdc Seems prudent for node though I have no idea how to do that, perhaps check for minimum api levels in the client?

You're welcome to yank that commit into this PR and close my PR so things are more atomic.

@smarterclayton
Copy link
Contributor

Kubelet does that, but we allow starting on master. Check the upstream kubelet min docker version health check code

On Apr 20, 2015, at 11:02 AM, Scott Dodson notifications@github.com wrote:

@ncdc Seems prudent for node though I have no idea how to do that, perhaps check for minimum api levels in the client?

You're welcome to yank that commit into this PR and close my PR so things are more atomic.

—
Reply to this email directly or view it on GitHub.

@ncdc ncdc force-pushed the bump-v2-reg branch 3 times, most recently from 08350bb to 9fc27a6 Compare April 20, 2015 18:27
@sdodson sdodson mentioned this pull request Apr 20, 2015
Closed
@ncdc ncdc force-pushed the bump-v2-reg branch 6 times, most recently from 60ec123 to 5a7b3ef Compare April 23, 2015 15:17
@ncdc ncdc changed the title [DO_NOT_MERGE] Bump v2 registry Bump v2 registry Apr 24, 2015
@smarterclayton
Copy link
Contributor

This is LGTM - let me know when the base and regular AMI's are built.

@ncdc
Copy link
Contributor Author

ncdc commented Apr 24, 2015

Just waiting on 1.6 RPMs

@ncdc
Copy link
Contributor Author

ncdc commented Apr 27, 2015

1.6 RPMs are available. https://ci.openshift.redhat.com/jenkins/job/openshift3_base_ami/600/ completed successfully for Fedora and it has 1.6. I've requested a new build of openshift3_ami.

@ncdc
Copy link
Contributor Author

ncdc commented Apr 27, 2015

[test]

@ncdc
Copy link
Contributor Author

ncdc commented Apr 27, 2015

spurious failure [test]

@smarterclayton
Copy link
Contributor

Doesn't have docker 1.6?

@ncdc
Copy link
Contributor Author

ncdc commented Apr 27, 2015

The ami with 1.6 won't build the release - that's the email from this morning.

Sent from my iPhone

On Apr 27, 2015, at 8:18 AM, Clayton Coleman notifications@github.com wrote:

Doesn't have docker 1.6?

—
Reply to this email directly or view it on GitHub.

@ncdc ncdc force-pushed the bump-v2-reg branch 3 times, most recently from 31d1a08 to 3c3dae5 Compare April 27, 2015 18:19
@ncdc
Copy link
Contributor Author

ncdc commented Apr 27, 2015

No whammies no whammies no whammies [test]

@ncdc
Copy link
Contributor Author

ncdc commented Apr 27, 2015

EC2 whammy :-( [test]

@ncdc
Copy link
Contributor Author

ncdc commented Apr 27, 2015

[test]

1 similar comment
@ncdc
Copy link
Contributor Author

ncdc commented Apr 27, 2015

[test]

@ncdc ncdc force-pushed the bump-v2-reg branch 3 times, most recently from 075faad to 626a199 Compare April 28, 2015 19:32
Andy Goldstein and others added 8 commits April 28, 2015 17:24
bump(docker/distribution):62b70f951f30a711a8a81df1865d0afeeaaa0169
b62b18e
UPSTREAM: add context to ManifestService methods
7975959
v2 registry updates
c98eb29 
Update initialization to more closely match upstream updates.

Clean up package structure for OpenShift auth and middleware.

Register /healthz handler that doesn't require authentication

Add liveness probe to 'openshift admin registry'

Switch to v2 registry for e2e tests

Temporarily disable v2 registry user auth - use the registry's identity for
the SAR check for access to the image stream.

Remove simulated pull by id generator

Remove simulated pull by id from v2 registry
Require Docker 1.6 for node startup
c86740d
@sdodson
[RPMs] Require docker >= 1.6.0
24f49eb
Add info about Docker 1.6 to README
4580b5e
Enable building v2 registry image
04bc45a
Update console for v2 image IDs
e56a017 
v2 images have the format <repo>@<digest>:<algorithm>.

Rename the 'imageName' filter to 'imageStreamName' and add code to
handle v2 pull by ID image names.

Make sure image names in the image streams page don't show the
algorithm.

Remove display of image short name in pod template, as it's not
informative at 10 characters and there's not room to display more.
@smarterclayton
Copy link
Contributor

[merge]

@openshift-bot
Copy link
Contributor

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

@openshift-bot
Copy link
Contributor

Evaluated for origin up to e56a017

openshift-bot pushed a commit that referenced this pull request Apr 28, 2015
Merge pull request #1772 from ncdc/bump-v2-reg
a0646bc 
Merged by openshift-bot
@openshift-bot openshift-bot merged commit a0646bc into openshift:master Apr 28, 2015
@liggitt liggitt mentioned this pull request May 8, 2015
Closed
jboyd01 pushed a commit to jboyd01/origin that referenced this pull request Mar 26, 2018
Squashed 'cmd/service-catalog/go/src/github.com/kubernetes-incubator/…
5727b08 
…service-catalog/' changes from c3e3071633..231772fcc0

231772fcc0 origin build: add origin tooling
98af588 v0.1.11 release changes
01e2f90 v0.1.10 release changes
49af948 clear polling queue before starting new operation (openshift#1855)
252958e Refactor common serviceclass validations (openshift#1858)
68f55c6 Catalog Controller should listen on https and serve metrics over TLS secured channel (openshift#1851)
5d0f773 Refactor common broker validations (openshift#1865)
eeaf285 Add NamespacedServiceBroker switch to helm chart (openshift#1864)
d2c960c Add NamespacedServiceBroker Feature (openshift#1863)
ef15310 Fix NamespaceScoped doc text for ns types (openshift#1862)
8d0a637 fix async deprovision retry (openshift#1832)
a918a16 Update registry code from serviceclass to clusterserviceclass (openshift#1852)
4dfd13c Bump dependency on go-open-service-broker-client to 0.0.6 (openshift#1856)
958b7cd Rename SharedServicePlanSpec to CommonServicePlanSpec (openshift#1850)
426aec3 pick a better random port to listen on in integration tests (openshift#1844)
6a59ada OrphanMitigation condition and different handling of retry timeout (openshift#1789)
c9b8f60 Extracting common broker spec elements into embeddable struct (openshift#1841)
3f8fab6 Extract common service class spec fields (openshift#1834)
93dab13 Support for OSB [PR#452](openservicebrokerapi/servicebroker#452). (openshift#1849)
5e1e90d [WIP] Pass correct plan ID in deprovision request (for both deleting and orphan mitigation) (openshift#1847)
74f73c0 disable tests for deployment stage (openshift#1845)
82fc6e4 Revert "Pass correct plan ID in deprovision request (for both deleting and orphan mitigation) (openshift#1803)" (openshift#1843)
94b5795 gitignore integration.test binary (openshift#1840)
014c468 Extracting common plan spec into embeddable struct (openshift#1833)
5d7041b Use k8s NewUUID method exclusively  (openshift#1836)
eac3f96 A new test was added after prechecks happened for last pr. (openshift#1838)
4b5d159 Pass correct plan ID in deprovision request (for both deleting and orphan mitigation) (openshift#1803)
cc02f0e [svcat] Adding a filter to get plan. (openshift#1758)
70afb56 reset RemovedFromBroker flag on plans that are re-added by broker (openshift#1824)
712dd4a Add behavior to print deleted instance name (openshift#1806)
55505be Update catalog charts README configuration (openshift#1823)
6426c98 Controller reconciliation rework - part 2 (ServiceBinding) (openshift#1819)
c606560 Integrate svcat docs with Service Catalog's (openshift#1784)
e9aeeb0 Synchronize some generated code that was missed along the way (openshift#1801)
a63ebf7 Fix failing test: TestReconcileServiceInstanceWithFailedCondition (openshift#1813)
07ef743 Controller reconciliation rework - part 1 (ServiceInstance) (openshift#1779)
a7d602b Export the touch instance command (openshift#1809)
bddb9a7 Allow retries for instances with Failed condition after spec changes (openshift#1751)
a777af5 Add enhanced parameter options to provision (openshift#1785)
fd1a0b9 Print deleted bindings (openshift#1799)
36d437a Adding the ability to sync a service instance (openshift#1762)
1f60676 Remove Failed condition if there was no terminal failure (openshift#1788)
cd831de allow brokers to respond to getCatalog() with no services (openshift#1772) (openshift#1781)
e5c37ad Add ObservedGeneration and Provisioned into ServiceInstanceStatus (openshift#1748)
9021d8b Add carolynvs to OWNERS (openshift#1780)
b7643d6 Add all-namespaces flag to svcat (openshift#1782)
01e652f Use docker to interact with files made by docker (openshift#1777)
REVERT: c3e3071633 origin build: add origin tooling

git-subtree-dir: cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog
git-subtree-split: 231772fcc00be08b6b2665a39c4a3bacb0b2271f
jboyd01 pushed a commit to jboyd01/origin that referenced this pull request Mar 27, 2018
Squashed 'cmd/service-catalog/go/src/github.com/kubernetes-incubator/…
8a3a80f 
…service-catalog/' changes from c3e3071633..231772fcc0

231772fcc0 origin build: add origin tooling
98af588 v0.1.11 release changes
01e2f90 v0.1.10 release changes
49af948 clear polling queue before starting new operation (openshift#1855)
252958e Refactor common serviceclass validations (openshift#1858)
68f55c6 Catalog Controller should listen on https and serve metrics over TLS secured channel (openshift#1851)
5d0f773 Refactor common broker validations (openshift#1865)
eeaf285 Add NamespacedServiceBroker switch to helm chart (openshift#1864)
d2c960c Add NamespacedServiceBroker Feature (openshift#1863)
ef15310 Fix NamespaceScoped doc text for ns types (openshift#1862)
8d0a637 fix async deprovision retry (openshift#1832)
a918a16 Update registry code from serviceclass to clusterserviceclass (openshift#1852)
4dfd13c Bump dependency on go-open-service-broker-client to 0.0.6 (openshift#1856)
958b7cd Rename SharedServicePlanSpec to CommonServicePlanSpec (openshift#1850)
426aec3 pick a better random port to listen on in integration tests (openshift#1844)
6a59ada OrphanMitigation condition and different handling of retry timeout (openshift#1789)
c9b8f60 Extracting common broker spec elements into embeddable struct (openshift#1841)
3f8fab6 Extract common service class spec fields (openshift#1834)
93dab13 Support for OSB [PR#452](openservicebrokerapi/servicebroker#452). (openshift#1849)
5e1e90d [WIP] Pass correct plan ID in deprovision request (for both deleting and orphan mitigation) (openshift#1847)
74f73c0 disable tests for deployment stage (openshift#1845)
82fc6e4 Revert "Pass correct plan ID in deprovision request (for both deleting and orphan mitigation) (openshift#1803)" (openshift#1843)
94b5795 gitignore integration.test binary (openshift#1840)
014c468 Extracting common plan spec into embeddable struct (openshift#1833)
5d7041b Use k8s NewUUID method exclusively  (openshift#1836)
eac3f96 A new test was added after prechecks happened for last pr. (openshift#1838)
4b5d159 Pass correct plan ID in deprovision request (for both deleting and orphan mitigation) (openshift#1803)
cc02f0e [svcat] Adding a filter to get plan. (openshift#1758)
70afb56 reset RemovedFromBroker flag on plans that are re-added by broker (openshift#1824)
712dd4a Add behavior to print deleted instance name (openshift#1806)
55505be Update catalog charts README configuration (openshift#1823)
6426c98 Controller reconciliation rework - part 2 (ServiceBinding) (openshift#1819)
c606560 Integrate svcat docs with Service Catalog's (openshift#1784)
e9aeeb0 Synchronize some generated code that was missed along the way (openshift#1801)
a63ebf7 Fix failing test: TestReconcileServiceInstanceWithFailedCondition (openshift#1813)
07ef743 Controller reconciliation rework - part 1 (ServiceInstance) (openshift#1779)
a7d602b Export the touch instance command (openshift#1809)
bddb9a7 Allow retries for instances with Failed condition after spec changes (openshift#1751)
a777af5 Add enhanced parameter options to provision (openshift#1785)
fd1a0b9 Print deleted bindings (openshift#1799)
36d437a Adding the ability to sync a service instance (openshift#1762)
1f60676 Remove Failed condition if there was no terminal failure (openshift#1788)
cd831de allow brokers to respond to getCatalog() with no services (openshift#1772) (openshift#1781)
e5c37ad Add ObservedGeneration and Provisioned into ServiceInstanceStatus (openshift#1748)
9021d8b Add carolynvs to OWNERS (openshift#1780)
b7643d6 Add all-namespaces flag to svcat (openshift#1782)
01e652f Use docker to interact with files made by docker (openshift#1777)
REVERT: c3e3071633 origin build: add origin tooling

git-subtree-dir: cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog
git-subtree-split: 231772fcc00be08b6b2665a39c4a3bacb0b2271f
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@ncdc @sdodson @markturansky @smarterclayton @openshift-bot