reconcile refactor (#10)

* update reconcile to use workque , predicate add watch on daemonset refactor to use apply for daemonset test apply change on cr for daemonset remove kubernetes module in go.mod * Complete auth support (#8) * Adding Unit teste * resolve golinbt issues * fix merge conflicts * update authorization helper to use apply for daemonset * fix auth test type errors * actions need container built with golang:1.17 * set go.mod controller-runtime to 0.10.3 , 0.11.0 fails to build with actions image-scanner * remove comments on calls where type changed Co-authored-by: Michael Edegware <[email protected]>
dell · Oct 15, 2024 · c43084b · c43084b
1 parent 70519e3
commit c43084b
Show file tree

Hide file tree

Showing 21 changed files with 937 additions and 1,037 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -12,7 +12,7 @@ jobs:
       - name: Checkout the code
         uses: actions/checkout@v2
       - name: Run the formatter, linter, and vetter
-        uses: dell/common-github-actions/go-code-formatter-linter-vetter@main
+        uses: dell/common-github-actions/go-code-formatter-linter-vetter@update-go-version
         with:
           directories: ./...
   sanitize:
@@ -82,4 +82,4 @@ jobs:
         uses: Azure/container-scan@v0
         with:
           image-name: controller:latest
-          severity-threshold: HIGH
+          severity-threshold: HIGH
diff --git a/api/v1/csm_types.go b/api/v1/csm_types.go
@@ -42,17 +42,9 @@ type ContainerStorageModuleStatus struct {
 	// +operator-sdk:csv:customresourcedefinitions:type=status,displayName="NodeStatus",xDescriptors="urn:alm:descriptor:com.tectonic.ui:podStatuses"
 	NodeStatus PodStatus `json:"nodeStatus,omitempty"`
 
-	// ContainerStorageModuleHash is a hash of the driver specification
-	// +operator-sdk:csv:customresourcedefinitions:type=status,displayName="ContainerStorageModuleHash",xDescriptors="urn:alm:descriptor:text"
-	ContainerStorageModuleHash uint64 `json:"csmHash,omitempty" yaml:"csmHash"`
-
 	// State is the state of the driver installation
 	// +operator-sdk:csv:customresourcedefinitions:type=status,displayName="State",xDescriptors="urn:alm:descriptor:text"
 	State CSMStateType `json:"state,omitempty" yaml:"state"`
-
-	// LastUpdate is the last updated state of the driver
-	// +operator-sdk:csv:customresourcedefinitions:type=status,displayName="LastUpdate"
-	LastUpdate LastUpdate `json:"lastUpdate,omitempty" yaml:"lastUpdate"`
 }
 
 //+kubebuilder:object:root=true

diff --git a/api/v1/types.go b/api/v1/types.go
@@ -13,7 +13,6 @@ package v1
 
 import (
 	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // CSMStateType - type representing the state of the ContainerStorageModule (in status)
@@ -123,19 +122,6 @@ type PodStatus struct {
 	Stopped   []string `json:"stopped,omitempty"`
 }
 
-// LastUpdate - Stores the last update condition for the ContainerStorageModule status
-type LastUpdate struct {
-
-	// Condition is the last known condition of the Custom Resource
-	Condition CSMOperatorConditionType `json:"condition,omitempty"`
-
-	// Time is the time stamp for the last condition update
-	Time metav1.Time `json:"time,omitempty" yaml:"time"`
-
-	// ErrorMessage is the last error message associated with the condition
-	ErrorMessage string `json:"errorMessage,omitempty" yaml:"errorMessage"`
-}
-
 // Driver of CSIDriver
 // +k8s:openapi-gen=true
 type Driver struct {

diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/storage.dell.com_containerstoragemodules.yaml b/config/crd/bases/storage.dell.com_containerstoragemodules.yaml
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -12,5 +12,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: 10.247.142.143:5000/csm-operator
-  newTag: v0.0.1
+  newName: controller
+  newTag: latest
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -92,6 +92,14 @@ rules:
   - list
   - update
   - watch
+- apiGroups:
+  - csi.storage.k8s.io
+  resources:
+  - csinodeinfos
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - monitoring.coreos.com
   resources:

diff --git a/config/samples/storage_v1_csm_powerscale.yaml b/config/samples/storage_v1_csm_powerscale.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   driver:
     siDriverType: "powerscale"
-    k8sVersion: v1.22
+    k8sVersion: v1.23
 
     # Config version for CSI PowerScale v2.0.0 driver
     configVersion: v2.0.0
@@ -156,4 +156,4 @@ spec:
 
             # insecure: Enable/Disable certificate validation of the csm-authorization server       
             - name: "INSECURE"
-              value: true
+              value: true