Skip to content

Commit

Permalink
use config/wcp instead of config/local
Browse files Browse the repository at this point in the history
  • Loading branch information
fabriziopandini committed Apr 30, 2024
1 parent cd2ad4d commit ca8e2e7
Show file tree
Hide file tree
Showing 13 changed files with 943 additions and 254 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -801,8 +801,8 @@ set-manifest-image:
.PHONY: release-vm-operator
release-vm-operator: docker-build-all-vm-operator generate-manifests-vm-operator docker-push-all-vm-operator clean-vm-operator ## Build and push the vm-operator image and manifest for usage in CI

.PHONY: release-local-vm-operator
release-local-vm-operator: docker-build-all-vm-operator generate-manifests-vm-operator clean-vm-operator ## Build and push the vm-operator image and manifest for local usage only
.PHONY: release-vm-operator-local
release-vm-operator-local: docker-build-all-vm-operator generate-manifests-vm-operator clean-vm-operator ## Build the vm-operator image and manifest for local usage only

.PHONY: checkout-vm-operator
checkout-vm-operator:
Expand All @@ -822,7 +822,7 @@ checkout-vm-operator:

.PHONY: generate-manifests-vm-operator
generate-manifests-vm-operator: $(RELEASE_DIR) $(KUSTOMIZE) checkout-vm-operator ## Build the vm-operator manifest yaml file
kustomize build --load-restrictor LoadRestrictionsNone "$(VM_OPERATOR_TMP_DIR)/config/local" > "$(VM_OPERATOR_DIR)/config/vm-operator.yaml"
kustomize build --load-restrictor LoadRestrictionsNone "$(VM_OPERATOR_TMP_DIR)/config/wcp" > "$(VM_OPERATOR_DIR)/config/vm-operator.yaml"
sed -i'' -e 's@image: vmoperator.*@image: '"$(VM_OPERATOR_CONTROLLER_IMG):$(VM_OPERATOR_VERSION)"'@' "$(VM_OPERATOR_DIR)/config/vm-operator.yaml"
kustomize build "$(VM_OPERATOR_DIR)/config" > "$(VM_OPERATOR_DIR)/vm-operator-$(VM_OPERATOR_VERSION).yaml"

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.2
name: cnsnodevmattachments.cns.vmware.com
spec:
conversion:
strategy: None
group: cns.vmware.com
names:
kind: CnsNodeVmAttachment
listKind: CnsNodeVmAttachmentList
plural: cnsnodevmattachments
singular: cnsnodevmattachment
scope: Namespaced
versions:
- name: v1alpha1
schema:
openAPIV3Schema:
description: CnsNodeVmAttachment is the Schema for the cnsnodevmattachments
API
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: CnsNodeVmAttachmentSpec defines the desired state of CnsNodeVmAttachment
properties:
nodeuuid:
description: NodeUUID indicates the UUID of the node where the volume
needs to be attached to. Here NodeUUID is the bios UUID of the node.
type: string
volumename:
description: VolumeName indicates the name of the volume on the supervisor
Cluster. This is guaranteed to be unique in Supervisor cluster.
type: string
required:
- nodeuuid
- volumename
type: object
status:
description: CnsNodeVmAttachmentStatus defines the observed state of CnsNodeVmAttachment
properties:
attached:
description: Indicates the volume is successfully attached. This field
must only be set by the entity completing the attach operation,
i.e. the CNS Operator.
type: boolean
error:
description: The last error encountered during attach/detach operation,
if any. This field must only be set by the entity completing the
attach operation, i.e. the CNS Operator.
type: string
metadata:
additionalProperties:
type: string
description: Before successful attach, this field is populated with
CNS volume ID. Upon successful attach, this field is populated with
any information returned by the attach operation. This field must
only be set by the entity completing the attach operation, i.e.
the CNS Operator
type: object
required:
- attached
type: object
type: object
served: true
storage: true
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
Original file line number Diff line number Diff line change
@@ -0,0 +1,264 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
name: clustercontentlibraryitems.imageregistry.vmware.com
spec:
group: imageregistry.vmware.com
names:
kind: ClusterContentLibraryItem
listKind: ClusterContentLibraryItemList
plural: clustercontentlibraryitems
shortNames:
- cclitem
singular: clustercontentlibraryitem
scope: Cluster
versions:
- additionalPrinterColumns:
- jsonPath: .status.name
name: vSphereName
type: string
- jsonPath: .status.contentLibraryRef.name
name: ClusterContentLibraryRef
type: string
- jsonPath: .status.type
name: Type
type: string
- jsonPath: .status.conditions[?(.type=='Ready')].status
name: Ready
type: string
- jsonPath: .status.cached
name: Cached
type: boolean
- jsonPath: .status.sizeInBytes
name: SizeInBytes
type: string
- jsonPath: .status.securityCompliance
name: SecurityCompliant
type: boolean
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
name: v1alpha1
schema:
openAPIV3Schema:
description: |-
ClusterContentLibraryItem is the schema for the content library item API at the cluster scope.
Currently, ClusterContentLibraryItem is immutable to end users.
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: ContentLibraryItemSpec defines the desired state of a ContentLibraryItem.
properties:
uuid:
description: UUID is the identifier which uniquely identifies the
library item in vCenter. This field is immutable.
type: string
required:
- uuid
type: object
status:
description: ContentLibraryItemStatus defines the observed state of ContentLibraryItem.
properties:
cached:
default: false
description: Cached indicates if the library item files are on storage
in vCenter.
type: boolean
certificateVerificationInfo:
description: CertificateVerificationInfo shows the certificate verification
status and the signing certificate.
properties:
certChain:
description: CertChain shows the signing certificate chain in
base64 encoding if the library item is signed.
items:
type: string
type: array
status:
description: Status shows the certificate verification status
of the library item.
enum:
- NOT_AVAILABLE
- VERIFIED
- INTERNAL
- VERIFICATION_FAILURE
- VERIFICATION_IN_PROGRESS
- UNTRUSTED
type: string
type: object
conditions:
description: Conditions describes the current condition information
of the ContentLibraryItem.
items:
description: Condition defines an observation of an Image Registry
Operator API resource operational state.
properties:
lastTransitionTime:
description: |-
Last time the condition transitioned from one status to another.
This should be when the underlying condition changed. If that is not known, then using the time when
the API field changed is acceptable.
format: date-time
type: string
message:
description: |-
A human readable message indicating details about the transition.
This field may be empty.
type: string
reason:
description: |-
The reason for the condition's last transition in CamelCase.
The specific API may choose whether or not this field is considered a guaranteed API.
This field may not be empty.
type: string
severity:
description: |-
Severity provides an explicit classification of Reason code, so the users or machines can immediately
understand the current situation and act accordingly.
The Severity field MUST be set only when Status=False.
type: string
status:
description: Status of the condition, one of True, False, Unknown.
type: string
type:
description: |-
Type of condition in CamelCase or in foo.example.com/CamelCase.
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
can be useful (see .node.status.conditions), the ability to deconflict is important.
type: string
required:
- status
- type
type: object
type: array
contentLibraryRef:
description: ContentLibraryRef refers to the ContentLibrary custom
resource that this item belongs to.
properties:
kind:
description: |-
Kind is a string value representing the kind of resource to which this
object refers.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
name:
description: |-
Name refers to a unique resource in the current namespace.
More info: http://kubernetes.io/docs/user-guide/identifiers#names
type: string
required:
- name
type: object
contentVersion:
description: |-
ContentVersion indicates the version of the library item content in vCenter.
This value is incremented when the files comprising the content library item are changed in vCenter.
type: string
creationTime:
description: CreationTime indicates the date and time when this library
item was created in vCenter.
format: date-time
type: string
description:
description: Description is a human-readable description for this
library item.
type: string
fileInfo:
description: FileInfo represents zero, one or more files belonging
to the content library item in vCenter.
items:
description: FileInfo represents the information of a file in a
content library item in vCenter.
properties:
cached:
default: false
description: Cached indicates if the library item file is on
storage in vCenter.
type: boolean
name:
description: Name specifies the name of the file in vCenter.
type: string
sizeInBytes:
anyOf:
- type: integer
- type: string
description: SizeInBytes indicates the library item file size
in bytes on storage in vCenter.
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
version:
description: |-
Version indicates the version of the library item file in vCenter.
This value is incremented when a new copy of the file is uploaded to vCenter.
type: string
required:
- cached
- name
- sizeInBytes
- version
type: object
type: array
lastModifiedTime:
description: |-
LastModifiedTime indicates the date and time when this library item was last updated in vCenter.
This field is updated when the library item properties are changed or the file content is changed.
format: date-time
type: string
lastSyncTime:
description: |-
LastSyncTime indicates the date and time when this library item was last synchronized in vCenter.
This field applies only to the library items belonging to the library of Type=Subscribed.
format: date-time
type: string
metadataVersion:
description: |-
MetadataVersion indicates the version of the library item metadata in vCenter.
This value is incremented when the library item properties such as name or description are changed in vCenter.
type: string
name:
description: Name specifies the name of the content library item in
vCenter specified by the user.
type: string
securityCompliance:
description: SecurityCompliance shows the security compliance of the
library item.
type: boolean
sizeInBytes:
anyOf:
- type: integer
- type: string
description: SizeInBytes indicates the library item size in bytes
on storage in vCenter.
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type:
description: Type indicates the type of the library item in vCenter.
enum:
- OVF
- ISO
type: string
type: object
type: object
served: true
storage: true
subresources:
status: {}
Loading

0 comments on commit ca8e2e7

Please sign in to comment.