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.

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

using controller-gen latest version for crd generation #640

Merged
merged 2 commits into from
Aug 20, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ ifeq (, $(shell which controller-gen))
CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
cd $$CONTROLLER_GEN_TMP_DIR ;\
go mod init tmp ;\
go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.3.0 ;\
go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.6.2 ;\
rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
}
CONTROLLER_GEN=$(GOBIN)/controller-gen
Expand Down
249 changes: 124 additions & 125 deletions kubernetes/crds/machine.sapcloud.io_alicloudmachineclasses.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,156 +4,155 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.3.0
controller-gen.kubebuilder.io/version: v0.6.2
creationTimestamp: null
name: alicloudmachineclasses.machine.sapcloud.io
spec:
additionalPrinterColumns:
- JSONPath: .spec.instanceType
name: Instance Type
type: string
- JSONPath: .spec.region
name: Region
priority: 1
type: string
- JSONPath: .metadata.creationTimestamp
description: |-
CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.
Populated by the system. Read-only. Null for lists. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
name: Age
type: date
group: machine.sapcloud.io
names:
kind: AlicloudMachineClass
listKind: AlicloudMachineClassList
plural: alicloudmachineclasses
singular: alicloudmachineclass
scope: Namespaced
subresources: {}
validation:
openAPIV3Schema:
description: AlicloudMachineClass TODO
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'
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'
type: string
metadata:
type: object
spec:
description: AlicloudMachineClassSpec is the specification of a AlicloudMachineClass.
properties:
IoOptimized:
type: string
credentialsSecretRef:
description: SecretReference represents a Secret Reference. It has enough
information to retrieve secret in any namespace
properties:
name:
description: Name is unique within a namespace to reference a secret
resource.
type: string
namespace:
description: Namespace defines the space within which the secret
name must be unique.
type: string
type: object
dataDisks:
items:
versions:
- additionalPrinterColumns:
- jsonPath: .spec.instanceType
name: Instance Type
type: string
- jsonPath: .spec.region
name: Region
priority: 1
type: string
- description: |-
CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.
Populated by the system. Read-only. Null for lists. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
jsonPath: .metadata.creationTimestamp
name: Age
type: date
name: v1alpha1
schema:
openAPIV3Schema:
description: AlicloudMachineClass TODO
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'
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'
type: string
metadata:
type: object
spec:
description: AlicloudMachineClassSpec is the specification of a AlicloudMachineClass.
properties:
IoOptimized:
type: string
credentialsSecretRef:
description: SecretReference represents a Secret Reference. It has
enough information to retrieve secret in any namespace
properties:
category:
name:
description: Name is unique within a namespace to reference a
secret resource.
type: string
deleteWithInstance:
type: boolean
description:
namespace:
description: Namespace defines the space within which the secret
name must be unique.
type: string
encrypted:
type: boolean
type: object
dataDisks:
items:
properties:
category:
type: string
deleteWithInstance:
type: boolean
description:
type: string
encrypted:
type: boolean
name:
type: string
size:
type: integer
required:
- category
- deleteWithInstance
- encrypted
- name
- size
type: object
type: array
imageID:
type: string
instanceChargeType:
type: string
instanceType:
type: string
internetChargeType:
type: string
internetMaxBandwidthIn:
type: integer
internetMaxBandwidthOut:
type: integer
keyPairName:
type: string
privateIPAddress:
type: string
region:
type: string
secretRef:
description: SecretReference represents a Secret Reference. It has
enough information to retrieve secret in any namespace
properties:
name:
description: Name is unique within a namespace to reference a
secret resource.
type: string
namespace:
description: Namespace defines the space within which the secret
name must be unique.
type: string
type: object
securityGroupID:
type: string
spotStrategy:
type: string
systemDisk:
description: AlicloudSystemDisk describes SystemDisk for Alicloud.
properties:
category:
type: string
size:
type: integer
required:
- category
- deleteWithInstance
- encrypted
- name
- size
type: object
type: array
imageID:
type: string
instanceChargeType:
type: string
instanceType:
type: string
internetChargeType:
type: string
internetMaxBandwidthIn:
type: integer
internetMaxBandwidthOut:
type: integer
keyPairName:
type: string
privateIPAddress:
type: string
region:
type: string
secretRef:
description: SecretReference represents a Secret Reference. It has enough
information to retrieve secret in any namespace
properties:
name:
description: Name is unique within a namespace to reference a secret
resource.
type: string
namespace:
description: Namespace defines the space within which the secret
name must be unique.
type: string
type: object
securityGroupID:
type: string
spotStrategy:
type: string
systemDisk:
description: AlicloudSystemDisk describes SystemDisk for Alicloud.
properties:
category:
tags:
additionalProperties:
type: string
size:
type: integer
required:
- category
- size
type: object
tags:
additionalProperties:
type: object
vSwitchID:
type: string
type: object
vSwitchID:
type: string
zoneID:
type: string
required:
- imageID
- instanceType
- keyPairName
- region
- vSwitchID
type: object
type: object
version: v1alpha1
versions:
- name: v1alpha1
zoneID:
type: string
required:
- imageID
- instanceType
- keyPairName
- region
- vSwitchID
type: object
type: object
served: true
storage: true
subresources: {}
status:
acceptedNames:
kind: ""
Expand Down
Loading