Cherry-pick v1.4.3 changes into operator main branch (#515)

* Fix intermittent app-mobility status error (#504) * fix standalone AM status * add debug logs * Revert "add debug logs" This reverts commit 0ecb8ba. * add debug logs back This reverts commit e7eaa71. * try requeue when csm.state is failed * fix panic error * move sync error def * add UpdateStatus call to reconcile * remove extra debug logs --------- Co-authored-by: JacobGros <jacobgrosner4@gmail.com> * Remove "minio" as the region for the Velero resources (#505) * add custom region support * add file for unit test * remove minio hardcode from vsl * fix unit tests for 1.9.3 * clean up import * Add AM 1.0.2 support (#509) * add AM v1.0.2 * update version for testing * Update version-values.yaml (#511) * Final manifest update (#514) * final manifest update * indentation fix * remove unneeded certificate files * fix golangci-lint issues * update version for unit tests * Update version-values.yaml --------- Co-authored-by: JacobGros <jacobgrosner4@gmail.com> Co-authored-by: panigs7 <92028646+panigs7@users.noreply.github.com>
dell · Mar 5, 2024 · 0067f14 · 0067f14
1 parent ee81263
commit 0067f14
Show file tree

Hide file tree

Showing 33 changed files with 5,016 additions and 207 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.2.0
       - name: Run the formatter, linter, and vetter
         uses: dell/common-github-actions/go-code-formatter-linter-vetter@main
         with:
@@ -21,7 +21,7 @@ jobs:
   #  runs-on: ubuntu-latest
   #  steps:
   #    - name: Checkout the code
-  #      uses: actions/checkout@v3
+  #      uses: actions/checkout@v3.2.0
   #    - name: Run the forbidden words scan
   #      uses: dell/common-github-actions/code-sanitizer@main
   #      with:
@@ -31,13 +31,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.2.0
       - uses: actions/setup-go@v5
         with:
           go-version: "1.22"
           cache: false
       - name: Checkout csm-operator
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.2.0
         with:
           repository: 'dell/csm-operator'
           path: 'csm-operator'
@@ -50,7 +50,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.2.0
       - name: Run unit tests and check package coverage
         uses: dell/common-github-actions/go-code-tester@main
         with:
@@ -61,7 +61,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.2.0
       - name: Run unit tests and check package coverage
         uses: dell/common-github-actions/go-code-tester@main
         with:
@@ -72,7 +72,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.2.0
       - name: Run Go Security
         uses: securego/gosec@master
         with:
@@ -82,7 +82,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.2.0
       - name: Run malware scan
         uses: dell/common-github-actions/malware-scanner@main
         with:
@@ -100,7 +100,7 @@ jobs:
           go-version: ^1.22
         id: go
       - name: Checkout the code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.2.0
       - name: Build Docker Images
         run: DEFAULT_IMG=csm-operator:latest make -o gen-semver docker-build 
       - name: Scan controller Image

diff --git a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml
@@ -1296,6 +1296,10 @@ spec:
       - description: Args is the set of arguments for the container
         displayName: Container Arguments
         path: client.common.args
+      - description: Certificate is a certificate used for a certificate/private-key
+          pair
+        displayName: Certificate for certificate/private-key pair
+        path: client.common.certificate
       - description: Commander is the image tag for the Container
         displayName: Authorization Commander Container Image
         path: client.common.commander
@@ -1357,6 +1361,10 @@ spec:
       - description: OpaKubeMgmt is the image tag for the Container
         displayName: Authorization Opa Kube Management Container Image
         path: client.common.opaKubeMgmt
+      - description: PrivateKey is a private key used for a certificate/private-key
+          pair
+        displayName: Private key for certificate/private-key pair
+        path: client.common.privateKey
       - description: ProxyService is the image tag for the Container
         displayName: Authorization Proxy Service Container Image
         path: client.common.proxyService
@@ -1402,6 +1410,10 @@ spec:
       - description: Args is the set of arguments for the container
         displayName: Container Arguments
         path: client.initContainers[0].args
+      - description: Certificate is a certificate used for a certificate/private-key
+          pair
+        displayName: Certificate for certificate/private-key pair
+        path: client.initContainers[0].certificate
       - description: Commander is the image tag for the Container
         displayName: Authorization Commander Container Image
         path: client.initContainers[0].commander
@@ -1463,6 +1475,10 @@ spec:
       - description: OpaKubeMgmt is the image tag for the Container
         displayName: Authorization Opa Kube Management Container Image
         path: client.initContainers[0].opaKubeMgmt
+      - description: PrivateKey is a private key used for a certificate/private-key
+          pair
+        displayName: Private key for certificate/private-key pair
+        path: client.initContainers[0].privateKey
       - description: ProxyService is the image tag for the Container
         displayName: Authorization Proxy Service Container Image
         path: client.initContainers[0].proxyService
@@ -1497,6 +1513,10 @@ spec:
       - description: Args is the set of arguments for the container
         displayName: Container Arguments
         path: client.sideCars[0].args
+      - description: Certificate is a certificate used for a certificate/private-key
+          pair
+        displayName: Certificate for certificate/private-key pair
+        path: client.sideCars[0].certificate
       - description: Commander is the image tag for the Container
         displayName: Authorization Commander Container Image
         path: client.sideCars[0].commander
@@ -1558,6 +1578,10 @@ spec:
       - description: OpaKubeMgmt is the image tag for the Container
         displayName: Authorization Opa Kube Management Container Image
         path: client.sideCars[0].opaKubeMgmt
+      - description: PrivateKey is a private key used for a certificate/private-key
+          pair
+        displayName: Private key for certificate/private-key pair
+        path: client.sideCars[0].privateKey
       - description: ProxyService is the image tag for the Container
         displayName: Authorization Proxy Service Container Image
         path: client.sideCars[0].proxyService
@@ -1617,6 +1641,10 @@ spec:
       - description: Args is the set of arguments for the container
         displayName: Container Arguments
         path: driver.common.args
+      - description: Certificate is a certificate used for a certificate/private-key
+          pair
+        displayName: Certificate for certificate/private-key pair
+        path: driver.common.certificate
       - description: Commander is the image tag for the Container
         displayName: Authorization Commander Container Image
         path: driver.common.commander
@@ -1678,6 +1706,10 @@ spec:
       - description: OpaKubeMgmt is the image tag for the Container
         displayName: Authorization Opa Kube Management Container Image
         path: driver.common.opaKubeMgmt
+      - description: PrivateKey is a private key used for a certificate/private-key
+          pair
+        displayName: Private key for certificate/private-key pair
+        path: driver.common.privateKey
       - description: ProxyService is the image tag for the Container
         displayName: Authorization Proxy Service Container Image
         path: driver.common.proxyService
@@ -1715,6 +1747,10 @@ spec:
       - description: Args is the set of arguments for the container
         displayName: Container Arguments
         path: driver.controller.args
+      - description: Certificate is a certificate used for a certificate/private-key
+          pair
+        displayName: Certificate for certificate/private-key pair
+        path: driver.controller.certificate
       - description: Commander is the image tag for the Container
         displayName: Authorization Commander Container Image
         path: driver.controller.commander
@@ -1776,6 +1812,10 @@ spec:
       - description: OpaKubeMgmt is the image tag for the Container
         displayName: Authorization Opa Kube Management Container Image
         path: driver.controller.opaKubeMgmt
+      - description: PrivateKey is a private key used for a certificate/private-key
+          pair
+        displayName: Private key for certificate/private-key pair
+        path: driver.controller.privateKey
       - description: ProxyService is the image tag for the Container
         displayName: Authorization Proxy Service Container Image
         path: driver.controller.proxyService
@@ -1825,6 +1865,10 @@ spec:
       - description: Args is the set of arguments for the container
         displayName: Container Arguments
         path: driver.initContainers[0].args
+      - description: Certificate is a certificate used for a certificate/private-key
+          pair
+        displayName: Certificate for certificate/private-key pair
+        path: driver.initContainers[0].certificate
       - description: Commander is the image tag for the Container
         displayName: Authorization Commander Container Image
         path: driver.initContainers[0].commander
@@ -1886,6 +1930,10 @@ spec:
       - description: OpaKubeMgmt is the image tag for the Container
         displayName: Authorization Opa Kube Management Container Image
         path: driver.initContainers[0].opaKubeMgmt
+      - description: PrivateKey is a private key used for a certificate/private-key
+          pair
+        displayName: Private key for certificate/private-key pair
+        path: driver.initContainers[0].privateKey
       - description: ProxyService is the image tag for the Container
         displayName: Authorization Proxy Service Container Image
         path: driver.initContainers[0].proxyService
@@ -1920,6 +1968,10 @@ spec:
       - description: Args is the set of arguments for the container
         displayName: Container Arguments
         path: driver.node.args
+      - description: Certificate is a certificate used for a certificate/private-key
+          pair
+        displayName: Certificate for certificate/private-key pair
+        path: driver.node.certificate
       - description: Commander is the image tag for the Container
         displayName: Authorization Commander Container Image
         path: driver.node.commander
@@ -1981,6 +2033,10 @@ spec:
       - description: OpaKubeMgmt is the image tag for the Container
         displayName: Authorization Opa Kube Management Container Image
         path: driver.node.opaKubeMgmt
+      - description: PrivateKey is a private key used for a certificate/private-key
+          pair
+        displayName: Private key for certificate/private-key pair
+        path: driver.node.privateKey
       - description: ProxyService is the image tag for the Container
         displayName: Authorization Proxy Service Container Image
         path: driver.node.proxyService
@@ -2018,6 +2074,10 @@ spec:
       - description: Args is the set of arguments for the container
         displayName: Container Arguments
         path: driver.sideCars[0].args
+      - description: Certificate is a certificate used for a certificate/private-key
+          pair
+        displayName: Certificate for certificate/private-key pair
+        path: driver.sideCars[0].certificate
       - description: Commander is the image tag for the Container
         displayName: Authorization Commander Container Image
         path: driver.sideCars[0].commander
@@ -2079,6 +2139,10 @@ spec:
       - description: OpaKubeMgmt is the image tag for the Container
         displayName: Authorization Opa Kube Management Container Image
         path: driver.sideCars[0].opaKubeMgmt
+      - description: PrivateKey is a private key used for a certificate/private-key
+          pair
+        displayName: Private key for certificate/private-key pair
+        path: driver.sideCars[0].privateKey
       - description: ProxyService is the image tag for the Container
         displayName: Authorization Proxy Service Container Image
         path: driver.sideCars[0].proxyService
@@ -2126,6 +2190,10 @@ spec:
       - description: Args is the set of arguments for the container
         displayName: Container Arguments
         path: modules[0].components[0].args
+      - description: Certificate is a certificate used for a certificate/private-key
+          pair
+        displayName: Certificate for certificate/private-key pair
+        path: modules[0].components[0].certificate
       - description: Commander is the image tag for the Container
         displayName: Authorization Commander Container Image
         path: modules[0].components[0].commander
@@ -2187,6 +2255,10 @@ spec:
       - description: OpaKubeMgmt is the image tag for the Container
         displayName: Authorization Opa Kube Management Container Image
         path: modules[0].components[0].opaKubeMgmt
+      - description: PrivateKey is a private key used for a certificate/private-key
+          pair
+        displayName: Private key for certificate/private-key pair
+        path: modules[0].components[0].privateKey
       - description: ProxyService is the image tag for the Container
         displayName: Authorization Proxy Service Container Image
         path: modules[0].components[0].proxyService
@@ -2228,6 +2300,10 @@ spec:
       - description: Args is the set of arguments for the container
         displayName: Container Arguments
         path: modules[0].initContainer[0].args
+      - description: Certificate is a certificate used for a certificate/private-key
+          pair
+        displayName: Certificate for certificate/private-key pair
+        path: modules[0].initContainer[0].certificate
       - description: Commander is the image tag for the Container
         displayName: Authorization Commander Container Image
         path: modules[0].initContainer[0].commander
@@ -2289,6 +2365,10 @@ spec:
       - description: OpaKubeMgmt is the image tag for the Container
         displayName: Authorization Opa Kube Management Container Image
         path: modules[0].initContainer[0].opaKubeMgmt
+      - description: PrivateKey is a private key used for a certificate/private-key
+          pair
+        displayName: Private key for certificate/private-key pair
+        path: modules[0].initContainer[0].privateKey
       - description: ProxyService is the image tag for the Container
         displayName: Authorization Proxy Service Container Image
         path: modules[0].initContainer[0].proxyService

diff --git a/bundle/manifests/storage.dell.com_apexconnectivityclients.yaml b/bundle/manifests/storage.dell.com_apexconnectivityclients.yaml
@@ -65,6 +65,10 @@ spec:
                         items:
                           type: string
                         type: array
+                      certificate:
+                        description: Certificate is a certificate used for a certificate/private-key
+                          pair
+                        type: string
                       commander:
                         description: Commander is the image tag for the Container
                         type: string
@@ -250,6 +254,10 @@ spec:
                       opaKubeMgmt:
                         description: OpaKubeMgmt is the image tag for the Container
                         type: string
+                      privateKey:
+                        description: PrivateKey is a private key used for a certificate/private-key
+                          pair
+                        type: string
                       proxyService:
                         description: ProxyService is the image tag for the Container
                         type: string
@@ -346,6 +354,10 @@ spec:
                           items:
                             type: string
                           type: array
+                        certificate:
+                          description: Certificate is a certificate used for a certificate/private-key
+                            pair
+                          type: string
                         commander:
                           description: Commander is the image tag for the Container
                           type: string
@@ -533,6 +545,10 @@ spec:
                         opaKubeMgmt:
                           description: OpaKubeMgmt is the image tag for the Container
                           type: string
+                        privateKey:
+                          description: PrivateKey is a private key used for a certificate/private-key
+                            pair
+                          type: string
                         proxyService:
                           description: ProxyService is the image tag for the Container
                           type: string
@@ -615,6 +631,10 @@ spec:
                           items:
                             type: string
                           type: array
+                        certificate:
+                          description: Certificate is a certificate used for a certificate/private-key
+                            pair
+                          type: string
                         commander:
                           description: Commander is the image tag for the Container
                           type: string
@@ -802,6 +822,10 @@ spec:
                         opaKubeMgmt:
                           description: OpaKubeMgmt is the image tag for the Container
                           type: string
+                        privateKey:
+                          description: PrivateKey is a private key used for a certificate/private-key
+                            pair
+                          type: string
                         proxyService:
                           description: ProxyService is the image tag for the Container
                           type: string