Skip to content

Add ImageContentSourcePolicy CRD manifest #67

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
Merged
openshift-merge-robot merged 2 commits into from
Jun 28, 2019
Merged

Add ImageContentSourcePolicy CRD manifest #67

openshift-merge-robot merged 2 commits into from
Jun 28, 2019

Conversation

@umohnani8
Copy link
Contributor

@umohnani8 umohnani8 commented Jun 17, 2019

Adding a ImageContentSourcePolicy manifest to create cluster wide
registry mirror configurations.

API PR: openshift/api#354

Signed-off-by: Urvashi Mohnani [email protected]

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 17, 2019
@umohnani8
Copy link
Contributor Author

umohnani8 commented Jun 17, 2019

@abhinavdahiya @mrunalp @mtrmac PTAL

@umohnani8
Copy link
Contributor Author

umohnani8 commented Jun 18, 2019

/test e2e-aws-upgrade
/test e2e-aws

@umohnani8
Copy link
Contributor Author

umohnani8 commented Jun 27, 2019

openshift/api#354 and openshift/client-go#109 are in. This is ready to merge once tests are green!
cc @abhinavdahiya @smarterclayton @mtrmac @mrunalp

@umohnani8 umohnani8 force-pushed the mirror branch 2 times, most recently from 9780c08 to e80059e Compare June 27, 2019 17:36
@abhinavdahiya
Copy link
Contributor

abhinavdahiya commented Jun 27, 2019

from e2e-aws job install-failed-during-bootstrap logs
error while pushing to cluster from bootkube.sh

Jun 27 17:52:23 ip-10-0-1-184 bootkube.sh[1395]: Failed to create "0000_10_config-operator_01_imagecontentsourcepolicy.crd.yaml" customresourcedefinitions.v1beta1.apiextensions.k8s.io/image-content-source-policy.config.openshift.io -n : CustomResourceDefinition.apiextensions.k8s.io "image-content-source-policy.config.openshift.io" is invalid: [metadata.name: Invalid value: "image-content-source-policy.config.openshift.io": must be spec.names.plural+"."+spec.group, spec.names.plural: Invalid value: "imageContentSourcePolicies": a DNS-1035 label must consist of lower case alphanumeric characters or '-', start with an alphabetic character, and end with an alphanumeric character (e.g. 'my-name',  or 'abc-123', regex used for validation is '[a-z]([-a-z0-9]*[a-z0-9])?'), spec.names.singular: Invalid value: "imageContentSourcePolicy": a DNS-1035 label must consist of lower case alphanumeric characters or '-', start with an alphabetic character, and end with an alphanumeric character (e.g. 'my-name',  or 'abc-123', regex used for validation is '[a-z]([-a-z0-9]*[a-z0-9])?')]

abhinavdahiya
abhinavdahiya reviewed Jun 27, 2019
View reviewed changes
manifests/0000_10_config-operator_01_imagecontentsourcepolicy.crd.yaml Outdated
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: image-content-source-policy.config.openshift.io
Copy link
Contributor

@abhinavdahiya abhinavdahiya Jun 27, 2019

Choose a reason for hiding this comment

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

the name should be imagecontentsourcepolicies.operator.openshift.io

Copy link
Contributor Author

@umohnani8 umohnani8 Jun 27, 2019

Choose a reason for hiding this comment

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

fixed

Copy link
Contributor

@abhinavdahiya abhinavdahiya Jun 27, 2019

Choose a reason for hiding this comment

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

its still imagecontentsourcepolicies.config.openshift.io, it should be imagecontentsourcepolicies.operator.openshift.io

error from bootkube.sh

Jun 27 20:09:24 ip-10-0-11-139 bootkube.sh[1413]: "0000_10_config-operator_01_imagecontentsourcepolicy.crd.yaml": failed to create: CustomResourceDefinition.apiextensions.k8s.io "imagecontentsourcepolicies.config.openshift.io" is invalid: metadata.name: Invalid value: "imagecontentsourcepolicies.config.openshift.io": must be spec.names.plural+"."+spec.group

Copy link
Contributor Author

@umohnani8 umohnani8 Jun 27, 2019

Choose a reason for hiding this comment

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

oh, oops. Fixed now.

abhinavdahiya
abhinavdahiya reviewed Jun 27, 2019
View reviewed changes
manifests/0000_10_config-operator_01_imagecontentsourcepolicy.crd.yaml Outdated
scope: Cluster
names:
kind: ImageContentSourcePolicy
singular: imageContentSourcePolicy
Copy link
Contributor

@abhinavdahiya abhinavdahiya Jun 27, 2019

Choose a reason for hiding this comment

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

all small-case

Copy link
Contributor Author

@umohnani8 umohnani8 Jun 27, 2019

Choose a reason for hiding this comment

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

fixed

abhinavdahiya
abhinavdahiya reviewed Jun 27, 2019
View reviewed changes
manifests/0000_10_config-operator_01_imagecontentsourcepolicy.crd.yaml Outdated
metadata:
name: image-content-source-policy.config.openshift.io
spec:
group: config.openshift.io
Copy link
Contributor

@abhinavdahiya abhinavdahiya Jun 27, 2019

Choose a reason for hiding this comment

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

operator.openshift.io

Copy link
Contributor Author

@umohnani8 umohnani8 Jun 27, 2019

Choose a reason for hiding this comment

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

fixed

abhinavdahiya
abhinavdahiya reviewed Jun 27, 2019
View reviewed changes
manifests/0000_10_config-operator_01_imagecontentsourcepolicy.crd.yaml Outdated
names:
kind: ImageContentSourcePolicy
singular: imageContentSourcePolicy
plural: imageContentSourcePolicies
Copy link
Contributor

@abhinavdahiya abhinavdahiya Jun 27, 2019

Choose a reason for hiding this comment

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

all small-case

Copy link
Contributor Author

@umohnani8 umohnani8 Jun 27, 2019

Choose a reason for hiding this comment

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

fixed

abhinavdahiya
abhinavdahiya reviewed Jun 27, 2019
View reviewed changes
manifests/0000_10_config-operator_01_imagecontentsourcepolicy.crd.yaml Outdated
plural: imageContentSourcePolicies
listKind: ImageContentSourcePolicyList
versions:
- name: v1
Copy link
Contributor

@abhinavdahiya abhinavdahiya Jun 27, 2019

Choose a reason for hiding this comment

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

v1alpha1

Copy link
Contributor Author

@umohnani8 umohnani8 Jun 27, 2019

Choose a reason for hiding this comment

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

fixed

@umohnani8 umohnani8 force-pushed the mirror branch 2 times, most recently from 78425c1 to d618568 Compare June 27, 2019 19:52
@abhinavdahiya
Copy link
Contributor

abhinavdahiya commented Jun 27, 2019

  1. Add ImageContentSourcePolicy CRD manifest #67 (comment)

  2. this is probably needed...

glide up -v ## to get the latest struct.
make update-codegen ## update the crds.

umohnani8 added 2 commits June 27, 2019 17:18
@umohnani8
Add ImageContentSourcePolicy CRD manifest
6ef3604 
Adding a ImageContentSourcePolicy manifest to create cluster wide
registry mirror configurations.

Signed-off-by: Urvashi Mohnani <[email protected]>
@umohnani8
Update vendor
6d98693 
Signed-off-by: Urvashi Mohnani <[email protected]>
@openshift-ci-robot openshift-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 27, 2019
@umohnani8
Copy link
Contributor Author

umohnani8 commented Jun 27, 2019

@abhinavdahiya ran glide up -v and make update-codegen

@abhinavdahiya
Copy link
Contributor

abhinavdahiya commented Jun 27, 2019

/lgtm

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

deads2k commented Jun 28, 2019

/approve

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jun 28, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abhinavdahiya, deads2k, umohnani8

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

The pull request process is described here

Details 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-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 28, 2019
@openshift-merge-robot openshift-merge-robot merged commit 89fcde7 into openshift:master Jun 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@deads2k deads2k Awaiting requested review from deads2k

@sttts sttts Awaiting requested review from sttts

1 more reviewer

@abhinavdahiya abhinavdahiya abhinavdahiya left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@abhinavdahiya abhinavdahiya

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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@umohnani8 @abhinavdahiya @deads2k @openshift-ci-robot @openshift-merge-robot