Skip to content

Conversation

@ncdc
Copy link
Contributor

@ncdc ncdc commented Feb 26, 2015

Modify ImageRepositoryMapping so it doesn't fail if the image specified
already exists.

Fixes #1154

@ncdc
Copy link
Contributor Author

ncdc commented Feb 26, 2015

@bparees @smarterclayton PTAL

@ncdc
Copy link
Contributor Author

ncdc commented Feb 26, 2015

[test]

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_openshift3/1184/)

@smarterclayton
Copy link
Contributor

Create was not supposed to fail if it exists, however this is less surprising to users and the behavior is fine.

@ncdc
Copy link
Contributor Author

ncdc commented Feb 26, 2015

@smarterclayton I'm not sure I understand what you mean.

@ncdc
Copy link
Contributor Author

ncdc commented Feb 26, 2015

Are you saying we should modify image create so it doesn't fail if the image already exists?

@smarterclayton
Copy link
Contributor

I'm saying that was the original intent, but it's fine if this code gets added. It reduces the difference between images and the rest of the system.

On Feb 26, 2015, at 6:37 AM, Andy Goldstein [email protected] wrote:

@smarterclayton I'm not sure I understand what you mean.


Reply to this email directly or view it on GitHub.

@ncdc
Copy link
Contributor Author

ncdc commented Feb 26, 2015

Looks like I need to update an integration test too...

@ncdc ncdc force-pushed the allow-multiple-tags-with-same-image-id branch from 1038039 to ed8199d Compare February 26, 2015 16:09
@ncdc
Copy link
Contributor Author

ncdc commented Feb 26, 2015

[test]

Modify ImageRepositoryMapping so it doesn't fail if the image specified
already exists.

Fixes openshift#1154
@ncdc ncdc force-pushed the allow-multiple-tags-with-same-image-id branch from ed8199d to a9c9d5f Compare February 26, 2015 17:38
@ncdc
Copy link
Contributor Author

ncdc commented Feb 26, 2015

Not sure why Jenkins failed with this:

   --- FAIL: TestSimpleImageChangeBuildTrigger (0.09 seconds)
    deploy_trigger_test.go:317: Starting test openshift
    imagechange_buildtrigger_test.go:69: Expected build with base image registry:8080/openshift/test-image-trigger:ref-2, got registry:8080/openshift/test-image-trigger:ref-1

It works for me locally.

Let's try another [test]

@bparees
Copy link
Contributor

bparees commented Feb 26, 2015

Talk to michal and Maciej, they were looking into this failure. I think it's sporadic.

Ben Parees | OpenShift

-----Original Message-----
From: Andy Goldstein [[email protected]]
Received: Thursday, 26 Feb 2015, 12:39
To: openshift/origin [[email protected]]
CC: Ben Parees [[email protected]]
Subject: Re: [origin] Allow multiple tags to refer to the same image (#1163)

Not sure why Jenkins failed with this:

   --- FAIL: TestSimpleImageChangeBuildTrigger (0.09 seconds)
    deploy_trigger_test.go:317: Starting test openshift
    imagechange_buildtrigger_test.go:69: Expected build with base image registry:8080/openshift/test-image-trigger:ref-2, got registry:8080/openshift/test-image-trigger:ref-1

It works for me locally.

Let's try another [test]


Reply to this email directly or view it on GitHub:
#1163 (comment)

@ncdc
Copy link
Contributor Author

ncdc commented Feb 26, 2015

Alright, 2 clean jenkins runs. @bparees @smarterclayton let me know if this is ok or needs anything else

@bparees
Copy link
Contributor

bparees commented Feb 26, 2015

this fixes my problem so i'm going to [merge] it.

@openshift-bot
Copy link
Contributor

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

@openshift-bot
Copy link
Contributor

Evaluated for origin up to a9c9d5f

openshift-bot pushed a commit that referenced this pull request Feb 27, 2015
@openshift-bot openshift-bot merged commit 774f8bb into openshift:master Feb 27, 2015
@ncdc ncdc deleted the allow-multiple-tags-with-same-image-id branch March 17, 2015 12:59
jpeeler pushed a commit to jpeeler/origin that referenced this pull request Sep 5, 2017
…service-catalog/' changes from 7e650e7e39..ef63307bdb

ef63307bdb origin build: add origin tooling
a876fe3 v0.0.17 (openshift#1178)
c5237fe correct osbapi service definition (openshift#1177)
6036d4e Adding walkthrough instructions for 1.7 (openshift#1171)
5f111dd Specifying that you need Helm v2.5.0 for installation (openshift#1170)
08043bd Adding more small fixes to the walkthrough & install docs (openshift#1169)
d65d4a1 rbac targets needed to be renamed as well (openshift#1161)
590f6f2 Write helm command to file for api aggregation (openshift#1141)
49ddcf6 clean before building a specific arch (openshift#1168)
43f7cfb Splitting up the Walkthrough for 1.6 and 1.7 instructions (openshift#1163)
02e0217 Updates to README (openshift#1166)
57f2aa5 Adding instructions for installing from Macs (openshift#1164)
dfe620e fix rate-limiting for polling queue (openshift#1143)
ca5f335 Use Generation instead of checksum for Broker (openshift#1145)
5364daa Merge branch 'pr/1158'
f34c5db move Travis deployment script to directory in 'contrib/'
2a00d7f Update incorrect port (openshift#1156)
b0ed60e improve the repository's layout (openshift#1154)
f870baf Follow up file / renames from openshift#1142 (openshift#1152)
826b4f9 remove unnecessary json annotations (openshift#1153)
33cb345 Rename resources. closes openshift#1080 (openshift#1142)
70c2b9b Add ability to specify CA certs to use for TLS authentication. (openshift#1112)
2aa5039 v0.0.16 (openshift#1140)
65de49c Comments for unit test bullet proofing (openshift#1139)
REVERT: 7e650e7e39 origin build: add origin tooling

git-subtree-dir: cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog
git-subtree-split: ef63307bdbaa64efca204912f5361a4f3d3be2c8
jpeeler pushed a commit to jpeeler/origin that referenced this pull request Sep 11, 2017
…service-catalog/' changes from 7e650e7e39..ef63307bdb

ef63307bdb origin build: add origin tooling
a876fe3 v0.0.17 (openshift#1178)
c5237fe correct osbapi service definition (openshift#1177)
6036d4e Adding walkthrough instructions for 1.7 (openshift#1171)
5f111dd Specifying that you need Helm v2.5.0 for installation (openshift#1170)
08043bd Adding more small fixes to the walkthrough & install docs (openshift#1169)
d65d4a1 rbac targets needed to be renamed as well (openshift#1161)
590f6f2 Write helm command to file for api aggregation (openshift#1141)
49ddcf6 clean before building a specific arch (openshift#1168)
43f7cfb Splitting up the Walkthrough for 1.6 and 1.7 instructions (openshift#1163)
02e0217 Updates to README (openshift#1166)
57f2aa5 Adding instructions for installing from Macs (openshift#1164)
dfe620e fix rate-limiting for polling queue (openshift#1143)
ca5f335 Use Generation instead of checksum for Broker (openshift#1145)
5364daa Merge branch 'pr/1158'
f34c5db move Travis deployment script to directory in 'contrib/'
2a00d7f Update incorrect port (openshift#1156)
b0ed60e improve the repository's layout (openshift#1154)
f870baf Follow up file / renames from openshift#1142 (openshift#1152)
826b4f9 remove unnecessary json annotations (openshift#1153)
33cb345 Rename resources. closes openshift#1080 (openshift#1142)
70c2b9b Add ability to specify CA certs to use for TLS authentication. (openshift#1112)
2aa5039 v0.0.16 (openshift#1140)
65de49c Comments for unit test bullet proofing (openshift#1139)
REVERT: 7e650e7e39 origin build: add origin tooling

git-subtree-dir: cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog
git-subtree-split: ef63307bdbaa64efca204912f5361a4f3d3be2c8
jpeeler pushed a commit to jpeeler/origin that referenced this pull request Feb 1, 2018
…1163)

* Splitting the walkthrough up

For 1.6 and 1.7 instructions

* Making the readme link relative

* Linking to the right final cleanup page

* Adding period at end of sentence

* Using curly fracked env var syntax

* Fixing NodePort language

* Cd-ing into certs dir

* Removing file names, replacing with more descriptive text

* Adding more description to tooling

* Removing DNS entries note

* Kube core => core Kubernetes API server

* Specifying that there are 2 options for getting a CA and keys

* Noting WIP for the 1.7 walkthrough

* Ignoring the certs directory

The install instructions say that you should create this directory, so
let’s ignore it

* Splitting the aggregated API install docs w/ script from the manual install docs

* Adding cfssl install instructions

* Adding a prerequisites section to the 1.7 install doc

* s/many servers/many API servers

* Adding deprecated note to the 1.6 walkthrough doc

* Removing the link to "final cleanup"

* Clarify the link to the intro doc

* Adding the env var to the local-up command
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.

imagerepos broken for multiple tags w/ same imageid

4 participants