Skip to content

Commit

Permalink
Merge pull request #1254 from QiWang19/add-status
Browse files Browse the repository at this point in the history
Add status to ImageDigest/TagMirror API to pass ci
  • Loading branch information
openshift-merge-robot committed Aug 19, 2022
2 parents 0d6dbfd + 95954d9 commit d8b9c37
Show file tree
Hide file tree
Showing 15 changed files with 145 additions and 74 deletions.
58 changes: 29 additions & 29 deletions build/v1/generated.proto

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

58 changes: 29 additions & 29 deletions build/v1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -825,53 +825,53 @@ type JenkinsPipelineBuildStrategy struct {
//
// 1. Shell script:
//
// "postCommit": {
// "script": "rake test --verbose",
// }
// "postCommit": {
// "script": "rake test --verbose",
// }
//
// The above is a convenient form which is equivalent to:
// The above is a convenient form which is equivalent to:
//
// "postCommit": {
// "command": ["/bin/sh", "-ic"],
// "args": ["rake test --verbose"]
// }
// "postCommit": {
// "command": ["/bin/sh", "-ic"],
// "args": ["rake test --verbose"]
// }
//
// 2. A command as the image entrypoint:
//
// "postCommit": {
// "commit": ["rake", "test", "--verbose"]
// }
// "postCommit": {
// "commit": ["rake", "test", "--verbose"]
// }
//
// Command overrides the image entrypoint in the exec form, as documented in
// Docker: https://docs.docker.com/engine/reference/builder/#entrypoint.
// Command overrides the image entrypoint in the exec form, as documented in
// Docker: https://docs.docker.com/engine/reference/builder/#entrypoint.
//
// 3. Pass arguments to the default entrypoint:
//
// "postCommit": {
// "args": ["rake", "test", "--verbose"]
// }
// "postCommit": {
// "args": ["rake", "test", "--verbose"]
// }
//
// This form is only useful if the image entrypoint can handle arguments.
// This form is only useful if the image entrypoint can handle arguments.
//
// 4. Shell script with arguments:
//
// "postCommit": {
// "script": "rake test $1",
// "args": ["--verbose"]
// }
// "postCommit": {
// "script": "rake test $1",
// "args": ["--verbose"]
// }
//
// This form is useful if you need to pass arguments that would otherwise be
// hard to quote properly in the shell script. In the script, $0 will be
// "/bin/sh" and $1, $2, etc, are the positional arguments from Args.
// This form is useful if you need to pass arguments that would otherwise be
// hard to quote properly in the shell script. In the script, $0 will be
// "/bin/sh" and $1, $2, etc, are the positional arguments from Args.
//
// 5. Command with arguments:
//
// "postCommit": {
// "command": ["rake", "test"],
// "args": ["--verbose"]
// }
// "postCommit": {
// "command": ["rake", "test"],
// "args": ["--verbose"]
// }
//
// This form is equivalent to appending the arguments to the Command slice.
// This form is equivalent to appending the arguments to the Command slice.
//
// It is invalid to provide both Script and Command simultaneously. If none of
// the fields are specified, the hook is not executed.
Expand Down
2 changes: 1 addition & 1 deletion build/v1/zz_generated.swagger_doc_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ spec:
type: string
pattern: ^\*(?:\.(?:[a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]))+$|^((?:[a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])(?:(?:\.(?:[a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]))+)?(?::[0-9]+)?)(?:(?:/[a-z0-9]+(?:(?:(?:[._]|__|[-]*)[a-z0-9]+)+)?)+)?$
x-kubernetes-list-type: atomic
status:
description: status contains the observed state of the resource.
type: object
served: true
storage: true
subresources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ spec:
type: string
pattern: ^\*(?:\.(?:[a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]))+$|^((?:[a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])(?:(?:\.(?:[a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]))+)?(?::[0-9]+)?)(?:(?:/[a-z0-9]+(?:(?:(?:[._]|__|[-]*)[a-z0-9]+)+)?)+)?$
x-kubernetes-list-type: atomic
status:
description: status contains the observed state of the resource.
type: object
served: true
storage: true
subresources:
Expand Down
5 changes: 5 additions & 0 deletions config/v1/types_image_digest_mirror_set.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ type ImageDigestMirrorSet struct {
// +kubebuilder:validation:Required
// +required
Spec ImageDigestMirrorSetSpec `json:"spec"`
// status contains the observed state of the resource.
// +optional
Status ImageDigestMirrorSetStatus `json:"status,omitempty"`
}

// ImageDigestMirrorSetSpec is the specification of the ImageDigestMirrorSet CRD.
Expand Down Expand Up @@ -53,6 +56,8 @@ type ImageDigestMirrorSetSpec struct {
ImageDigestMirrors []ImageDigestMirrors `json:"imageDigestMirrors"`
}

type ImageDigestMirrorSetStatus struct{}

// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

// ImageDigestMirrorSetList lists the items in the ImageDigestMirrorSet CRD.
Expand Down
5 changes: 5 additions & 0 deletions config/v1/types_image_tag_mirror_set.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ type ImageTagMirrorSet struct {
// +kubebuilder:validation:Required
// +required
Spec ImageTagMirrorSetSpec `json:"spec"`
// status contains the observed state of the resource.
// +optional
Status ImageTagMirrorSetStatus `json:"status,omitempty"`
}

// ImageTagMirrorSetSpec is the specification of the ImageTagMirrorSet CRD.
Expand Down Expand Up @@ -53,6 +56,8 @@ type ImageTagMirrorSetSpec struct {
ImageTagMirrors []ImageTagMirrors `json:"imageTagMirrors"`
}

type ImageTagMirrorSetStatus struct{}

// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

// ImageTagMirrorSetList lists the items in the ImageTagMirrorSet CRD.
Expand Down
10 changes: 6 additions & 4 deletions config/v1/zz_generated.swagger_doc_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion image/v1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ type ImageSignature struct {
IssuedTo *SignatureSubject `json:"issuedTo,omitempty" protobuf:"bytes,9,opt,name=issuedTo"`
}

/// SignatureConditionType is a type of image signature condition.
// / SignatureConditionType is a type of image signature condition.
type SignatureConditionType string

// SignatureCondition describes an image signature condition of particular kind at particular probe time.
Expand Down
1 change: 0 additions & 1 deletion networkoperator/v1/types_egressrouter.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (
// - An egress pod called <name>
// - A NAD called <name>
//
//
// Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
//
Expand Down

0 comments on commit d8b9c37

Please sign in to comment.