Skip to content

Commit

Permalink
Merge pull request #786 from imjasonh/generate
Browse files Browse the repository at this point in the history 
Re-run make generate and generate-crds
  • Loading branch information
@openshift-merge-robot
openshift-merge-robot authored Jun 9, 2021
2 parents a2a6cf7 + da6afa0 commit a1e7d1a
Show file tree
Hide file tree
Showing 13 changed files with 407 additions and 1,188 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Temporary Build Files
git
shipwright-build-controller
build/_output
build/_test
# Created by https://www.gitignore.io/api/go,vim,emacs,visualstudiocode
Expand Down
5 changes: 5 additions & 0 deletions 2021-roadmap.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
<!--
Copyright The Shipwright Contributors
SPDX-License-Identifier: Apache-2.0
-->
# **Shipwright 2021 Roadmap**

**Mission Statement:** Shipwright aims to do one thing well: build images from source. Automatically, securely, reliably.
Expand Down
5 changes: 5 additions & 0 deletions cmd/git/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
<!--
Copyright The Shipwright Contributors
SPDX-License-Identifier: Apache-2.0
-->
# Git Clone Wrapper

**TL;DR:** As part of the build, the sources need to be retrieved. One option is to use `git` to clone the source to the container filesystem. This was used to be done by a Tekton Git Resource. This package contains Shipwright Build owned Git retrieval code, which is wrapping around the `git` CLI in a minimal container setup.
Expand Down
126 changes: 36 additions & 90 deletions deploy/crds/shipwright.io_buildruns.yaml
View file

Large diffs are not rendered by default.

92 changes: 29 additions & 63 deletions deploy/crds/shipwright.io_builds.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.4.1
controller-gen.kubebuilder.io/version: v0.5.0
creationTimestamp: null
name: builds.shipwright.io
spec:
Expand All @@ -21,8 +21,7 @@ spec:
jsonPath: .status.registered
name: Registered
type: string
- description: The reason of the registered Build, either an error or succeed
message
- description: The reason of the registered Build, either an error or succeed message
jsonPath: .status.reason
name: Reason
type: string
Expand All @@ -44,31 +43,24 @@ spec:
description: Build is the Schema representing a Build definition
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: BuildSpec defines the desired state of Build
properties:
builder:
description: Builder refers to the image containing the build tools
inside which the source code would be built.
description: Builder refers to the image containing the build tools inside which the source code would be built.
properties:
credentials:
description: Credentials references a Secret that contains credentials
to access the image registry.
description: Credentials references a Secret that contains credentials to access the image registry.
properties:
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?'
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
type: object
image:
Expand All @@ -78,20 +70,16 @@ spec:
- image
type: object
dockerfile:
description: Dockerfile is the path to the Dockerfile to be used for
build strategies which bank on the Dockerfile for building an image.
description: Dockerfile is the path to the Dockerfile to be used for build strategies which bank on the Dockerfile for building an image.
type: string
output:
description: Output refers to the location where the built image would
be pushed.
description: Output refers to the location where the built image would be pushed.
properties:
credentials:
description: Credentials references a Secret that contains credentials
to access the image registry.
description: Credentials references a Secret that contains credentials to access the image registry.
properties:
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?'
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
type: object
image:
Expand All @@ -101,12 +89,9 @@ spec:
- image
type: object
parameters:
description: Parameters contains name-value that could be used to
loosely type parameters in the BuildStrategy.
description: Parameters contains name-value that could be used to loosely type parameters in the BuildStrategy.
items:
description: Parameter defines the data structure that would be
used for expressing arbitrary key/value pairs for the execution
of a build
description: Parameter defines the data structure that would be used for expressing arbitrary key/value pairs for the execution of a build
properties:
name:
type: string
Expand All @@ -124,12 +109,10 @@ spec:
description: Base runtime base image.
properties:
credentials:
description: Credentials references a Secret that contains
credentials to access the image registry.
description: Credentials references a Secret that contains credentials to access the image registry.
properties:
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?'
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
type: object
image:
Expand All @@ -151,19 +134,15 @@ spec:
labels:
additionalProperties:
type: string
description: Labels map of additional labels to be applied on
image.
description: Labels map of additional labels to be applied on image.
type: object
paths:
description: Paths list of directories/files to be copied into
runtime-image, using colon ":" to split up source and destination
paths.
description: Paths list of directories/files to be copied into runtime-image, using colon ":" to split up source and destination paths.
items:
type: string
type: array
run:
description: Run arbitrary commands to run before copying data
into runtime-image.
description: Run arbitrary commands to run before copying data into runtime-image.
items:
type: string
type: array
Expand All @@ -184,25 +163,20 @@ spec:
type: string
type: object
source:
description: Source refers to the Git repository containing the source
code to be built.
description: Source refers to the Git repository containing the source code to be built.
properties:
contextDir:
description: ContextDir is a path to subfolder in the repo. Optional.
type: string
credentials:
description: Credentials references a Secret that contains credentials
to access the repository.
description: Credentials references a Secret that contains credentials to access the repository.
properties:
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?'
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
type: object
revision:
description: "Revision describes the Git revision (e.g., branch,
tag, commit SHA, etc.) to fetch. \n If not defined, it will
fallback to the repository's default branch."
description: "Revision describes the Git revision (e.g., branch, tag, commit SHA, etc.) to fetch. \n If not defined, it will fallback to the repository's default branch."
type: string
url:
description: URL describes the URL of the Git repository.
Expand All @@ -211,12 +185,9 @@ spec:
- url
type: object
sources:
description: Sources slice of BuildSource, defining external build
artifacts complementary to VCS (`.spec.source`) data.
description: Sources slice of BuildSource, defining external build artifacts complementary to VCS (`.spec.source`) data.
items:
description: BuildSource remote artifact definition, also known
as "sources". Simple "name" and "url" pairs, initially without
"credentials" (authentication) support yet.
description: BuildSource remote artifact definition, also known as "sources". Simple "name" and "url" pairs, initially without "credentials" (authentication) support yet.
properties:
name:
description: Name instance entry.
Expand All @@ -230,15 +201,13 @@ spec:
type: object
type: array
strategy:
description: Strategy references the BuildStrategy to use to build
the container image.
description: Strategy references the BuildStrategy to use to build the container image.
properties:
apiVersion:
description: API version of the referent
type: string
kind:
description: BuildStrategyKind indicates the kind of the buildstrategy,
namespaced or cluster scoped.
description: BuildStrategyKind indicates the kind of the buildstrategy, namespaced or cluster scoped.
type: string
name:
description: 'Name of the referent; More info: http://kubernetes.io/docs/user-guide/identifiers#names'
Expand All @@ -247,8 +216,7 @@ spec:
- name
type: object
timeout:
description: Timeout defines the maximum amount of time the Build
should take to execute.
description: Timeout defines the maximum amount of time the Build should take to execute.
format: duration
type: string
required:
Expand All @@ -260,12 +228,10 @@ spec:
description: BuildStatus defines the observed state of Build
properties:
message:
description: The message of the registered Build, either an error
or succeed message
description: The message of the registered Build, either an error or succeed message
type: string
reason:
description: The reason of the registered Build, it's an one-word
camelcase
description: The reason of the registered Build, it's an one-word camelcase
type: string
registered:
description: The Register status of the Build
Expand Down
Loading

0 comments on commit a1e7d1a

Please sign in to comment.