Merge pull request #1460 from rancher/enh-603

Add storage class option and fix IntOrStr
rancher · May 31, 2023 · 00d48d0 · 00d48d0
2 parents e85e578 + 302afa3
commit 00d48d0
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 3 deletions.
diff --git a/go.mod b/go.mod
@@ -104,7 +104,7 @@ require (
 	github.com/qmuntal/stateless v1.6.3
 	github.com/rancher/charts-build-scripts v0.0.0-00010101000000-000000000000
 	github.com/rancher/kubernetes-provider-detector v0.1.5
-	github.com/rancher/wrangler v1.1.1
+	github.com/rancher/wrangler v1.1.1-0.20230419173538-80fdf092be3b
 	github.com/samber/lo v1.38.1
 	github.com/spf13/afero v1.9.5
 	github.com/spf13/cobra v1.7.0

diff --git a/go.sum b/go.sum
@@ -2856,8 +2856,8 @@ github.com/rancher/kubernetes-provider-detector v0.1.5 h1:hWRAsWuJOemzGjz/XrbTlM
 github.com/rancher/kubernetes-provider-detector v0.1.5/go.mod h1:ypuJS7kP7rUiAn330xG46mj+Nhvym05GM8NqMVekpH0=
 github.com/rancher/lasso v0.0.0-20221227210133-6ea88ca2fbcc h1:29VHrInLV4qSevvcvhBj5UhQWkPShxrxv4AahYg2Scw=
 github.com/rancher/lasso v0.0.0-20221227210133-6ea88ca2fbcc/go.mod h1:dEfC9eFQigj95lv/JQ8K5e7+qQCacWs1aIA6nLxKzT8=
-github.com/rancher/wrangler v1.1.1 h1:wmqUwqc2M7ADfXnBCJTFkTB5ZREWpD78rnZMzmxwMvM=
-github.com/rancher/wrangler v1.1.1/go.mod h1:ioVbKupzcBOdzsl55MvEDN0R1wdGggj8iNCYGFI5JvM=
+github.com/rancher/wrangler v1.1.1-0.20230419173538-80fdf092be3b h1:rs3WYld8iaRcSzCmM/CrCIVz9uVgfd96o7FsufIdoVI=
+github.com/rancher/wrangler v1.1.1-0.20230419173538-80fdf092be3b/go.mod h1:D6Tu6oVX8aGtCHsMCtYaysgVK3ad920MTSeAu7rzb5U=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=

diff --git a/packages/opni-agent/opni-agent/charts/templates/statefulset_v2.yaml b/packages/opni-agent/opni-agent/charts/templates/statefulset_v2.yaml
@@ -178,6 +178,9 @@ spec:
         name: plugins
       spec:
         accessModes: [ "ReadWriteOnce" ]
+        {{- if .Values.global.storageClass }}
+        storageClassName: {{ .Values.global.storageClass }}
+        {{- end }}
         resources:
           requests:
             storage: 2Gi

diff --git a/packages/opni-agent/opni-agent/charts/values.yaml b/packages/opni-agent/opni-agent/charts/values.yaml
@@ -110,3 +110,4 @@ kube-prometheus-stack:
 global:
   cattle:
     systemDefaultRegistry: ""
+  storageClass: ""
diff --git a/packages/opni/opni/charts/templates/nats.yaml b/packages/opni/opni/charts/templates/nats.yaml
@@ -11,6 +11,9 @@ spec:
     memoryStorageSize: 1Gi
     fileStorage:
       pvc:
+        {{- if .Values.global.storageClass }}
+        storageClass: {{ .Values.global.storageClass }}
+        {{- end }}
         accessModes:
           - ReadWriteOnce
       enabled: true

diff --git a/packages/opni/opni/charts/values.yaml b/packages/opni/opni/charts/values.yaml
@@ -81,6 +81,7 @@ opni-agent:
 global:
   cattle:
     systemDefaultRegistry: ""
+  storageClass: ""
 
 kube-prometheus-stack:
   grafana: