IBM
diff --git a/‎.github/workflows/commitlint.yaml‎
Lines changed: 1 addition & 5 deletions b/‎.github/workflows/commitlint.yaml‎
Lines changed: 1 addition & 5 deletions
diff --git a/‎.github/workflows/iso-ci.yaml‎
Lines changed: 8 additions & 7 deletions b/‎.github/workflows/iso-ci.yaml‎
Lines changed: 8 additions & 7 deletions
diff --git a/‎Dockerfile‎
Lines changed: 2 additions & 2 deletions b/‎Dockerfile‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎Makefile‎
Lines changed: 3 additions & 3 deletions b/‎Makefile‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎cmd/manager/main.go‎
Lines changed: 34 additions & 122 deletions b/‎cmd/manager/main.go‎
Lines changed: 34 additions & 122 deletions
diff --git a/‎docs/configuring/configuring.dita‎
Lines changed: 47 additions & 0 deletions b/‎docs/configuring/configuring.dita‎
Lines changed: 47 additions & 0 deletions
diff --git a/‎docs/configuring/limitations.dita‎
Lines changed: 27 additions & 0 deletions b/‎docs/configuring/limitations.dita‎
Lines changed: 27 additions & 0 deletions
diff --git a/‎docs/docs_general/docs_welcome.dita‎
Lines changed: 12 additions & 0 deletions b/‎docs/docs_general/docs_welcome.dita‎
Lines changed: 12 additions & 0 deletions
diff --git a/‎docs/docs_general/docs_whatsnew.dita‎
Lines changed: 37 additions & 0 deletions b/‎docs/docs_general/docs_whatsnew.dita‎
Lines changed: 37 additions & 0 deletions
@@ -1,10 +1,6 @@
 name: commitlint
 
-on:
-  push:
-    branches: [ '*' ]
-  pull_request:
-    branches: [ '*' ]
+on: workflow_dispatch
 
 jobs:
   commitlint:
 
@@ -14,13 +14,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go: ["1.16"]
+        go: ["1.18"]
     steps:
-    - uses: actions/setup-go@v2
+    - uses: actions/setup-go@v3
       with:
         go-version: ${{ matrix.go }}
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
 
@@ -32,13 +32,14 @@ jobs:
       run: |
         make check-copyright
 
-    - name: login to Docker Hub
+    - name: login to Quay.io
       # Only if we need to push an image
       if: ${{ github.event_name == 'release' && github.event.action == 'published' }}
       uses: docker/login-action@v1
       with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}
+        registry: quay.io
+        username: ${{ secrets.QUAYIO_USERNAME }}
+        password: ${{ secrets.QUAYIO_TOKEN }}
 
     # Setup for buildx
     - name: set up QEMU
@@ -67,4 +68,4 @@ jobs:
         # Only push if we are publishing a release
         push: ${{ github.event_name == 'release' && github.event.action == 'published' }}
         # Use a 'dev' tag, that won't be pushed, for non-release builds
-        tags: docker.io/ibmcom/ibm-storage-odf-block-driver:${{ steps.tag.outputs.version-without-v || 'dev' }}
+        tags: quay.io/ibmodffs/ibm-storage-odf-block-driver:${{ steps.tag.outputs.version-without-v || 'dev' }}
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM --platform=$BUILDPLATFORM golang:1.16 as builder
+FROM --platform=$BUILDPLATFORM golang:1.18 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
@@ -20,7 +20,7 @@ LABEL vendor="IBM" \
   org.label-schema.vendor="IBM" \
   org.label-schema.name="ibm storage odf driver" \
   org.label-schema.vcs-url="https://github.com/IBM/ibm-storage-odf-block-driver" \
-  org.label-schema.schema-version="1.0.1"
+  org.label-schema.schema-version="1.3.0"
 
 WORKDIR /
 
 
@@ -1,9 +1,9 @@
 
 LINT_VERSION="1.40.0"
 
-IMAGE_REPO="docker.io"
-NAME_SPACE="ibmcom"
-DRIVER_IMAGE_VERSION=1.0.1
+IMAGE_REPO="quay.io"
+NAME_SPACE="ibmodffs"
+DRIVER_IMAGE_VERSION=1.3.0
 
 DRIVER_NAME=ibm-storage-odf-block-driver
 
 
@@ -18,155 +18,67 @@ package main
 
 import (
 	"fmt"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"k8s.io/klog"
-
-	"k8s.io/apimachinery/pkg/runtime"
-	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
-	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
-
-	drivermanager "github.com/IBM/ibm-storage-odf-block-driver/pkg/driver"
+	clientmanagers "github.com/IBM/ibm-storage-odf-block-driver/pkg/managers"
 	"github.com/IBM/ibm-storage-odf-block-driver/pkg/prome"
 	"github.com/IBM/ibm-storage-odf-block-driver/pkg/rest"
 	operatorapi "github.com/IBM/ibm-storage-odf-operator/api/v1alpha1"
-	operutil "github.com/IBM/ibm-storage-odf-operator/controllers/util"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	log "k8s.io/klog"
+	"os"
+	"os/signal"
+	"syscall"
 )
 
-var scheme = runtime.NewScheme()
-
-func init() {
-	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
-	utilruntime.Must(operatorapi.AddToScheme(scheme))
-}
-
 const (
-	EnvUserName = "USERNAME"
-	EnvPassword = "PASSWORD"
-	EnvRestAddr = "REST_API_IP"
+	EnvNamespaceName = "WATCH_NAMESPACE"
 )
 
-func getRestConfigFromEnv() (*rest.Config, error) {
-	envVars := map[string]string{
-		EnvUserName: "",
-		EnvPassword: "",
-		EnvRestAddr: "",
-	}
-
-	for k := range envVars {
-		if value, ok := os.LookupEnv(k); ok {
-			envVars[k] = value
-		} else {
-			return nil, fmt.Errorf("Required env variable: '%s' isn't found", k)
-		}
-	}
-
-	restConfig := &rest.Config{
-		Host:     envVars[EnvRestAddr],
-		Username: envVars[EnvUserName],
-		Password: envVars[EnvPassword],
-	}
-
-	return restConfig, nil
+func init() {
+	utilruntime.Must(clientgoscheme.AddToScheme(clientmanagers.Scheme))
+	utilruntime.Must(operatorapi.AddToScheme(clientmanagers.Scheme))
 }
 
 func main() {
-	klog.InitFlags(nil)
+	log.InitFlags(nil)
 
-	scPoolMap, err := operutil.GetPoolConfigmapContent()
+	namespace, err := getOperatorNamespace()
 	if err != nil {
-		klog.Errorf("Read pool configmap failed, error: %s", err)
-		panic(err)
-	} else {
-		klog.Infof("Read pool configmap %v", scPoolMap)
-	}
-
-	var valid bool
-	mgr, err := drivermanager.NewManager(scheme, scPoolMap.ScPool)
-	if err != nil {
-		klog.Errorf("Initialize mamager failed, error: %s", err)
-		panic(err)
-	}
-
-	restConfig, err := getRestConfigFromEnv()
-	if err != nil {
-		klog.Error(err)
-		panic(err)
-	}
-
-	restClient, err := rest.NewFSRestClient(restConfig)
-	if err != nil {
-		// Update condition
-		var _ = mgr.UpdateCondition(operatorapi.ExporterReady, false, drivermanager.AuthFailure, drivermanager.AuthFailureMessage)
-		klog.Errorf("Fail to initialize rest client, error: %s", err)
-		goto error_out
+		os.Exit(1)
 	}
 
-	valid, err = restClient.CheckVersion()
-	if err != nil {
-		klog.Errorf("Flash system version check hit error: %s", err)
-		// Update condition
-		var _ = mgr.UpdateCondition(operatorapi.ExporterReady, false, drivermanager.RestFailure, drivermanager.RestErrorMessage)
-		goto error_out
-	} else if !valid {
-		klog.Error("Flash system version invalid")
-		var _ = mgr.UpdateCondition(operatorapi.ExporterReady, false, drivermanager.VersionCheckFailed, drivermanager.VersionCheckErrMessage)
-		goto error_out
-	}
-
-	// Print the user role in log.
-	valid, err = restClient.CheckUserRole()
-	if err != nil {
-		klog.Errorf("Flash system user role check hit errors: %s", err)
-		// Update condition
-		var _ = mgr.UpdateCondition(operatorapi.ExporterReady, false, drivermanager.RestFailure, drivermanager.RestErrorMessage)
-		goto error_out
-	} else if !valid {
-		klog.Error("Flash system user role invalid")
-		// Update condition
-		var _ = mgr.UpdateCondition(operatorapi.ExporterReady, false, drivermanager.RoleCheckFailed, drivermanager.RoleCheckErrMessage)
-		goto error_out
-	}
-
-	// ready, err = restClient.CheckFlashsystemClusterState()
-	// if err != nil {
-	// 	klog.Errorf("Flash system cluster state check hit errors: %s", err)
-	// 	// Update condition
-	// 	var _ = mgr.UpdateCondition(operatorapi.ExporterReady, false, drivermanager.RestFailure, drivermanager.RestErrorMessage)
-	// 	goto error_out
-	// } else if !ready {
-	// 	klog.Error("Flash system cluster is not online")
-	// 	// Update condition
-	// 	var _ = mgr.UpdateCondition(operatorapi.ExporterReady, false, drivermanager.ClusterNotOnline, drivermanager.ClusterErrMessage)
-	// 	goto error_out
-	// } else {
-	// 	klog.Info("Flash system cluster ready")
-	// }
-
-	// Update ready condition
-	{
-		var _ = mgr.UpdateCondition(operatorapi.ExporterReady, true, "", "")
-		var _ = mgr.UpdateCondition(operatorapi.StorageClusterReady, true, "", "")
-		klog.Info("Exporter check done, ready to serve")
+	systems, err := clientmanagers.GetManagers(namespace, make(map[string]*rest.FSRestClient))
+	if err != nil || len(systems) == 0 {
+		log.Error("Could not create managers")
+		os.Exit(1)
 	}
 
 	// TODO: handle pod terminating signal
-	go prome.RunExporter(restClient, mgr.GetSubsystemName(), mgr.GetNamespaceName())
+	go prome.RunExporter(systems, namespace)
+	waitForSignal()
 
-error_out:
+}
+
+func waitForSignal() {
 	sigs := make(chan os.Signal, 1)
 	done := make(chan bool, 1)
 	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
-	klog.Info("Awaiting signal to exit")
+	log.Info("Awaiting signal to exit")
 	go func() {
 		sig := <-sigs
-		klog.Infof("Received signal: %+v, clean up...", sig)
+		log.Infof("Received signal: %+v, clean up...", sig)
 		done <- true
 	}()
 
 	// exiting
 	<-done
-	klog.Info("Exiting")
+	log.Info("Exiting")
+}
+
+func getOperatorNamespace() (string, error) {
+	if value, ok := os.LookupEnv(EnvNamespaceName); ok {
+		return value, nil
+	} else {
+		return "", fmt.Errorf("required env variable: '%s' isn't found", EnvNamespaceName)
+	}
 }
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA IBM Reference//EN" "ibm-reference.dtd">
+<reference id="configuring" xml:lang="en-us">
+<title>Configuring</title>
+<titlealts>
+<navtitle>Configuring</navtitle>
+<searchtitle>Configuring</searchtitle>
+</titlealts>
+<shortdesc><tm trademark="Red Hat" tmtype="reg">Red Hat</tm>
+<tm trademark="OpenShift" tmtype="reg">OpenShift</tm> Data Foundation (ODF) uses the <ph
+translate="no">ODF FlashSystem driver</ph> to integrate with your <tm trademark="IBM FlashSystem"
+tmtype="reg">IBM FlashSystem</tm> storage system. When using the <tm trademark="OpenShift"
+tmtype="reg">OpenShift</tm> Data Foundation with your storage system ensure that all configuration
+needs are met by following the <tm trademark="Red Hat" tmtype="reg">Red Hat</tm> ODF documentation
+set.</shortdesc>
+<refbody>
+<section>
+<p>The <ph translate="no">ODF FlashSystem driver</ph> enable IBM Spectrum Virtualize family products
+to be used with <tm trademark="Red Hat" tmtype="reg">Red Hat</tm>
+<tm trademark="OpenShift" tmtype="reg">OpenShift</tm> Data Foundation.</p>
+<p>For more information and documentation, see the following:<ul>
+<li>Support summary for enabled IBM Spectrum Virtualize family products and <tm trademark="Red Hat"
+tmtype="reg">Red Hat</tm>
+<tm trademark="OpenShift" tmtype="reg">OpenShift</tm> Data Foundation: <xref
+href="../landing/odf_flashsystem_driver_support_matrix.html" scope="peer" format="html">ODF
+FlashSystem driver support summary</xref>.</li>
+<li>User information and release notes documentation for the <tm trademark="Red Hat" tmtype="reg"
+>Red Hat</tm>
+<tm trademark="OpenShift" tmtype="reg">OpenShift</tm> Data Foundation: <xref
+href="https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation" format="html"
+scope="external"><tm trademark="OpenShift" tmtype="reg">OpenShift</tm> Data Foundation
+documentation</xref>.</li>
+<li>General information about the <tm trademark="OpenShift" tmtype="reg">OpenShift</tm> Data
+Foundation, a software-defined storage for containers: <xref
+href="https://www.redhat.com/en/technologies/cloud-computing/openshift-data-foundation"
+format="html" scope="external"><tm trademark="OpenShift" tmtype="reg">OpenShift</tm> Data
+Foundation</xref>.</li>
+</ul></p>
+</section>
+<section id="odf_config">
+<title>Configuration considerations</title>
+<p>When creating block storage persistent volumes, be sure to select the storage class
+<cmdname>&lt;storage_class_name&gt;</cmdname> for best performance. The storage class allows a
+direct I/O path to the FlashSystem storage system.</p>
+</section>
+</refbody>
+</reference><?tm 1639394264348 22 Red Hat||OpenShift||IBM FlashSystem||IBM||Ceph ?>
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA IBM Reference//EN" "ibm-reference.dtd">
+<reference id="svc_odf_config" xml:lang="en-us" otherprops="50845">
+<title>Limitations</title>
+<titlealts>
+<navtitle>Limitations</navtitle>
+<searchtitle>Limitations</searchtitle>
+</titlealts>
+<shortdesc>Refer to these limitations before working with the <ph translate="no">ODF FlashSystem
+driver</ph>.</shortdesc>
+<refbody>
+<section id="limitations">The <ph translate="no">ODF FlashSystem driver</ph> contains the following limitations:<ul>
+<li>Only x86 architecture is supported.</li>
+<li>When creating a storage class from within the <tm trademark="Red Hat" tmtype="reg">Red Hat</tm>
+ODF user-interface, installation of <tm trademark="Ceph" tmtype="reg">Ceph</tm> RWO on FlashSystem
+storage systems is allowed. When working with FlashSystem storage systems, it is best to use a
+direct I/O path to the storage system. For more information, see <xref
+href="configuring.dita#configuring/odf_config"/>.</li>
+<li>The following individual reports are not currently generated:<ul>
+<li>Pool performance</li>
+<li>Volume performance</li>
+<li>Volume storage class capacity</li>
+</ul></li>
+<li>Reports are not generated for FlashSystem information and events.</li>
+</ul></section>
+</refbody>
+</reference><?tm 1639394264348 22 Red Hat||OpenShift||IBM FlashSystem||IBM||Ceph ?>
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA Topic//EN" "topic.dtd">
+<topic id="welcome" outputclass="kc_welcome" xml:lang="en-us">
+<title>ODF FlashSystem driver welcome</title>
+<prolog>
+<copyright>
+<copyryear year="2022"/>
+<copyrholder/><!--Add copyright year or years as the "year" attribute for copyryear. Copyright holder information is filled in automatically
+ for IBM. Critdates are not currently used by the transform, but they are preserved in the metadata. -->
+</copyright>
+</prolog>
+</topic>
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA IBM Concept//EN" "ibm-concept.dtd">
+<?Pub Inc?><concept id="docs_whatsnew" xml:lang="en-us">
+<title>What's new</title>
+<shortdesc>This topic lists the dates and nature of updates to the published information of the <ph
+translate="no">ODF FlashSystem driver</ph>.</shortdesc>
+<conbody>
+<table>
+<tgroup cols="2">
+<colspec colname="col1" colwidth="29*" />
+<colspec colname="col2" colwidth="70*" />
+<thead>
+<row outputclass="xlight" valign="bottom">
+<entry align="left" colname="col1">Date</entry>
+<entry align="left" colname="col2">Nature of updates to the published information</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1">31 January 2023</entry>
+<entry colname="col2">
+<p>The version information was added in IBM Documentation as part of the initial <ph translate="no"
+>ODF FlashSystem driver</ph> 1.3.0 release.</p>
+<p><ph translate="no">ODF FlashSystem driver</ph> adds new support for the following:<ul>
+<li>Multiple FlashSystem storage systems, including health, capacity, and performance
+information.</li>
+<li>Storage calculations for FlashSystem child pools.</li>
+<li>External storage system calculations.</li>
+</ul></p>
+</entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+</conbody>
+
+</concept><?Pub *0000001199?><?tm 1670402701300 1 IBM ?>