Skip to content

Conversation

@adambkaplan
Copy link
Contributor

@adambkaplan adambkaplan commented Aug 9, 2019

Ensures that no other base trust is present for the registry.

@openshift-ci-robot openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 9, 2019
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 9, 2019
@adambkaplan adambkaplan force-pushed the registry-trusted-ca branch from 2069fe7 to 4e89c37 Compare August 9, 2019 20:09
@adambkaplan adambkaplan changed the title WIP - Mount trusted-ca to registry base pki trust source DEVEXP-402: Mount trusted-ca to registry base pki trust source Aug 9, 2019
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 9, 2019
@adambkaplan
Copy link
Contributor Author

/hold

Blocked by #340

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 9, 2019
@adambkaplan
Copy link
Contributor Author

/retest

s3 issue from earlier today

@adambkaplan
Copy link
Contributor Author

/retest

@adambkaplan
Copy link
Contributor Author

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 20, 2019
@dmage
Copy link
Contributor

dmage commented Aug 21, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 21, 2019
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@adambkaplan
Copy link
Contributor Author

/hold

I may not be mounting the trust correctly

@openshift-ci-robot openshift-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. and removed lgtm Indicates that a PR is ready to be merged. labels Aug 21, 2019
@adambkaplan adambkaplan changed the title DEVEXP-402: Mount trusted-ca to registry base pki trust source WIP - DEVEXP-402: Mount trusted-ca to registry base pki trust source Aug 21, 2019
@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 21, 2019
@adambkaplan
Copy link
Contributor Author

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 21, 2019
Ensures that no other base trust is present for the registry.
@adambkaplan adambkaplan changed the title WIP - DEVEXP-402: Mount trusted-ca to registry base pki trust source DEVEXP-402: Mount trusted-ca to registry base pki trust source Aug 22, 2019
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 22, 2019
@adambkaplan
Copy link
Contributor Author

@dmage ready for review again

@dmage
Copy link
Contributor

dmage commented Aug 22, 2019

/retest

1 similar comment
@adambkaplan
Copy link
Contributor Author

/retest

configapiv1 "github.com/openshift/api/config/v1"
configlisters "github.com/openshift/client-go/config/listers/config/v1"
"github.com/openshift/cluster-image-registry-operator/pkg/apis/imageregistry/v1"
v1 "github.com/openshift/cluster-image-registry-operator/pkg/apis/imageregistry/v1"

Choose a reason for hiding this comment

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

This doesn't need an alias, but it won't hurt anything

func NewFixturesBuilder() *FixturesBuilder {
factory := &FixturesBuilder{
deploymentIndexer: cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{}),
dsIndexer: cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{}),

Choose a reason for hiding this comment

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

I think this should be updated to daemonSetsIndexer for clarity

func TestMakePodTemplateSpec(t *testing.T) {
// TODO: Make this table-driven to verify all storage drivers
params := &parameters.Globals{}
params.Deployment.Namespace = "openshift-image-registry"

Choose a reason for hiding this comment

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

v1.ImageRegistryOperatorNamespace instead of a string?

Copy link

@coreydaley coreydaley left a comment

Choose a reason for hiding this comment

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

A few small nits but nothing that should prohibit this from merging.

@coreydaley
Copy link

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 23, 2019
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: adambkaplan, coreydaley, dmage

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit 2493b6f into openshift:master Aug 23, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants