Skip to content

Commit

Permalink
Merge pull request #61 from NearNodeFlash/release-v0.1.0
Browse files Browse the repository at this point in the history
Release v0.1.0
  • Loading branch information
ajfloeder authored Apr 3, 2024
2 parents 93697e1 + 7a9e5a3 commit c47c1ed
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 40 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2021-2023 Hewlett Packard Enterprise Development LP
# Copyright 2021-2024 Hewlett Packard Enterprise Development LP
# Other additional copyright holders may be indicated within.
#
# The entirety of this work is licensed under the Apache License,
Expand Down Expand Up @@ -250,7 +250,7 @@ CONVERSION_VERIFIER_PKG := sigs.k8s.io/cluster-api/hack/tools/conversion-verifie

## Tool Versions
KUSTOMIZE_VERSION ?= v5.1.1
CONTROLLER_TOOLS_VERSION ?= v0.13.0
CONTROLLER_TOOLS_VERSION ?= v0.14.0
CONVERSION_GEN_VER := v0.28.2

# Can be "latest", but cannot be a tag, such as "v1.3.3". However, it will
Expand Down Expand Up @@ -328,7 +328,7 @@ verify-conversions: $(CONVERSION_VERIFIER) ## Verifies expected API conversion
.PHONY: envtest
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
$(ENVTEST): $(LOCALBIN)
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@v0.0.0-20240320141353-395cfc7486e6

.PHONY: bundle
bundle: manifests kustomize edit-image ## Generate bundle manifests and metadata, then validate generated files.
Expand Down
86 changes: 51 additions & 35 deletions config/crd/bases/lus.cray.hpe.com_lustrefilesystems.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
controller-gen.kubebuilder.io/version: v0.14.0
name: lustrefilesystems.lus.cray.hpe.com
spec:
group: lus.cray.hpe.com
Expand Down Expand Up @@ -42,28 +42,34 @@ spec:
description: LustreFileSystem is the Schema for the lustrefilesystems 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'
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: LustreFileSystemSpec defines the desired state of LustreFileSystem
properties:
mgsNids:
description: MgsNids is the list of comma- and colon- separated NIDs
of the MGS nodes to use for accessing the Lustre file system.
description: |-
MgsNids is the list of comma- and colon- separated NIDs of the MGS
nodes to use for accessing the Lustre file system.
type: string
mountRoot:
description: MountRoot is the mount path used to access the Lustre
file system from a host. Data Movement directives and Container
Profiles can reference this field.
description: |-
MountRoot is the mount path used to access the Lustre file system from a host. Data Movement
directives and Container Profiles can reference this field.
type: string
name:
description: Name is the name of the Lustre file system.
Expand Down Expand Up @@ -113,9 +119,10 @@ spec:
to the persistent volume claim, if present
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
x-kubernetes-map-type: atomic
Expand All @@ -124,9 +131,10 @@ spec:
the persistent volume, if present
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
x-kubernetes-map-type: atomic
Expand Down Expand Up @@ -178,28 +186,34 @@ spec:
description: LustreFileSystem is the Schema for the lustrefilesystems 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'
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: LustreFileSystemSpec defines the desired state of LustreFileSystem
properties:
mgsNids:
description: MgsNids is the list of comma- and colon- separated NIDs
of the MGS nodes to use for accessing the Lustre file system.
description: |-
MgsNids is the list of comma- and colon- separated NIDs of the MGS
nodes to use for accessing the Lustre file system.
type: string
mountRoot:
description: MountRoot is the mount path used to access the Lustre
file system from a host. Data Movement directives and Container
Profiles can reference this field.
description: |-
MountRoot is the mount path used to access the Lustre file system from a host. Data Movement
directives and Container Profiles can reference this field.
type: string
name:
description: Name is the name of the Lustre file system.
Expand Down Expand Up @@ -249,9 +263,10 @@ spec:
to the persistent volume claim, if present
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
x-kubernetes-map-type: atomic
Expand All @@ -260,9 +275,10 @@ spec:
the persistent volume, if present
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
x-kubernetes-map-type: atomic
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ kind: Kustomization
images:
- name: controller
newName: ghcr.io/nearnodeflash/lustre-fs-operator
newTag: 0.0.11
newTag: 0.1.0
3 changes: 2 additions & 1 deletion deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ if [[ $CMD == 'undeploy' ]]; then
$KUSTOMIZE build config/prometheus | kubectl delete --ignore-not-found -f-
fi
# Do not touch the namespace resource when deleting this service.
$KUSTOMIZE build "$OVERLAY_DIR" | yq eval 'select(.kind != "Namespace")' | kubectl delete --ignore-not-found -f -
# Wishing for yq(1)...
$KUSTOMIZE build "$OVERLAY_DIR" | python3 -c 'import yaml, sys; all_docs = yaml.safe_load_all(sys.stdin); less_docs=[doc for doc in all_docs if doc["kind"] != "Namespace"]; print(yaml.dump_all(less_docs))' | kubectl delete --ignore-not-found -f -
fi

exit 0

0 comments on commit c47c1ed

Please sign in to comment.