Skip to content

Commit d7a96ec

Browse files
feat: add new field extended to resource quota handlers
1 parent 2785ae4 commit d7a96ec

File tree

5 files changed

+50
-34
lines changed

5 files changed

+50
-34
lines changed

go.mod

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ require (
66
github.com/ghodss/yaml v1.0.0
77
github.com/hashicorp/go-version v1.6.0
88
github.com/hashicorp/terraform-plugin-sdk v1.17.2
9-
github.com/rancher/norman v0.7.1
10-
github.com/rancher/rancher v0.0.0-20251022154639-6291f0239b7f
9+
github.com/rancher/norman v0.8.0
10+
github.com/rancher/rancher v0.0.0-20251114145111-1ede64712337
1111
github.com/rancher/rancher/pkg/apis v0.0.0
1212
github.com/rancher/rancher/pkg/client v0.0.0
1313
github.com/stretchr/testify v1.11.1
@@ -122,13 +122,13 @@ require (
122122
github.com/prometheus/client_model v0.6.2 // indirect
123123
github.com/prometheus/common v0.66.1 // indirect
124124
github.com/prometheus/procfs v0.17.0 // indirect
125-
github.com/rancher/aks-operator v1.13.0-rc.1 // indirect
126-
github.com/rancher/ali-operator v0.0.3-0.20251001142421-ca64da576db5 // indirect
127-
github.com/rancher/apiserver v0.7.6 // indirect
125+
github.com/rancher/aks-operator v1.13.0-rc.4 // indirect
126+
github.com/rancher/ali-operator v1.13.0-rc.2 // indirect
127+
github.com/rancher/apiserver v0.8.0 // indirect
128128
github.com/rancher/channelserver v0.7.0 // indirect
129-
github.com/rancher/eks-operator v1.13.0-rc.1 // indirect
130-
github.com/rancher/fleet/pkg/apis v0.14.0-beta.1 // indirect
131-
github.com/rancher/gke-operator v1.13.0-rc.1 // indirect
129+
github.com/rancher/eks-operator v1.13.0-rc.4 // indirect
130+
github.com/rancher/fleet/pkg/apis v0.14.0-rc.1 // indirect
131+
github.com/rancher/gke-operator v1.13.0-rc.3 // indirect
132132
github.com/rancher/lasso v0.2.5 // indirect
133133
github.com/rancher/rke v1.8.0-rc.4 // indirect
134134
github.com/rancher/wrangler/v3 v3.3.1 // indirect
@@ -188,8 +188,8 @@ replace (
188188
github.com/crewjam/saml => github.com/crewjam/saml v0.4.5
189189
github.com/docker/distribution => github.com/docker/distribution v2.8.1+incompatible
190190
github.com/docker/docker => github.com/docker/docker v20.10.17+incompatible
191-
github.com/rancher/rancher/pkg/apis => github.com/rancher/rancher/pkg/apis v0.0.0-20251023101703-73e6898b0472
192-
github.com/rancher/rancher/pkg/client => github.com/rancher/rancher/pkg/client v0.0.0-20251023101703-73e6898b0472
191+
github.com/rancher/rancher/pkg/apis => github.com/rancher/rancher/pkg/apis v0.0.0-20251114145111-1ede64712337
192+
github.com/rancher/rancher/pkg/client => github.com/rancher/rancher/pkg/client v0.0.0-20251114145111-1ede64712337
193193
github.com/spf13/afero => github.com/spf13/afero v1.2.2
194194
go.qase.io/client => github.com/rancher/qase-go/client v0.0.0-20231114201952-65195ec001fa
195195
helm.sh/helm/v3 => github.com/rancher/helm/v3 v3.9.0-rancher1

go.sum

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -646,8 +646,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m
646646
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
647647
github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
648648
github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
649-
github.com/onsi/ginkgo/v2 v2.26.0 h1:1J4Wut1IlYZNEAWIV3ALrT9NfiaGW2cDCJQSFQMs/gE=
650-
github.com/onsi/ginkgo/v2 v2.26.0/go.mod h1:qhEywmzWTBUY88kfO0BRvX4py7scov9yR+Az2oavUzw=
649+
github.com/onsi/ginkgo/v2 v2.27.2 h1:LzwLj0b89qtIy6SSASkzlNvX6WktqurSHwkk2ipF/Ns=
650+
github.com/onsi/ginkgo/v2 v2.27.2/go.mod h1:ArE1D/XhNXBXCBkKOLkbsb2c81dQHCRcF5zwn/ykDRo=
651651
github.com/onsi/gomega v1.38.2 h1:eZCjf2xjZAqe+LeWvKb5weQ+NcPwX84kqJ0cZNxok2A=
652652
github.com/onsi/gomega v1.38.2/go.mod h1:W2MJcYxRGV63b418Ai34Ud0hEdTVXq9NW9+Sx6uXf3k=
653653
github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
@@ -674,30 +674,30 @@ github.com/prometheus/common v0.66.1 h1:h5E0h5/Y8niHc5DlaLlWLArTQI7tMrsfQjHV+d9Z
674674
github.com/prometheus/common v0.66.1/go.mod h1:gcaUsgf3KfRSwHY4dIMXLPV0K/Wg1oZ8+SbZk/HH/dA=
675675
github.com/prometheus/procfs v0.17.0 h1:FuLQ+05u4ZI+SS/w9+BWEM2TXiHKsUQ9TADiRH7DuK0=
676676
github.com/prometheus/procfs v0.17.0/go.mod h1:oPQLaDAMRbA+u8H5Pbfq+dl3VDAvHxMUOVhe0wYB2zw=
677-
github.com/rancher/aks-operator v1.13.0-rc.1 h1:Vy83SjeSm9q7kI18+nkSOR0hyeydDj398KGTo3XEuS4=
678-
github.com/rancher/aks-operator v1.13.0-rc.1/go.mod h1:xu0BJ01Ynzs4wLMDf2V5eaazEf1/kndX0AeqqsTFVfQ=
679-
github.com/rancher/ali-operator v0.0.3-0.20251001142421-ca64da576db5 h1:phyZ6BUqR/XnZNAHfSpYyGxclxu/ZTLGCc3wpcTjcmM=
680-
github.com/rancher/ali-operator v0.0.3-0.20251001142421-ca64da576db5/go.mod h1:aJNM8GVaKCO1jH70Ds4qH8lE5tZlzOxWFbyOFOBHu5k=
681-
github.com/rancher/apiserver v0.7.6 h1:bLS+pxNfGv5Zq5exxMUZr9z5X8kXOOY27RGmVv2k2rM=
682-
github.com/rancher/apiserver v0.7.6/go.mod h1:Wb+Z8ktNyIuqt9hw30geFBQFJQucWTqgu6trxxMtcyM=
677+
github.com/rancher/aks-operator v1.13.0-rc.4 h1:tc7p2gZmRg4c6VBwWTQJYwmh1hlN68kftjoBIdGCnqw=
678+
github.com/rancher/aks-operator v1.13.0-rc.4/go.mod h1:1ZjZB6zGHK+NGchN9KLplq+xPxRRi+q6Uzet5bjFwxo=
679+
github.com/rancher/ali-operator v1.13.0-rc.2 h1:a0biHGez+Np9XybJVh3yKN4RGPdaCzfM6D6cAXJac6o=
680+
github.com/rancher/ali-operator v1.13.0-rc.2/go.mod h1:s5HznpxsN9LsgtX6u5UoW9dZNKnDLuXcwzQRAEoDcog=
681+
github.com/rancher/apiserver v0.8.0 h1:yCXsCa67X/Y///NKJ/pq6pv6wmt3hq/OIzBaIna2grY=
682+
github.com/rancher/apiserver v0.8.0/go.mod h1:Wb+Z8ktNyIuqt9hw30geFBQFJQucWTqgu6trxxMtcyM=
683683
github.com/rancher/channelserver v0.7.0 h1:ZN5o8aD4mD31uhjEEW2e9yQXa3eOb+4Cp6DcWm7W/Lc=
684684
github.com/rancher/channelserver v0.7.0/go.mod h1:Mwd7hlMSu9X4FnZKj+0mA5ak8nTyJZtZsVX33G62Gzc=
685-
github.com/rancher/eks-operator v1.13.0-rc.1 h1:IbimIq+TuC88RQ3KF1Ez882XFP2nDnihbeqVPXLvuLk=
686-
github.com/rancher/eks-operator v1.13.0-rc.1/go.mod h1:tj6ioCe9v5J1HM0ZXR3/K5InoEjOfjCvSHMuXMj2x4M=
687-
github.com/rancher/fleet/pkg/apis v0.14.0-beta.1 h1:UoWkP6tiVx6xbOU6lG0EQXf3caEyBAYd5c88FFBULSg=
688-
github.com/rancher/fleet/pkg/apis v0.14.0-beta.1/go.mod h1:oc+QHbx4P9guY34dr6UbzCOgt17Q9eSZhlyOs7xSinY=
689-
github.com/rancher/gke-operator v1.13.0-rc.1 h1:VViWerZyc9iMmWTxK5FapRmMnBp8cq3CgqjbM+bvyaQ=
690-
github.com/rancher/gke-operator v1.13.0-rc.1/go.mod h1:xW0iUqGMqUTPLzC4i+UKeydh9N9zYdM0BqC+7wiDfec=
685+
github.com/rancher/eks-operator v1.13.0-rc.4 h1:XowN8+m3QZTIBOBLzar4frtz0xtREb9kcX6KXhF4eas=
686+
github.com/rancher/eks-operator v1.13.0-rc.4/go.mod h1:SbaKX2ttFWCxGOYkrKYeWH/6E4oToq2rRTcrMa2Mmdk=
687+
github.com/rancher/fleet/pkg/apis v0.14.0-rc.1 h1:ZsDc25j4/iuKJ8DhxaOSnHdqOskRRe7QxJAdD9HBn28=
688+
github.com/rancher/fleet/pkg/apis v0.14.0-rc.1/go.mod h1:oc+QHbx4P9guY34dr6UbzCOgt17Q9eSZhlyOs7xSinY=
689+
github.com/rancher/gke-operator v1.13.0-rc.3 h1:a6U+7+XIbJPH2CE7/vFUx6RpThNbFl7fqIqkEBb6zmA=
690+
github.com/rancher/gke-operator v1.13.0-rc.3/go.mod h1:TroxpmqMh63Hf4H5bC+2GYcgOCQp9kIUDfyKdNAMo6Q=
691691
github.com/rancher/lasso v0.2.5 h1:K++lWDDdfeN98Ixc1kCfUq0/q6tLjoHN++Np6QntXw0=
692692
github.com/rancher/lasso v0.2.5/go.mod h1:71rWfv+KkdSmSxZ9Ly5QYhxAu0nEUcaq9N2ByjcHqAM=
693-
github.com/rancher/norman v0.7.1 h1:OfmYfN4YeJ4qosXTAbOTPgCrb5GE8W6wFWnDxWcuKCo=
694-
github.com/rancher/norman v0.7.1/go.mod h1:vZ5qL+eKodJ7zOMQYdl6jwMrSFrqTKpA+KYSFEKew2M=
695-
github.com/rancher/rancher v0.0.0-20251022154639-6291f0239b7f h1:TIVU0VhKFD4vRJV4Koae9QiDtvRoLpBQluKpMpN9Iiw=
696-
github.com/rancher/rancher v0.0.0-20251022154639-6291f0239b7f/go.mod h1:jzUABuDzxEfOoepEMld0JiCypVY+GBAmRFjSSu/fd1g=
697-
github.com/rancher/rancher/pkg/apis v0.0.0-20251023101703-73e6898b0472 h1:8iE2Bd0x5OkVq8jQCB0DvTYNEaBvhtLE50O2E7S5Tqs=
698-
github.com/rancher/rancher/pkg/apis v0.0.0-20251023101703-73e6898b0472/go.mod h1:H+KsnFeYVNUyLBAl1kqyKTM8KjuV1TNWDrZ2HT9ou/4=
699-
github.com/rancher/rancher/pkg/client v0.0.0-20251023101703-73e6898b0472 h1:Mubagflz1JmYvVMQMHcDdloB+qbpUoP25KjBamr/eIs=
700-
github.com/rancher/rancher/pkg/client v0.0.0-20251023101703-73e6898b0472/go.mod h1:kN5U1qD97yp9EUzm6LeoPENApyZsMzQdYES1GTJJbJw=
693+
github.com/rancher/norman v0.8.0 h1://ZSe+B53cMgPNAbR7QBhzvIfWBxR4KaPWTKqG+g+O4=
694+
github.com/rancher/norman v0.8.0/go.mod h1:vZ5qL+eKodJ7zOMQYdl6jwMrSFrqTKpA+KYSFEKew2M=
695+
github.com/rancher/rancher v0.0.0-20251114145111-1ede64712337 h1:SXNtZt3WafJ2DelaciHxDVTFrg4oHMyi1yMT829NfII=
696+
github.com/rancher/rancher v0.0.0-20251114145111-1ede64712337/go.mod h1:EswnwrltsbNm8g4WnD7Fp2MPKB0J/oymzumlCFT+GMo=
697+
github.com/rancher/rancher/pkg/apis v0.0.0-20251114145111-1ede64712337 h1:9tkMyb1Yk1uFZXsxtdJIVc4NnnwPTwrR/bFF0OgRf4k=
698+
github.com/rancher/rancher/pkg/apis v0.0.0-20251114145111-1ede64712337/go.mod h1:xyYMxIycb9QpdxZjUxf95Cc4E27rfma8Z77U5ysRx3A=
699+
github.com/rancher/rancher/pkg/client v0.0.0-20251114145111-1ede64712337 h1:z6mq7GXPIt9kP3y9ZQUA+3SxpCcbZOidqQamv+T1OX0=
700+
github.com/rancher/rancher/pkg/client v0.0.0-20251114145111-1ede64712337/go.mod h1:omk+GIbTxtBDoFQ8Dspb/Ne78QKTB7/jCSZeg/4rfbI=
701701
github.com/rancher/rke v1.8.0-rc.4 h1:jowVyaF3LsJonC7vNsAwWf3MONHAtEFUD/j3UzNSE5U=
702702
github.com/rancher/rke v1.8.0-rc.4/go.mod h1:x9N1abruzDFMwTpqq2cnaDYpKCptlNoW8VraNWB6Pc4=
703703
github.com/rancher/wrangler/v3 v3.3.1 h1:YFqRfhxjuLNudUrvWrn+64wUPZ8pnn2KWbTsha75JLg=
@@ -808,8 +808,6 @@ go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689Cbtr
808808
go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE=
809809
go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
810810
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
811-
go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
812-
go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
813811
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
814812
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
815813
go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y=

rancher2/schema_project.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ func projectResourceQuotaLimitFields() map[string]*schema.Schema {
1717
Type: schema.TypeString,
1818
Optional: true,
1919
},
20+
"extended": {
21+
Type: schema.TypeMap,
22+
Optional: true,
23+
},
2024
"limits_cpu": {
2125
Type: schema.TypeString,
2226
Optional: true,

rancher2/structure_project.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ func flattenProjectResourceQuotaLimit(in *managementClient.ResourceQuotaLimit) [
3939
obj["config_maps"] = in.ConfigMaps
4040
}
4141

42+
if len(in.Extended) > 0 {
43+
obj["extended"] = in.Extended
44+
}
45+
4246
if len(in.LimitsCPU) > 0 {
4347
obj["limits_cpu"] = in.LimitsCPU
4448
}
@@ -186,6 +190,10 @@ func expandProjectResourceQuotaLimit(p []interface{}) *managementClient.Resource
186190
obj.ConfigMaps = v
187191
}
188192

193+
if v, ok := in["extended"].(map[string]string); ok && len(v) > 0 {
194+
obj.Extended = v
195+
}
196+
189197
if v, ok := in["limits_cpu"].(string); ok && len(v) > 0 {
190198
obj.LimitsCPU = v
191199
}

rancher2/structure_project_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ func init() {
5252
Services: "services",
5353
ServicesLoadBalancers: "lb",
5454
ServicesNodePorts: "np",
55+
Extended: map[string]string{
56+
"count/gpu": "anumber",
57+
},
5558
}
5659
testProjectResourceQuotaLimitInterface = []interface{}{
5760
map[string]interface{}{
@@ -68,6 +71,9 @@ func init() {
6871
"services": "services",
6972
"services_load_balancers": "lb",
7073
"services_node_ports": "np",
74+
"extended": map[string]string{
75+
"count/gpu": "anumber",
76+
},
7177
},
7278
}
7379
testProjectResourceQuotaLimitNamespaceConf = &managementClient.ResourceQuotaLimit{

0 commit comments

Comments
 (0)