Fix panic in checking for resource quota (#14)

galal-hussein · web-flow · commit 5c8e16d32cac · 2025-06-09T16:08:52.000+03:00
Signed-off-by: galal-hussein &lt;hussein.galal.ahmed.11@gmail.com&gt;
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.0-alpine3.19 AS build
+FROM golang:1.24.0-alpine3.19 AS build
 RUN apk add -U --no-cache make git bash
 COPY . /src/cattle-drive
 WORKDIR /src/cattle-drive
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module rancherlabs/cattle-drive
 
-go 1.21.4
+go 1.24.0
 
 replace (
 	github.com/rancher/rancher/pkg/apis => github.com/rancher/rancher/pkg/apis v0.0.0-20240205102821-ed248439462a
diff --git a/pkg/cluster/project.go b/pkg/cluster/project.go
@@ -34,7 +34,9 @@ func newProject(obj v3.Project, prtbs []*ProjectRoleTemplateBinding, namespaces
 // normalize will remove unneeded fields in the spec to make it easier to compare
 func (p *Project) normalize() {
 	p.Obj.Spec.ClusterName = ""
-	p.Obj.Spec.ResourceQuota.UsedLimit = v3.ResourceQuotaLimit{}
+	if p.Obj.Spec.ResourceQuota != nil {
+		p.Obj.Spec.ResourceQuota.UsedLimit = v3.ResourceQuotaLimit{}
+	}
 }
 
 // mutate will change the project object to be suitable for recreation to the target cluster

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM golang:1.22.0-alpine3.19 AS build`
	`1`	`+FROM golang:1.24.0-alpine3.19 AS build`
`2`	`2`	`RUN apk add -U --no-cache make git bash`
`3`	`3`	`COPY . /src/cattle-drive`
`4`	`4`	`WORKDIR /src/cattle-drive`