chore: bump version to 2.31.0 (#789)

api/datastore/test_data/output_24_to_latest.json

@@ -611,7 +611,7 @@
       "RequiredPasswordLength": 12
     },
     "KubeconfigExpiry": "0",
-    "KubectlShellImage": "portainer/kubectl-shell:2.31.1",
+    "KubectlShellImage": "portainer/kubectl-shell:2.31.0",
     "LDAPSettings": {
       "AnonymousMode": true,
       "AutoCreateUsers": true,
@@ -939,7 +939,7 @@
     }
   ],
   "version": {
-    "VERSION": "{\"SchemaVersion\":\"2.31.1\",\"MigratorCount\":0,\"Edition\":1,\"InstanceID\":\"463d5c47-0ea5-4aca-85b1-405ceefee254\"}"
+    "VERSION": "{\"SchemaVersion\":\"2.31.0\",\"MigratorCount\":1,\"Edition\":1,\"InstanceID\":\"463d5c47-0ea5-4aca-85b1-405ceefee254\"}"
   },
   "webhooks": null
 }

api/http/handler/handler.go

@@ -81,7 +81,7 @@ type Handler struct {
 }
 
 // @title PortainerCE API
-// @version 2.31.1
+// @version 2.31.0
 // @description.markdown api-description.md
 // @termsOfService
 

api/http/handler/kubernetes/event.go

@@ -20,7 +20,7 @@ import (
 // @param id path int true "Environment identifier"
 // @param namespace path string true "The namespace name the events are associated to"
 // @param resourceId query string false "The resource id of the involved kubernetes object" example:"e5b021b6-4bce-4c06-bd3b-6cca906797aa"
-// @success 200 {object} []kubernetes.K8sEvent "Success"
+// @success 200 {object} models.Event[] "Success"
 // @failure 400 "Invalid request payload, such as missing required fields or fields not meeting validation criteria."
 // @failure 401 "Unauthorized access - the user is not authenticated or does not have the necessary permissions. Ensure that you have provided a valid API key or JWT token, and that you have the required permissions."
 // @failure 403 "Permission denied - the user is authenticated but does not have the necessary permissions to access the requested resource or perform the specified operation. Check your user roles and permissions."
@@ -68,7 +68,7 @@ func (handler *Handler) getKubernetesEventsForNamespace(w http.ResponseWriter, r
 // @produce json
 // @param id path int true "Environment identifier"
 // @param resourceId query string false "The resource id of the involved kubernetes object"  example:"e5b021b6-4bce-4c06-bd3b-6cca906797aa"
-// @success 200 {object} []kubernetes.K8sEvent "Success"
+// @success 200 {object} models.Event[] "Success"
 // @failure 400 "Invalid request payload, such as missing required fields or fields not meeting validation criteria."
 // @failure 401 "Unauthorized access - the user is not authenticated or does not have the necessary permissions. Ensure that you have provided a valid API key or JWT token, and that you have the required permissions."
 // @failure 403 "Permission denied - the user is authenticated but does not have the necessary permissions to access the requested resource or perform the specified operation. Check your user roles and permissions."

api/http/models/kubernetes/application.go

@@ -38,30 +38,14 @@ type K8sApplication struct {
 	Labels                  map[string]string                      `json:"Labels,omitempty"`
 	Resource                K8sApplicationResource                 `json:"Resource,omitempty"`
 	HorizontalPodAutoscaler *autoscalingv2.HorizontalPodAutoscaler `json:"HorizontalPodAutoscaler,omitempty"`
-	CustomResourceMetadata  CustomResourceMetadata                 `json:"CustomResourceMetadata,omitempty"`
 }
 
 type Metadata struct {
 	Labels map[string]string `json:"labels"`
 }
 
-type CustomResourceMetadata struct {
-	Kind       string `json:"kind"`
-	APIVersion string `json:"apiVersion"`
-	Plural     string `json:"plural"`
-}
-
 type Pod struct {
-	Name            string                 `json:"Name"`
-	ContainerName   string                 `json:"ContainerName"`
-	Image           string                 `json:"Image"`
-	ImagePullPolicy string                 `json:"ImagePullPolicy"`
-	Status          string                 `json:"Status"`
-	NodeName        string                 `json:"NodeName"`
-	PodIP           string                 `json:"PodIP"`
-	UID             string                 `json:"Uid"`
-	Resource        K8sApplicationResource `json:"Resource,omitempty"`
-	CreationDate    time.Time              `json:"CreationDate"`
+	Status string `json:"Status"`
 }
 
 type Configuration struct {
@@ -88,8 +72,8 @@ type TLSInfo struct {
 
 // Existing types
 type K8sApplicationResource struct {
-	CPURequest    float64 `json:"CpuRequest,omitempty"`
-	CPULimit      float64 `json:"CpuLimit,omitempty"`
-	MemoryRequest int64   `json:"MemoryRequest,omitempty"`
-	MemoryLimit   int64   `json:"MemoryLimit,omitempty"`
+	CPURequest    float64 `json:"CpuRequest"`
+	CPULimit      float64 `json:"CpuLimit"`
+	MemoryRequest int64   `json:"MemoryRequest"`
+	MemoryLimit   int64   `json:"MemoryLimit"`
 }

api/portainer.go

@@ -1728,7 +1728,7 @@ type (
 
 const (
 	// APIVersion is the version number of the Portainer API
-	APIVersion = "2.31.1"
+	APIVersion = "2.31.0"
 	// Support annotation for the API version ("STS" for Short-Term Support or "LTS" for Long-Term Support)
 	APIVersionSupport = "STS"
 	// Edition is what this edition of Portainer is called

app/react/components/ViewLoading/ViewLoading.tsx

@@ -1,4 +1,7 @@
 import clsx from 'clsx';
+import { Settings } from 'lucide-react';
+
+import { Icon } from '@@/Icon';
 
 import styles from './ViewLoading.module.css';
 
@@ -15,7 +18,12 @@ export function ViewLoading({ message }: Props) {
         <div className="sk-fold-cube" />
         <div className="sk-fold-cube" />
       </div>
-      {message && <span className={styles.message}>{message}</span>}
+      {message && (
+        <span className={styles.message}>
+          {message}
+          <Icon icon={Settings} className="!ml-1 animate-spin-slow" />
+        </span>
+      )}
     </div>
   );
 }

package.json

@@ -2,7 +2,7 @@
   "author": "Portainer.io",
   "name": "portainer",
   "homepage": "http://portainer.io",
-  "version": "2.31.1",
+  "version": "2.31.0",
   "repository": {
     "type": "git",
     "url": "git@github.com:portainer/portainer.git"