Merge release v0.1.8

Release v0.1.8

PROJECT

@@ -1,9 +1,24 @@
+# Code generated by tool. DO NOT EDIT.
+# This file is used to track the info used to scaffold your project
+# and allow the plugins properly work.
+# More info: https://book.kubebuilder.io/reference/project-config.html
 domain: cray.hpe.com
 layout:
-  - go.kubebuilder.io/v4
+- go.kubebuilder.io/v4
 plugins:
   manifests.sdk.operatorframework.io/v2: {}
   scorecard.sdk.operatorframework.io/v2: {}
 projectName: nnf-dm
 repo: github.com/NearNodeFlash/nnf-dm
-version: '3'
+resources:
+- controller: true
+  domain: cray.hpe.com
+  group: nnfdm
+  kind: DataMovement
+  version: v1alpha1
+- controller: true
+  domain: cray.hpe.com
+  group: nnfdm
+  kind: DataMovementManager
+  version: v1alpha1
+version: "3"

cmd/main.go

@@ -1,5 +1,5 @@
 /*
- * 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,
@@ -42,7 +42,7 @@ import (
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
 	lusv1beta1 "github.com/NearNodeFlash/lustre-fs-operator/api/v1beta1"
-	nnfv1alpha1 "github.com/NearNodeFlash/nnf-sos/api/v1alpha1"
+	nnfv1alpha2 "github.com/NearNodeFlash/nnf-sos/api/v1alpha2"
 
 	controllers "github.com/NearNodeFlash/nnf-dm/internal/controller"
 	//+kubebuilder:scaffold:imports
@@ -57,7 +57,7 @@ func init() {
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
 
 	utilruntime.Must(lusv1beta1.AddToScheme(scheme))
-	utilruntime.Must(nnfv1alpha1.AddToScheme(scheme))
+	utilruntime.Must(nnfv1alpha2.AddToScheme(scheme))
 
 	//+kubebuilder:scaffold:scheme
 }
@@ -177,7 +177,7 @@ func (*managerController) GetType() string { return ManagerController }
 func (*managerController) SetOptions(opts *ctrl.Options) {
 	namespaceCache := make(map[string]cache.Config)
 	namespaceCache[corev1.NamespaceDefault] = cache.Config{}
-	namespaceCache[nnfv1alpha1.DataMovementNamespace] = cache.Config{}
+	namespaceCache[nnfv1alpha2.DataMovementNamespace] = cache.Config{}
 	opts.Cache = cache.Options{DefaultNamespaces: namespaceCache}
 }
 
@@ -200,16 +200,16 @@ func (*defaultController) GetType() string { return DefaultController }
 func (*defaultController) SetOptions(opts *ctrl.Options) {
 	namespaceCache := make(map[string]cache.Config)
 	namespaceCache[corev1.NamespaceDefault] = cache.Config{}
-	namespaceCache[nnfv1alpha1.DataMovementNamespace] = cache.Config{}
-	namespaceCache[nnfv1alpha1.DataMovementProfileNamespace] = cache.Config{}
+	namespaceCache[nnfv1alpha2.DataMovementNamespace] = cache.Config{}
+	namespaceCache[nnfv1alpha2.DataMovementProfileNamespace] = cache.Config{}
 	opts.Cache = cache.Options{DefaultNamespaces: namespaceCache}
 }
 
 func (c *defaultController) SetupReconcilers(mgr manager.Manager) (err error) {
 	if err = (&controllers.DataMovementReconciler{
 		Client:         mgr.GetClient(),
 		Scheme:         mgr.GetScheme(),
-		WatchNamespace: nnfv1alpha1.DataMovementNamespace,
+		WatchNamespace: nnfv1alpha2.DataMovementNamespace,
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", c.GetType())
 		os.Exit(1)
@@ -227,8 +227,8 @@ func (*nodeController) GetType() string { return NodeController }
 func (*nodeController) SetOptions(opts *ctrl.Options) {
 	namespaceCache := make(map[string]cache.Config)
 	namespaceCache[corev1.NamespaceDefault] = cache.Config{}
-	namespaceCache[nnfv1alpha1.DataMovementNamespace] = cache.Config{}
-	namespaceCache[nnfv1alpha1.DataMovementProfileNamespace] = cache.Config{}
+	namespaceCache[nnfv1alpha2.DataMovementNamespace] = cache.Config{}
+	namespaceCache[nnfv1alpha2.DataMovementProfileNamespace] = cache.Config{}
 	namespaceCache[os.Getenv("NNF_NODE_NAME")] = cache.Config{}
 	opts.Cache = cache.Options{DefaultNamespaces: namespaceCache}
 }

config/manager/kustomization.yaml

@@ -1,5 +1,6 @@
 resources:
 - manager.yaml
+- worker-sshd-config.yaml
 
 generatorOptions:
   disableNameSuffixHash: true
@@ -16,7 +17,7 @@ kind: Kustomization
 images:
 - name: controller
   newName: ghcr.io/nearnodeflash/nnf-dm
-  newTag: 0.1.6
+  newTag: 0.1.8
 - name: nnf-mfu
   newName: ghcr.io/nearnodeflash/nnf-mfu
   newTag: 0.1.2

config/manager/manager.yaml

@@ -47,7 +47,7 @@ spec:
       serviceAccountName: controller-manager
       terminationGracePeriodSeconds: 10
 ---
-apiVersion: nnf.cray.hpe.com/v1alpha1
+apiVersion: nnf.cray.hpe.com/v1alpha2
 kind: NnfDataMovementManager
 metadata:
   name: manager-controller-manager
@@ -82,6 +82,10 @@ spec:
             privileged: true
             capabilities:
               add: ['SETUID', 'SETGID', 'MKNOD']
+          volumeMounts:
+            - name:  worker-config
+              mountPath: /etc/ssh/sshd_config
+              subPath: sshd_config
         - name: manager
           command:
             - /manager
@@ -94,3 +98,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
+      volumes:
+        - name: worker-config
+          configMap:
+            name: nnf-dm-worker-config

config/manager/manager_imagepullsecret_patch.yaml

@@ -9,7 +9,7 @@ spec:
       imagePullSecrets:
         - name: name_of_secret
 ---
-apiVersion: nnf.cray.hpe.com/v1alpha1
+apiVersion: nnf.cray.hpe.com/v1alpha2
 kind: NnfDataMovementManager
 metadata:
   name: manager-controller-manager

config/manager/worker-sshd-config.yaml

@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: worker-config
+data:
+  sshd_config: |
+    Include /etc/ssh/sshd_config.d/*.conf
+    Port 2222
+    StrictModes no
+    MaxSessions 4096
+    MaxStartups 4096
+    ChallengeResponseAuthentication no
+    UsePAM yes
+    X11Forwarding yes
+    PrintMotd no
+    AcceptEnv LANG LC_*
+    Subsystem sftp /usr/lib/openssh/sftp-server

crd-bumper.yaml

@@ -0,0 +1,10 @@
+# A comma-separated list of directories where more Go code can be found, beyond
+# the usual cmd/, api/, internal/ that kubebuilder would put in place. The Go
+# files in these dirs will be bumped to the new hub version.
+extra_go_dirs: daemons/compute/server/servers
+
+# A comma-separated list of directories of Kustomize config files that have
+# references to the API and that must be updated to the new hub version so
+# that ArgoCD can sync them.
+extra_config_dirs: config/manager
+