fix(namespace): fix default namespace quota [EE-6700] (#11185)

api/datastore/migrator/migrate_dbversion110.go

@@ -23,3 +23,29 @@ func (migrator *Migrator) updateAppTemplatesVersionForDB110() error {
 
 	return migrator.settingsService.UpdateSettings(settings)
 }
+
+// In PortainerCE the resource overcommit option should always be true across all endpoints
+func (migrator *Migrator) updateResourceOverCommitToDB110() error {
+	log.Info().Msg("updating resource overcommit setting to true")
+
+	endpoints, err := migrator.endpointService.Endpoints()
+	if err != nil {
+		return err
+	}
+
+	for _, endpoint := range endpoints {
+		if endpoint.Type == portainer.KubernetesLocalEnvironment ||
+			endpoint.Type == portainer.AgentOnKubernetesEnvironment ||
+			endpoint.Type == portainer.EdgeAgentOnKubernetesEnvironment {
+
+			endpoint.Kubernetes.Configuration.EnableResourceOverCommit = true
+
+			err = migrator.endpointService.UpdateEndpoint(endpoint.ID, &endpoint)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}

api/datastore/migrator/migrator.go

@@ -230,6 +230,7 @@ func (m *Migrator) initMigrations() {
 	)
 	m.addMigrations("2.20",
 		m.updateAppTemplatesVersionForDB110,
+		m.updateResourceOverCommitToDB110,
 	)
 
 	// Add new migrations below...

api/kubernetes.go

@@ -5,6 +5,7 @@ func KubernetesDefault() KubernetesData {
 		Configuration: KubernetesConfiguration{
 			UseLoadBalancer:          false,
 			UseServerMetrics:         false,
+			EnableResourceOverCommit: true,
 			StorageClasses:           []KubernetesStorageClassConfig{},
 			IngressClasses:           []KubernetesIngressClassConfig{},
 		},

api/kubernetes/cli/namespace.go

@@ -73,6 +73,19 @@ func (kcl *KubeClient) CreateNamespace(info models.K8sNamespaceDetails) error {
 	ns.Annotations = info.Annotations
 	ns.Labels = portainerLabels
 
+	_, err := kcl.cli.CoreV1().Namespaces().Create(context.Background(), &ns, metav1.CreateOptions{})
+	if err != nil {
+		log.Error().
+			Err(err).
+			Str("Namespace", info.Name).
+			Msg("Failed to create the namespace")
+		return err
+	}
+
+	if info.ResourceQuota != nil && info.ResourceQuota.Enabled {
+		log.Info().Msgf("Creating resource quota for namespace %s", info.Name)
+		log.Debug().Msgf("Creating resource quota with details: %+v", info.ResourceQuota)
+
 		resourceQuota := &v1.ResourceQuota{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      "portainer-rq-" + info.Name,
@@ -84,20 +97,6 @@ func (kcl *KubeClient) CreateNamespace(info models.K8sNamespaceDetails) error {
 			},
 		}
 
-	_, err := kcl.cli.CoreV1().Namespaces().Create(context.Background(), &ns, metav1.CreateOptions{})
-	if err != nil {
-		log.Error().
-			Err(err).
-			Str("Namespace", info.Name).
-			Interface("ResourceQuota", resourceQuota).
-			Msg("Failed to create the namespace due to a resource quota issue.")
-		return err
-	}
-
-	if info.ResourceQuota != nil {
-		log.Info().Msgf("Creating resource quota for namespace %s", info.Name)
-		log.Debug().Msgf("Creating resource quota with details: %+v", info.ResourceQuota)
-
 		if info.ResourceQuota.Enabled {
 			memory := resource.MustParse(info.ResourceQuota.Memory)
 			cpu := resource.MustParse(info.ResourceQuota.CPU)

app/react/kubernetes/namespaces/components/ResourceQuotaFormSection/ResourceQuotaFormSection.tsx

@@ -44,15 +44,15 @@ export function ResourceQuotaFormSection({
 
       <SwitchField
         data-cy="k8sNamespaceCreate-resourceAssignmentToggle"
-        disabled={enableResourceOverCommit}
+        disabled={!enableResourceOverCommit}
         label="Resource assignment"
         labelClass="col-sm-3 col-lg-2"
         fieldClass="pt-2"
-        checked={values.enabled || !!enableResourceOverCommit}
+        checked={values.enabled || !enableResourceOverCommit}
         onChange={(enabled) => onChange({ ...values, enabled })}
       />
 
-      {(values.enabled || !!enableResourceOverCommit) && (
+      {(values.enabled || !enableResourceOverCommit) && (
         <div className="pt-5">
           <div className="flex flex-row">
             <FormSectionTitle>Resource Limits</FormSectionTitle>