Bug 2014275: Special Resource Operator(SRO) - Fail to deploy simple-kmod on GCP

bundle/4.9/manifests/openshift-special-resource-operator.v4.9.0.clusterserviceversion.yaml

@@ -1309,6 +1309,8 @@ spec:
                 volumeMounts:
                 - mountPath: /cache
                   name: cache-volume
+                - mountPath: /home/nonroot/.docker
+                  name: cred-volume
               securityContext:
                 runAsGroup: 499
                 runAsNonRoot: true
@@ -1320,6 +1322,8 @@ spec:
                   secretName: special-resource-operator-tls
               - emptyDir: {}
                 name: cache-volume
+              - emptyDir: {}
+                name: cred-volume
       permissions:
       - rules:
         - apiGroups:

charts/deprecated/index.yaml

@@ -5,13 +5,13 @@ entries:
       appVersion: '>= 1.13.0 < 1.15.0'
     apiVersion: v2
     appVersion: 1.0.0
-    created: "2021-10-07T18:24:33.809556063+02:00"
+    created: "2021-10-08T06:28:26.980900766-04:00"
     description: Driver Container Base is the base image for out-of-tree builds
-    digest: 70f473588a4eb35879783f15b866faed06ab0e7422b6949977bfa44cdc94f015
+    digest: eceab9ebc8aa1f675fb81239e568d9537fcaab661c3fa3c8f9d3654091ea0e75
     icon: https://avatars.githubusercontent.com/u/55542927
     name: driver-container-base
     type: application
     urls:
     - file:///charts/deprecated/driver-container-base-0.1.0.tgz
     version: 0.1.0
-generated: "2021-10-07T18:24:33.809178622+02:00"
+generated: "2021-10-08T06:28:26.979700787-04:00"

charts/example/index.yaml

@@ -3,9 +3,9 @@ entries:
   centos-simple-kmod:
   - apiVersion: v2
     appVersion: 1.0.0
-    created: "2021-10-07T18:24:33.861645697+02:00"
+    created: "2021-10-08T06:28:27.081508316-04:00"
     description: Simple kmod will deploy a simple kmod driver-container
-    digest: 4a58436bd8b61842731e042c772ea6a16e0a34e0a08d88d424238edb05795640
+    digest: 410234130cfa21b08f462a7e41dcd26929871f99776cdc18b07839b27dec6b01
     icon: https://avatars.githubusercontent.com/u/55542927
     name: centos-simple-kmod
     type: application
@@ -15,9 +15,9 @@ entries:
   connaisseur:
   - apiVersion: v2
     appVersion: 1.16.0
-    created: "2021-10-07T18:24:33.862417441+02:00"
+    created: "2021-10-08T06:28:27.082391932-04:00"
     description: A Helm chart for the Connaisseur Admission Controller
-    digest: 8e0f409e769c52274a315bf613067f1a4ffa870ffb70cd471f4a56f6978af329
+    digest: f7b87e8ac556851d6a3b318e4dae83597c2456eccbcbbf659dc7f8e658007035
     name: connaisseur
     type: application
     urls:
@@ -26,9 +26,9 @@ entries:
   multi-build:
   - apiVersion: v2
     appVersion: 1.0.0
-    created: "2021-10-07T18:24:33.862631394+02:00"
+    created: "2021-10-08T06:28:27.082642892-04:00"
     description: Showcase how to use multiple Builds with different DTKs
-    digest: b12b86e06ae356a9d7db5b4764871ca23a12a6765c0349009159406296ec4748
+    digest: 4e06243ccc9f09db47e712b77036e90b2f60ce266c0a76167b4c0459b0a56261
     icon: https://avatars.githubusercontent.com/u/55542927
     name: multi-build
     type: application
@@ -38,9 +38,9 @@ entries:
   ping-pong:
   - apiVersion: v2
     appVersion: 1.0.0
-    created: "2021-10-07T18:24:33.862901916+02:00"
+    created: "2021-10-08T06:28:27.082938537-04:00"
     description: Simple go app to showcase cert-manager intergration
-    digest: 0fbb42c16272efb1d51a394423018a24bcf73bb8bf9e9c233f3edcab63ac91f7
+    digest: c9dad754319efef26af4ec875a6cdb69116586ac8bbec2eab6528937e3a34568
     icon: https://avatars.githubusercontent.com/u/55542927
     name: ping-pong
     type: application
@@ -50,13 +50,13 @@ entries:
   simple-kmod:
   - apiVersion: v2
     appVersion: 1.0.0
-    created: "2021-10-07T18:24:33.863061233+02:00"
+    created: "2021-10-08T06:28:27.083101342-04:00"
     description: Simple kmod will deploy a simple kmod driver-container
-    digest: d9ad2759328f2d21ed196425bf03a7579c2c0f45f19d351a20613ab8a4e94d6f
+    digest: efc108bc58d673f23fed0f69897931ba77257a155f4db5983033ab5012012c51
     icon: https://avatars.githubusercontent.com/u/55542927
     name: simple-kmod
     type: application
     urls:
     - file:///charts/example/simple-kmod-0.0.1.tgz
     version: 0.0.1
-generated: "2021-10-07T18:24:33.861330001+02:00"
+generated: "2021-10-08T06:28:27.081101202-04:00"

charts/experimental/index.yaml

@@ -3,9 +3,9 @@ entries:
   cert-manager:
   - apiVersion: v2
     appVersion: 1.4.0
-    created: "2021-10-07T18:24:33.93883601+02:00"
+    created: "2021-10-08T06:28:27.220347139-04:00"
     description: Simple go app to showcase cert-manager intergration
-    digest: ca59c3c429c5c3f2432b85287e82c1f52d09bc6365a7b4dea9f8529e190eb0f1
+    digest: 82840aeaa8f3c13080da63737e5561309a8ad4b1cecdc275e79982395aba6100
     icon: https://avatars.githubusercontent.com/u/55542927
     name: cert-manager
     type: application
@@ -15,13 +15,13 @@ entries:
   simple-kmod:
   - apiVersion: v2
     appVersion: 1.0.0
-    created: "2021-10-07T18:24:33.939044882+02:00"
+    created: "2021-10-08T06:28:27.220577702-04:00"
     description: Simple kmod will deploy a simple kmod driver-container
-    digest: ff0d44c2b7d1771e010009187d71a38128b755e1b06b056fa80667e52b69b1f9
+    digest: 1fbb91eb8e689032894d235f563e73427ef3a41c5b9cfa26ed92e676f72a46ef
     icon: https://avatars.githubusercontent.com/u/55542927
     name: simple-kmod
     type: application
     urls:
     - file:///charts/experimental/simple-kmod-0.0.1.tgz
     version: 0.0.1
-generated: "2021-10-07T18:24:33.932465394+02:00"
+generated: "2021-10-08T06:28:27.211807151-04:00"

charts/inaccel/index.yaml

@@ -3,9 +3,9 @@ entries:
   fpga-operator:
   - apiVersion: v2
     appVersion: "2.0"
-    created: "2021-10-07T18:24:33.98530441+02:00"
+    created: "2021-10-08T06:28:27.317473543-04:00"
     description: Simplifying FPGA management in Kubernetes
-    digest: 121427b2a0f9344922ff4c9cd4503a6edda3ad940e552a4b009d3d29d1041895
+    digest: 89a5658fee7391cf23e65297fcfd90cc857c28a8eeb38aaa07c70e259a456b54
     home: https://inaccel.com
     icon: https://en.gravatar.com/userimage/147236320/b395338a451c3220272055a0970bbd47.png?size=1250
     keywords:
@@ -22,4 +22,4 @@ entries:
     urls:
     - file:///charts/inaccel/fpga-operator-2.0.1.tgz
     version: 2.0.1
-generated: "2021-10-07T18:24:33.984752115+02:00"
+generated: "2021-10-08T06:28:27.316714771-04:00"

charts/infoscale/index.yaml

@@ -3,12 +3,12 @@ entries:
   infoscale-vtas:
   - apiVersion: v2
     appVersion: 8.0.0.0000
-    created: "2021-10-07T18:24:34.030768526+02:00"
+    created: "2021-10-08T06:28:27.416332254-04:00"
     description: A Helm chart for the deployment of Veritas InfoScale Resources
-    digest: 986a09eddd304ea8032c2286e9aece411747f734231324f4e407f272ade90d5c
+    digest: ca9eb53cb467c5fd4c066ee13d9226c305f5b81a973e7e796d9e8abf6150e0d4
     name: infoscale-vtas
     type: application
     urls:
     - file:///charts/infoscale/infoscale-vtas-0.0.1.tgz
     version: 0.0.1
-generated: "2021-10-07T18:24:34.030114501+02:00"
+generated: "2021-10-08T06:28:27.415587127-04:00"

charts/lustre/index.yaml

@@ -3,13 +3,13 @@ entries:
   lustre-aws-fsx:
   - apiVersion: v2
     appVersion: 1.0.0
-    created: "2021-10-07T18:24:34.076675141+02:00"
+    created: "2021-10-08T06:28:27.51309704-04:00"
     description: Out-of-tree driver for Lustre accessing AWS FSx service
-    digest: d5efd01e54bb2f99e80dd35e8e5bcd5853e9d890bb80fa1b6ad2b7b4cab760ab
+    digest: b885cd33ce2f344aac44862f8a82078ca424eb2a4b05e3f9eb6091ba2b335962
     icon: https://avatars.githubusercontent.com/u/55542927
     name: lustre-aws-fsx
     type: application
     urls:
     - file:///charts/lustre/lustre-aws-fsx-0.0.1.tgz
     version: 0.0.1
-generated: "2021-10-07T18:24:34.076086564+02:00"
+generated: "2021-10-08T06:28:27.512490142-04:00"

charts/olm/index.yaml

@@ -3,13 +3,13 @@ entries:
   cert-manager:
   - apiVersion: v2
     appVersion: 1.0.0
-    created: "2021-10-07T18:24:34.121374481+02:00"
+    created: "2021-10-08T06:28:27.604462384-04:00"
     description: A recipe to install cert-manager via OLM
-    digest: 0cdac076689b6993456536236ffea4bd9efe1f8e2281fabf889a5b8640ac45d2
+    digest: 7aac389a18b75d008dc8b4319598df7d12afb44ae4c04b4982a26da882edc7ad
     icon: https://avatars.githubusercontent.com/u/55542927
     name: cert-manager
     type: application
     urls:
     - file:///charts/olm/cert-manager-0.0.1.tgz
     version: 0.0.1
-generated: "2021-10-07T18:24:34.121071975+02:00"
+generated: "2021-10-08T06:28:27.604086099-04:00"

charts/staging/index.yaml

@@ -3,13 +3,13 @@ entries:
   shipwright:
   - apiVersion: v2
     appVersion: 0.4.0
-    created: "2021-10-07T18:24:34.168521833+02:00"
+    created: "2021-10-08T06:28:27.706269242-04:00"
     description: Build v2
-    digest: eb155cb4de99c626627ac9439a52512be224511502a660f118ebaf8a3b09c756
+    digest: e12542e6735201a503b1054c3cf9faf55a378304d9945ec38b7e02415f40d2fb
     icon: https://avatars.githubusercontent.com/u/55542927
     name: shipwright
     type: application
     urls:
     - file:///charts/staging/shipwright-4.7.0.tgz
     version: 4.7.0
-generated: "2021-10-07T18:24:34.167568138+02:00"
+generated: "2021-10-08T06:28:27.705164751-04:00"

charts/xilinx/index.yaml

@@ -3,12 +3,12 @@ entries:
   fpga-xrt-driver:
   - apiVersion: v2
     appVersion: 1.16.0
-    created: "2021-10-07T18:24:34.213106621+02:00"
+    created: "2021-10-08T06:28:27.804841926-04:00"
     description: A Helm chart for Kubernetes
-    digest: cee9af3dc68ad17e51086259cdca09ced8aec960af4c52aef6c1c90648ff3cfe
+    digest: c3306aa35d4e10ec34df877f110885b6c2af6184768ff5e58a0920443d74e2e8
     name: fpga-xrt-driver
     type: application
     urls:
     - file:///charts/xilinx/fpga-xrt-driver-4.7.11.tgz
     version: 4.7.11
-generated: "2021-10-07T18:24:34.212765029+02:00"
+generated: "2021-10-08T06:28:27.804393907-04:00"

config/manager/manager.yaml

@@ -57,7 +57,11 @@ spec:
           volumeMounts:
           - name: cache-volume
             mountPath: /cache
+          - name: cred-volume
+            mountPath: /home/nonroot/.docker
       volumes:
         - name: cache-volume
           emptyDir: {}
+        - name: cred-volume
+          emptyDir: {}
       terminationGracePeriodSeconds: 10

controllers/resources.go

@@ -175,6 +175,8 @@ func ReconcileChartStates(r *SpecialResourceReconciler, templates *unstructured.
 
 			RunInfo.ClusterVersionMajorMinor = version.ClusterVersion
 			RunInfo.OperatingSystemDecimal = version.OSVersion
+			RunInfo.OperatingSystemMajorMinor = version.OSMajorMinor
+			RunInfo.OperatingSystemMajor = version.OSMajor
 			RunInfo.DriverToolkitImage = version.DriverToolkit.ImageURL
 
 			if kernelAffine {

go.mod

@@ -5,9 +5,7 @@ go 1.16
 require (
 	github.com/go-logr/logr v0.4.0
 	github.com/google/go-containerregistry v0.5.2-0.20210601193515-0ffa4a5c8691
-	github.com/google/go-containerregistry/pkg/authn/k8schain v0.0.0-20210609162550-f0ce2270b3b4
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2 // indirect
 	github.com/mitchellh/hashstructure/v2 v2.0.1
 	github.com/onsi/ginkgo v1.16.4
 	github.com/onsi/gomega v1.13.0
@@ -18,10 +16,12 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.42.1
 	github.com/prometheus/client_golang v1.11.0
-	go.uber.org/multierr v1.6.0 // indirect
+	golang.org/x/oauth2 v0.0.0-20210427180440-81ed05c6b58c // indirect
+	gopkg.in/yaml.v2 v2.4.0
 	helm.sh/helm/v3 v3.6.0
 	k8s.io/api v0.21.1
 	k8s.io/apimachinery v0.21.1
+	k8s.io/cli-runtime v0.21.0
 	k8s.io/client-go v0.21.1
 	rsc.io/letsencrypt v0.0.3 // indirect
 	sigs.k8s.io/controller-runtime v0.9.0