Skip to content
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

Fixes for CRDs and fakes generator #473

Merged
merged 2 commits into from
Nov 10, 2020
Merged

Fixes for CRDs and fakes generator #473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5f2db4
Align CRDs to be compliant with operator-sdk v0.17.0
qu1queee Nov 9, 2020
8c391e1
Add fixes for fakes generation
qu1queee Nov 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions deploy/crds/build.dev_buildstrategies_crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -845,25 +845,19 @@ spec:
description: GMSACredentialSpec is where the GMSA admission
webhook (https://github.com/kubernetes-sigs/windows-gmsa)
inlines the contents of the GMSA credential spec named
by the GMSACredentialSpecName field. This field is
alpha-level and is only honored by servers that enable
the WindowsGMSA feature flag.
by the GMSACredentialSpecName field.
type: string
gmsaCredentialSpecName:
description: GMSACredentialSpecName is the name of the
GMSA credential spec to use. This field is alpha-level
and is only honored by servers that enable the WindowsGMSA
feature flag.
GMSA credential spec to use.
type: string
runAsUserName:
description: The UserName in Windows to run the entrypoint
of the container process. Defaults to the user specified
in image metadata if unspecified. May also be set
in PodSecurityContext. If set in both SecurityContext
and PodSecurityContext, the value specified in SecurityContext
takes precedence. This field is beta-level and may
be disabled with the WindowsRunAsUserName feature
flag.
takes precedence.
type: string
type: object
type: object
Expand All @@ -875,7 +869,7 @@ spec:
can be used to provide different probe parameters at the beginning
of a Pod''s lifecycle, when it might take a long time to load
data or warm a cache, than during steady-state operation.
This cannot be updated. This is an alpha feature enabled by
This cannot be updated. This is a beta feature enabled by
the StartupProbe feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
properties:
exec:
Expand Down Expand Up @@ -1033,7 +1027,7 @@ spec:
type: boolean
volumeDevices:
description: volumeDevices is the list of block devices to be
used by the container. This is a beta feature.
used by the container.
items:
description: volumeDevice describes a mapping of a raw block
device within a container.
Expand Down
16 changes: 5 additions & 11 deletions deploy/crds/build.dev_clusterbuildstrategies_crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -845,25 +845,19 @@ spec:
description: GMSACredentialSpec is where the GMSA admission
webhook (https://github.com/kubernetes-sigs/windows-gmsa)
inlines the contents of the GMSA credential spec named
by the GMSACredentialSpecName field. This field is
alpha-level and is only honored by servers that enable
the WindowsGMSA feature flag.
by the GMSACredentialSpecName field.
type: string
gmsaCredentialSpecName:
description: GMSACredentialSpecName is the name of the
GMSA credential spec to use. This field is alpha-level
and is only honored by servers that enable the WindowsGMSA
feature flag.
GMSA credential spec to use.
type: string
runAsUserName:
description: The UserName in Windows to run the entrypoint
of the container process. Defaults to the user specified
in image metadata if unspecified. May also be set
in PodSecurityContext. If set in both SecurityContext
and PodSecurityContext, the value specified in SecurityContext
takes precedence. This field is beta-level and may
be disabled with the WindowsRunAsUserName feature
flag.
takes precedence.
type: string
type: object
type: object
Expand All @@ -875,7 +869,7 @@ spec:
can be used to provide different probe parameters at the beginning
of a Pod''s lifecycle, when it might take a long time to load
data or warm a cache, than during steady-state operation.
This cannot be updated. This is an alpha feature enabled by
This cannot be updated. This is a beta feature enabled by
the StartupProbe feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
properties:
exec:
Expand Down Expand Up @@ -1033,7 +1027,7 @@ spec:
type: boolean
volumeDevices:
description: volumeDevices is the list of block devices to be
used by the container. This is a beta feature.
used by the container.
items:
description: volumeDevice describes a mapping of a raw block
device within a container.
Expand Down
6 changes: 3 additions & 3 deletions hack/generate-fakes.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ set -euo pipefail
SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
BIN=$(go env GOPATH)/bin

"${BIN}/counterfeiter" -header "${SCRIPT_ROOT}/hack/boilerplate.go.txt" -o pkg/controller/fakes/manager.go vendor/sigs.k8s.io/controller-runtime/pkg/manager Manager
"${BIN}/counterfeiter" -header "${SCRIPT_ROOT}/hack/boilerplate.go.txt" -o pkg/controller/fakes/client.go vendor/sigs.k8s.io/controller-runtime/pkg/client Client
"${BIN}/counterfeiter" -header "${SCRIPT_ROOT}/hack/boilerplate.go.txt" -o pkg/controller/fakes/status_writer.go vendor/sigs.k8s.io/controller-runtime/pkg/client StatusWriter
GO111MODULE=off "${BIN}/counterfeiter" -header "${SCRIPT_ROOT}/hack/boilerplate.go.txt" -o pkg/controller/fakes/manager.go vendor/sigs.k8s.io/controller-runtime/pkg/manager Manager
GO111MODULE=off "${BIN}/counterfeiter" -header "${SCRIPT_ROOT}/hack/boilerplate.go.txt" -o pkg/controller/fakes/client.go vendor/sigs.k8s.io/controller-runtime/pkg/client Client
GO111MODULE=off "${BIN}/counterfeiter" -header "${SCRIPT_ROOT}/hack/boilerplate.go.txt" -o pkg/controller/fakes/status_writer.go vendor/sigs.k8s.io/controller-runtime/pkg/client StatusWriter