Merge pull request #26 from NearNodeFlash/release-v0.0.2

Release v0.0.2
NearNodeFlash · May 1, 2023 · 9b46f25 · 9b46f25
2 parents 04659dc + b782631
commit 9b46f25
Show file tree

Hide file tree

Showing 1,441 changed files with 103,106 additions and 57,152 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -27,6 +27,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+    - name: "Build context"
+      run: |
+        echo "ref is ${{ github.ref }}"
+        echo "ref_type is ${{ github.ref_type }}"
+
     - name: "Checkout repository"
       id: checkout_repo
       uses: actions/checkout@v3

diff --git a/.github/workflows/verify_tag.yml b/.github/workflows/verify_tag.yml
@@ -7,13 +7,15 @@ on:
     tags:
       - "v*"
 
-env:
-  IMAGE_NAME: ${{ github.repository }}
-
 jobs:
-  build:
+  verify_tag:
     runs-on: ubuntu-latest
     steps:
+      - name: "Verify context"
+        run: |
+          echo "ref is ${{ github.ref }}"
+          echo "ref_type is ${{ github.ref_type }}"
+
       - uses: actions/checkout@v3
         # actions/checkout@v3 breaks annotated tags by converting them into
         # lightweight tags, so we need to force fetch the tag again

diff --git a/Makefile b/Makefile
@@ -59,7 +59,7 @@ IMAGE_TAG_BASE ?= ghcr.io/nearnodeflash/lustre-fs-operator
 # Image URL to use all building/pushing image targets
 
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.25.0
+ENVTEST_K8S_VERSION = 1.26.0
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -169,7 +169,7 @@ container-unit-test: .version ## Build docker image with the manager and execute
 	${DOCKER} run --rm -t --name $@-lustre-fs-operator $(IMAGE_TAG_BASE)-$@:$(VERSION)
 
 test: manifests generate fmt vet envtest ## Run tests.
-	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path --bin-dir $(LOCALBIN))" go test ./controllers/... ./api/... -coverprofile cover.out -args -ginkgo.v -ginkgo.progress
+	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path --bin-dir $(LOCALBIN))" go test ./controllers/... ./api/... -coverprofile cover.out -args -ginkgo.v
 
 ##@ Build
 
@@ -197,15 +197,15 @@ install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~
 	$(KUSTOMIZE) build config/crd | kubectl apply -f -
 
 uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config.
-	$(KUSTOMIZE) build config/crd | kubectl delete -f -
+	$(KUSTOMIZE) build config/crd | kubectl delete --ignore-not-found -f -
 
 deploy: VERSION ?= $(shell cat .version)
 deploy: .version kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
 	cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMAGE_TAG_BASE):$(VERSION)
 	$(KUSTOMIZE) build config/default | kubectl apply -f -
 
 undeploy: kustomize ## Undeploy controller from the K8s cluster specified in ~/.kube/config.
-	$(KUSTOMIZE) build config/default | kubectl delete -f -
+	$(KUSTOMIZE) build config/default | kubectl delete --ignore-not-found -f -
 
 # Let .version be phony so that a git update to the workarea can be reflected
 # in it each time it's needed.
@@ -228,7 +228,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
 
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v4.5.7
-CONTROLLER_TOOLS_VERSION ?= v0.9.2
+CONTROLLER_TOOLS_VERSION ?= v0.11.1
 
 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
 .PHONY: kustomize

diff --git a/PROJECT b/PROJECT
@@ -1,6 +1,5 @@
 domain: cray.hpe.com
 layout:
-
 - go.kubebuilder.io/v3
 plugins:
   manifests.sdk.operatorframework.io/v2: {}
@@ -13,6 +12,7 @@ resources:
     namespaced: true
   controller: true
   domain: cray.hpe.com
+  group: lus
   kind: LustreFileSystem
   path: github.com/NearNodeFlash/lustre-fs-operator/api/v1alpha1
   version: v1alpha1

diff --git a/api/v1alpha1/groupversion_info.go b/api/v1alpha1/groupversion_info.go
@@ -19,7 +19,7 @@
 
 // Package v1alpha1 contains API Schema definitions for the  v1alpha1 API group
 // +kubebuilder:object:generate=true
-// +groupName=cray.hpe.com
+// +groupName=lus.cray.hpe.com
 package v1alpha1
 
 import (
@@ -29,7 +29,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "cray.hpe.com", Version: "v1alpha1"}
+	GroupVersion = schema.GroupVersion{Group: "lus.cray.hpe.com", Version: "v1alpha1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

diff --git a/api/v1alpha1/lustrefilesystem_webhook.go b/api/v1alpha1/lustrefilesystem_webhook.go
@@ -47,7 +47,7 @@ func (r *LustreFileSystem) SetupWebhookWithManager(mgr ctrl.Manager) error {
 // EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
 
 // TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.
-//+kubebuilder:webhook:path=/validate-cray-hpe-com-v1alpha1-lustrefilesystem,mutating=false,failurePolicy=fail,sideEffects=None,groups=cray.hpe.com,resources=lustrefilesystems,verbs=create;update,versions=v1alpha1,name=vlustrefilesystem.kb.io,admissionReviewVersions=v1
+//+kubebuilder:webhook:path=/validate-lus-cray-hpe-com-v1alpha1-lustrefilesystem,mutating=false,failurePolicy=fail,sideEffects=None,groups=lus.cray.hpe.com,resources=lustrefilesystems,verbs=create;update,versions=v1alpha1,name=vlustrefilesystem.kb.io,admissionReviewVersions=v1
 
 var _ webhook.Validator = &LustreFileSystem{}
 

diff --git a/...bases/cray.hpe.com_lustrefilesystems.yaml → ...s/lus.cray.hpe.com_lustrefilesystems.yaml b/...bases/cray.hpe.com_lustrefilesystems.yaml → ...s/lus.cray.hpe.com_lustrefilesystems.yaml
@@ -3,11 +3,11 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.11.1
   creationTimestamp: null
-  name: lustrefilesystems.cray.hpe.com
+  name: lustrefilesystems.lus.cray.hpe.com
 spec:
-  group: cray.hpe.com
+  group: lus.cray.hpe.com
   names:
     kind: LustreFileSystem
     listKind: LustreFileSystemList

diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
@@ -2,7 +2,7 @@
 # since it depends on service name and namespace that are out of this kustomize package.
 # It should be run by config/default
 resources:
-- bases/cray.hpe.com_lustrefilesystems.yaml
+- bases/lus.cray.hpe.com_lustrefilesystems.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
 patchesStrategicMerge:

diff --git a/config/crd/patches/cainjection_in_lustrefilesystems.yaml b/config/crd/patches/cainjection_in_lustrefilesystems.yaml
@@ -4,4 +4,4 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
-  name: lustrefilesystems.cray.hpe.com
+  name: lustrefilesystems.lus.cray.hpe.com
diff --git a/config/crd/patches/webhook_in_lustrefilesystems.yaml b/config/crd/patches/webhook_in_lustrefilesystems.yaml
@@ -2,7 +2,7 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: lustrefilesystems.cray.hpe.com
+  name: lustrefilesystems.lus.cray.hpe.com
 spec:
   conversion:
     strategy: Webhook

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -30,7 +30,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - cray.hpe.com
+  - lus.cray.hpe.com
   resources:
   - lustrefilesystems
   verbs:
@@ -42,13 +42,13 @@ rules:
   - update
   - watch
 - apiGroups:
-  - cray.hpe.com
+  - lus.cray.hpe.com
   resources:
   - lustrefilesystems/finalizers
   verbs:
   - update
 - apiGroups:
-  - cray.hpe.com
+  - lus.cray.hpe.com
   resources:
   - lustrefilesystems/status
   verbs:

diff --git a/config/samples/craystack_lustrefilesystem.yaml b/config/samples/craystack_lustrefilesystem.yaml
@@ -3,12 +3,20 @@ kind: Namespace
 metadata:
   name: nnf-daffy-lustre
 ---
-apiVersion: cray.hpe.com/v1alpha1
+apiVersion: lus.cray.hpe.com/v1alpha1
 kind: LustreFileSystem
 metadata:
   name: w0-lustre-fs
   namespace: nnf-daffy-lustre
 spec:
   name: w0
-  mgsNid: rabbit-03@tcp
+  mgsNids: rabbit-03@tcp
   mountRoot: /lus/w0
+  namespaces:
+    nnf-daffy-lustre:
+      modes:
+        - ReadWriteMany
+
+
+
+
diff --git a/config/samples/kustomization.yaml b/config/samples/kustomization.yaml
@@ -1,4 +1,4 @@
 ## Append samples you want in your CSV to this file as resources ##
 resources:
-- _v1alpha1_lustrefilesystem.yaml
+- lus_v1alpha1_lustrefilesystem.yaml
 #+kubebuilder:scaffold:manifestskustomizesamples
diff --git a/...g/samples/_v1alpha1_lustrefilesystem.yaml → ...amples/lus_v1alpha1_lustrefilesystem.yaml b/...g/samples/_v1alpha1_lustrefilesystem.yaml → ...amples/lus_v1alpha1_lustrefilesystem.yaml
@@ -1,9 +1,13 @@
-apiVersion: cray.hpe.com/v1alpha1
+apiVersion: lus.cray.hpe.com/v1alpha1
 kind: LustreFileSystem
 metadata:
   name: lustrefilesystem-sample-maui
   namespace: nnf-lustre-fs-system
 spec:
   name: maui
-  mgsNid: 172.0.0.0@tcp
+  mgsNids: 172.0.0.0@tcp
   mountRoot: /lus/maui
+  namespaces:
+    default:
+      modes:
+        - ReadWriteMany
diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml
@@ -11,12 +11,12 @@ webhooks:
     service:
       name: webhook-service
       namespace: system
-      path: /validate-cray-hpe-com-v1alpha1-lustrefilesystem
+      path: /validate-lus-cray-hpe-com-v1alpha1-lustrefilesystem
   failurePolicy: Fail
   name: vlustrefilesystem.kb.io
   rules:
   - apiGroups:
-    - cray.hpe.com
+    - lus.cray.hpe.com
     apiVersions:
     - v1alpha1
     operations:

diff --git a/controllers/lustrefilesystem_controller.go b/controllers/lustrefilesystem_controller.go
@@ -39,7 +39,7 @@ import (
 )
 
 const (
-	finalizerLustreFileSystem = "cray.hpe.com/lustre_fs"
+	finalizerLustreFileSystem = "lus.cray.hpe.com/lustre_fs"
 )
 
 var (
@@ -54,9 +54,9 @@ type LustreFileSystemReconciler struct {
 	Scheme *runtime.Scheme
 }
 
-//+kubebuilder:rbac:groups=cray.hpe.com,resources=lustrefilesystems,verbs=get;list;watch;create;update;patch;delete
-//+kubebuilder:rbac:groups=cray.hpe.com,resources=lustrefilesystems/status,verbs=get;update;patch
-//+kubebuilder:rbac:groups=cray.hpe.com,resources=lustrefilesystems/finalizers,verbs=update
+//+kubebuilder:rbac:groups=lus.cray.hpe.com,resources=lustrefilesystems,verbs=get;list;watch;create;update;patch;delete
+//+kubebuilder:rbac:groups=lus.cray.hpe.com,resources=lustrefilesystems/status,verbs=get;update;patch
+//+kubebuilder:rbac:groups=lus.cray.hpe.com,resources=lustrefilesystems/finalizers,verbs=update
 //+kubebuilder:rbac:groups=core,resources=persistentvolumes,verbs=get;list;update;create;patch;delete;watch
 //+kubebuilder:rbac:groups=core,resources=persistentvolumeclaims,verbs=get;list;update;create;patch;delete;watch
 
@@ -77,7 +77,7 @@ func (r *LustreFileSystemReconciler) Reconcile(ctx context.Context, req ctrl.Req
 	}
 
 	statusUpdater := updater.NewStatusUpdater[*v1alpha1.LustreFileSystemStatus](fs)
-	defer func() { err = statusUpdater.CloseWithStatusUpdate(ctx, r, err) }()
+	defer func() { err = statusUpdater.CloseWithStatusUpdate(ctx, r.Client.Status(), err) }()
 
 	// Check if the object is being deleted.
 	if !fs.GetDeletionTimestamp().IsZero() {

diff --git a/controllers/suite_test.go b/controllers/suite_test.go
@@ -77,6 +77,10 @@ var _ = BeforeSuite(func() {
 
 	//+kubebuilder:scaffold:scheme
 
+	k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme})
+	Expect(err).NotTo(HaveOccurred())
+	Expect(k8sClient).NotTo(BeNil())
+
 	// https://book.kubebuilder.io/cronjob-tutorial/writing-tests.html
 	//    One thing that this autogenerated file is missing, however, is a way to actually start your controller.
 	//    The code above will set up a client for interacting with your custom Kind, but will not be able to test
@@ -105,9 +109,6 @@ var _ = BeforeSuite(func() {
 	}).SetupWithManager(k8sManager)
 	Expect(err).ToNot(HaveOccurred())
 
-	k8sClient = k8sManager.GetClient()
-	Expect(k8sClient).NotTo(BeNil())
-
 	go func() {
 		defer GinkgoRecover()
 		err := k8sManager.Start(ctx)