From 01580012a4462b55969b264621f2786238a1af37 Mon Sep 17 00:00:00 2001 From: pprzekwas Date: Tue, 24 Oct 2023 08:39:08 +0200 Subject: [PATCH] [release/v2.23] Patch release 2.23.6 (#6318) * Bump KKP version * Bump version to 2.23.6 * Bump swagger and api client * Whitelist deprecated field in linter --- Makefile | 2 +- modules/api/.golangci.yml | 1 + modules/api/Makefile | 2 +- modules/api/cmd/kubermatic-api/swagger.json | 133 +++++++++++++----- modules/api/go.mod | 4 +- modules/api/go.sum | 4 +- .../test/e2e/utils/apiclient/models/a_k_s.go | 8 +- .../test/e2e/utils/apiclient/models/a_w_s.go | 12 +- .../apiclient/models/a_w_s_cloud_spec.go | 12 +- .../e2e/utils/apiclient/models/alibaba.go | 4 +- .../apiclient/models/alibaba_cloud_spec.go | 4 +- .../apiclient/models/anexia_cloud_spec.go | 2 +- .../test/e2e/utils/apiclient/models/azure.go | 31 ++-- .../apiclient/models/azure_cloud_spec.go | 10 +- .../models/datacenter_spec_openstack.go | 6 +- .../models/digitalocean_cloud_spec.go | 2 +- .../test/e2e/utils/apiclient/models/e_k_s.go | 10 +- .../test/e2e/utils/apiclient/models/g_c_p.go | 2 +- .../e2e/utils/apiclient/models/kubevirt.go | 2 +- .../e2e/utils/apiclient/models/nutanix.go | 18 +-- .../apiclient/models/nutanix_c_s_i_config.go | 12 +- .../apiclient/models/nutanix_cloud_spec.go | 8 +- .../e2e/utils/apiclient/models/openstack.go | 8 +- .../apiclient/models/openstack_cloud_spec.go | 2 +- .../models/v_mware_cloud_director.go | 12 +- .../v_mware_cloud_director_cloud_spec.go | 12 +- .../e2e/utils/apiclient/models/v_sphere.go | 19 ++- .../apiclient/models/v_sphere_cloud_spec.go | 12 +- modules/web/package-lock.json | 4 +- modules/web/package.json | 2 +- modules/web/src/assets/config/changelog.json | 26 +--- 31 files changed, 227 insertions(+), 159 deletions(-) diff --git a/Makefile b/Makefile index df3773cd5a..1d80cc73f9 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ SHELL=/bin/bash export KUBERMATIC_EDITION ?= ee -KUBERMATIC_VERSION?=v2.23.5 +KUBERMATIC_VERSION?=v2.23.6 DOCKER_REPO ?= quay.io/kubermatic REPO = $(DOCKER_REPO)/dashboard$(shell [[ "$(KUBERMATIC_EDITION)" != "ce" ]] && printf -- '-%s' ${KUBERMATIC_EDITION}) IMAGE_TAG=$(shell echo $$(git rev-parse HEAD)|tr -d '\n') diff --git a/modules/api/.golangci.yml b/modules/api/.golangci.yml index 1b4dec8756..301f71c027 100644 --- a/modules/api/.golangci.yml +++ b/modules/api/.golangci.yml @@ -79,6 +79,7 @@ issues: - singleCaseSwitch # in most cases this is the beginning of a lookup table and should be kept an obvious table # govet - loop variable tc captured by func literal # TODO: fix tests and remove this exclude + - "credentials.VMNetName is deprecated: Use networks instead" linters-settings: depguard: diff --git a/modules/api/Makefile b/modules/api/Makefile index d87dcde8b3..879a77ad47 100644 --- a/modules/api/Makefile +++ b/modules/api/Makefile @@ -1,6 +1,6 @@ SHELL=/bin/bash export KUBERMATIC_EDITION ?= ee -KUBERMATIC_VERSION?=v2.23.5 +KUBERMATIC_VERSION?=v2.23.6 DOCKER_REPO ?= quay.io/kubermatic REPO = $(DOCKER_REPO)/dashboard$(shell [[ "$(KUBERMATIC_EDITION)" != "ce" ]] && printf -- '-%s' ${KUBERMATIC_EDITION}) IMAGE_TAG=$(shell echo $$(git rev-parse HEAD)|tr -d '\n') diff --git a/modules/api/cmd/kubermatic-api/swagger.json b/modules/api/cmd/kubermatic-api/swagger.json index 3a80e8f60a..9f40cc09a5 100644 --- a/modules/api/cmd/kubermatic-api/swagger.json +++ b/modules/api/cmd/kubermatic-api/swagger.json @@ -27838,10 +27838,12 @@ "type": "object", "properties": { "clientID": { + "description": "The service principal used to access Azure.", "type": "string", "x-go-name": "ClientID" }, "clientSecret": { + "description": "The client secret corresponding to the given service principal.", "type": "string", "x-go-name": "ClientSecret" }, @@ -27856,10 +27858,12 @@ "x-go-name": "Enabled" }, "subscriptionID": { + "description": "The Azure Subscription used for the user cluster.", "type": "string", "x-go-name": "SubscriptionID" }, "tenantID": { + "description": "The Azure Active Directory Tenant used for the user cluster.", "type": "string", "x-go-name": "TenantID" } @@ -28201,15 +28205,17 @@ "type": "object", "properties": { "accessKeyID": { - "description": "Access Key ID to authenticate against AWS.", + "description": "The Access key ID used to authenticate against AWS.", "type": "string", "x-go-name": "AccessKeyID" }, "assumeRoleARN": { + "description": "Defines the ARN for an IAM role that should be assumed when handling resources on AWS. It will be used\nto acquire temporary security credentials using an STS AssumeRole API operation whenever creating an AWS session.\n+optional", "type": "string", "x-go-name": "AssumeRoleARN" }, "assumeRoleExternalID": { + "description": "An arbitrary string that may be needed when calling the STS AssumeRole API operation.\nUsing an external ID can help to prevent the \"confused deputy problem\".\n+optional", "type": "string", "x-go-name": "AssumeRoleExternalID" }, @@ -28239,7 +28245,7 @@ "x-go-name": "RouteTableID" }, "secretAccessKey": { - "description": "Secret Access Key to authenticate against AWS.", + "description": "The Secret Access Key used to authenticate against AWS.", "type": "string", "x-go-name": "SecretAccessKey" }, @@ -28261,14 +28267,17 @@ "title": "AWSCloudSpec specifies access data to Amazon Web Services.", "properties": { "accessKeyID": { + "description": "The Access key ID used to authenticate against AWS.", "type": "string", "x-go-name": "AccessKeyID" }, "assumeRoleARN": { + "description": "Defines the ARN for an IAM role that should be assumed when handling resources on AWS. It will be used\nto acquire temporary security credentials using an STS AssumeRole API operation whenever creating an AWS session.\n+optional", "type": "string", "x-go-name": "AssumeRoleARN" }, "assumeRoleExternalID": { + "description": "An arbitrary string that may be needed when calling the STS AssumeRole API operation.\nUsing an external ID can help to prevent the \"confused deputy problem\".\n+optional", "type": "string", "x-go-name": "AssumeRoleExternalID" }, @@ -28302,6 +28311,7 @@ "x-go-name": "RouteTableID" }, "secretAccessKey": { + "description": "The Secret Access Key used to authenticate against AWS.", "type": "string", "x-go-name": "SecretAccessKey" }, @@ -29041,12 +29051,12 @@ "type": "object", "properties": { "accessKeyID": { - "description": "Access Key ID to authenticate against Alibaba.", + "description": "The Access Key ID used to authenticate against Alibaba.", "type": "string", "x-go-name": "AccessKeyID" }, "accessKeySecret": { - "description": "Access Key Secret to authenticate against Alibaba.", + "description": "The Access Key Secret used to authenticate against Alibaba.", "type": "string", "x-go-name": "AccessKeySecret" }, @@ -29068,10 +29078,12 @@ "title": "AlibabaCloudSpec specifies the access data to Alibaba.", "properties": { "accessKeyID": { + "description": "The Access Key ID used to authenticate against Alibaba.", "type": "string", "x-go-name": "AccessKeyID" }, "accessKeySecret": { + "description": "The Access Key Secret used to authenticate against Alibaba.", "type": "string", "x-go-name": "AccessKeySecret" }, @@ -29258,6 +29270,7 @@ "$ref": "#/definitions/GlobalSecretKeySelector" }, "token": { + "description": "Token is used to authenticate with the Anexia API.", "type": "string", "x-go-name": "Token" } @@ -29973,10 +29986,12 @@ "type": "object", "properties": { "clientID": { + "description": "The service principal used to access Azure.", "type": "string", "x-go-name": "ClientID" }, "clientSecret": { + "description": "The client secret corresponding to the given service principal.", "type": "string", "x-go-name": "ClientSecret" }, @@ -29994,34 +30009,42 @@ "$ref": "#/definitions/LBSKU" }, "resourceGroup": { + "description": "The resource group that will be used to look up and create resources for the cluster in.\nIf set to empty string at cluster creation, a new resource group will be created and this field will be updated to\nthe generated resource group's name.", "type": "string", "x-go-name": "ResourceGroup" }, "routeTable": { + "description": "The name of a route table associated with the subnet referenced by `subnet`.\nIf set to empty string at cluster creation, a new route table will be created and this field will be updated to\nthe generated route table's name. If no subnet is defined at cluster creation, this field should be empty as well.", "type": "string", "x-go-name": "RouteTableName" }, "securityGroup": { + "description": "The name of a security group associated with the subnet referenced by `subnet`.\nIf set to empty string at cluster creation, a new security group will be created and this field will be updated to\nthe generated security group's name. If no subnet is defined at cluster creation, this field should be empty as well.", "type": "string", "x-go-name": "SecurityGroup" }, "subnet": { + "description": "The name of a subnet in the VNet referenced by `vnet`.\nIf set to empty string at cluster creation, a new subnet will be created and this field will be updated to\nthe generated subnet's name. If no VNet is defined at cluster creation, this field should be empty as well.", "type": "string", "x-go-name": "SubnetName" }, "subscriptionID": { + "description": "The Azure Subscription used for the user cluster.", "type": "string", "x-go-name": "SubscriptionID" }, "tenantID": { + "description": "The Azure Active Directory Tenant used for the user cluster.", "type": "string", "x-go-name": "TenantID" }, "vnet": { + "description": "The name of the VNet resource used for setting up networking in.\nIf set to empty string at cluster creation, a new VNet will be created and this field will be updated to\nthe generated VNet's name.", "type": "string", "x-go-name": "VNetName" }, "vnetResourceGroup": { + "description": "Optional: Defines a second resource group that will be used for VNet related resources instead.\nIf left empty, NO additional resource group will be created and all VNet related resources use the resource group defined by `resourceGroup`.", "type": "string", "x-go-name": "VNetResourceGroup" } @@ -30057,12 +30080,12 @@ "x-go-name": "AvailabilitySet" }, "clientID": { - "description": "ClientID is the service principal used to access Azure.\nCan be read from `credentialsReference` instead.", + "description": "The service principal used to access Azure.\nCan be read from `credentialsReference` instead.", "type": "string", "x-go-name": "ClientID" }, "clientSecret": { - "description": "ClientSecret is the client secret corresponding to the given service principal.\nCan be read from `credentialsReference` instead.", + "description": "The client secret corresponding to the given service principal.\nCan be read from `credentialsReference` instead.", "type": "string", "x-go-name": "ClientSecret" }, @@ -30101,12 +30124,12 @@ "x-go-name": "SubnetName" }, "subscriptionID": { - "description": "SubscriptionID is the Azure Subscription used for this cluster.\nCan be read from `credentialsReference` instead.", + "description": "The Azure Subscription used for this cluster.\nCan be read from `credentialsReference` instead.", "type": "string", "x-go-name": "SubscriptionID" }, "tenantID": { - "description": "TenantID is the Azure Active Directory Tenant used for this cluster.\nCan be read from `credentialsReference` instead.", + "description": "The Azure Active Directory Tenant used for this cluster.\nCan be read from `credentialsReference` instead.", "type": "string", "x-go-name": "TenantID" }, @@ -30116,7 +30139,7 @@ "x-go-name": "VNetName" }, "vnetResourceGroup": { - "description": "Optional: VNetResourceGroup optionally defines a second resource group that will be used for VNet related resources instead.\nIf left empty, NO additional resource group will be created and all VNet related resources use the resource group defined by `resourceGroup`.", + "description": "Optional: Defines a second resource group that will be used for VNet related resources instead.\nIf left empty, NO additional resource group will be created and all VNet related resources use the resource group defined by `resourceGroup`.", "type": "string", "x-go-name": "VNetResourceGroup" } @@ -32006,10 +32029,12 @@ "title": "DatacenterSpecOpenstack describes an OpenStack datacenter.", "properties": { "authURL": { + "description": "Authentication URL", "type": "string", "x-go-name": "AuthURL" }, "availabilityZone": { + "description": "Used to configure availability zone.", "type": "string", "x-go-name": "AvailabilityZone" }, @@ -32056,6 +32081,7 @@ "$ref": "#/definitions/OpenstackNodeSizeRequirements" }, "region": { + "description": "Authentication region name", "type": "string", "x-go-name": "Region" }, @@ -32227,6 +32253,7 @@ "$ref": "#/definitions/GlobalSecretKeySelector" }, "token": { + "description": "Token is used to authenticate with the DigitalOcean API.", "type": "string", "x-go-name": "Token" } @@ -32353,14 +32380,17 @@ "type": "object", "properties": { "accessKeyID": { + "description": "The Access key ID used to authenticate against AWS.", "type": "string", "x-go-name": "AccessKeyID" }, "assumeRoleARN": { + "description": "Defines the ARN for an IAM role that should be assumed when handling resources on AWS. It will be used\nto acquire temporary security credentials using an STS AssumeRole API operation whenever creating an AWS session.", "type": "string", "x-go-name": "AssumeRoleARN" }, "assumeRoleExternalID": { + "description": "An arbitrary string that may be needed when calling the STS AssumeRole API operation.\nUsing an external ID can help to prevent the \"confused deputy problem\".", "type": "string", "x-go-name": "AssumeRoleExternalID" }, @@ -32375,6 +32405,7 @@ "x-go-name": "Enabled" }, "secretAccessKey": { + "description": "The Secret Access Key used to authenticate against AWS.", "type": "string", "x-go-name": "SecretAccessKey" } @@ -33528,6 +33559,7 @@ "x-go-name": "Network" }, "serviceAccount": { + "description": "ServiceAccount is the Google Service Account (JSON format), encoded with base64.", "type": "string", "x-go-name": "ServiceAccount" }, @@ -35656,6 +35688,7 @@ "x-go-name": "Enabled" }, "kubeconfig": { + "description": "Kubeconfig is the cluster's kubeconfig file, encoded with base64.", "type": "string", "x-go-name": "Kubeconfig" } @@ -37088,28 +37121,28 @@ "type": "object", "properties": { "clusterName": { - "description": "ClusterName is the Nutanix cluster to deploy resources and nodes to.", + "description": "The name of the Nutanix cluster to which the resources and nodes are deployed to.", "type": "string", "x-go-name": "ClusterName" }, "csiEndpoint": { - "description": "CSIEndpoint to access Nutanix Prism Element for csi driver", + "description": "CSIEndpoint to access Nutanix Prism Element for CSI driver.", "type": "string", "x-go-name": "CSIEndpoint" }, "csiPassword": { - "description": "Prism Element Password for csi driver", + "description": "Prism Element Password for CSI driver.", "type": "string", "x-go-name": "CSIPassword" }, "csiPort": { - "description": "CSIPort to use when connecting to the Nutanix Prism Element endpoint (defaults to 9440)", + "description": "CSIPort to use when connecting to the Nutanix Prism Element endpoint (defaults to 9440).", "type": "integer", "format": "int32", "x-go-name": "CSIPort" }, "csiUsername": { - "description": "Prism Element Username for csi driver", + "description": "Prism Element Username for CSI driver.", "type": "string", "x-go-name": "CSIUsername" }, @@ -37124,22 +37157,22 @@ "x-go-name": "Enabled" }, "password": { - "description": "Password is the password corresponding to the provided user.", + "description": "Password corresponding to the provided user.", "type": "string", "x-go-name": "Password" }, "projectName": { - "description": "ProjectName is the optional Nutanix project to use. If none is given,\nno project will be used.", + "description": "Optional: Nutanix project to use. If none is given,\nno project will be used.", "type": "string", "x-go-name": "ProjectName" }, "proxyURL": { - "description": "ProxyURL is used to optionally configure a HTTP proxy to access Nutanix Prism Central.", + "description": "Optional: To configure a HTTP proxy to access Nutanix Prism Central.", "type": "string", "x-go-name": "ProxyURL" }, "username": { - "description": "Username is the username to access the Nutanix Prism Central API.", + "description": "Username that is used to access the Nutanix Prism Central API.", "type": "string", "x-go-name": "Username" } @@ -37151,7 +37184,7 @@ "title": "NutanixCSIConfig contains credentials and the endpoint for the Nutanix Prism Element to which the CSI driver connects.", "properties": { "endpoint": { - "description": "Prism Element Endpoint to access Nutanix Prism Element for csi driver", + "description": "Prism Element Endpoint to access Nutanix Prism Element for CSI driver.", "type": "string", "x-go-name": "Endpoint" }, @@ -37161,28 +37194,28 @@ "x-go-name": "Fstype" }, "password": { - "description": "Prism Element Password for csi driver", + "description": "Prism Element Password for CSI driver.", "type": "string", "x-go-name": "Password" }, "port": { - "description": "Optional: Port to use when connecting to the Nutanix Prism Element endpoint (defaults to 9440)\n+optional", + "description": "Optional: Port to use when connecting to the Nutanix Prism Element endpoint (defaults to 9440).\n+optional", "type": "integer", "format": "int32", "x-go-name": "Port" }, "ssSegmentedIscsiNetwork": { - "description": "Optional: defaults to \"false\"\n+optional", + "description": "Optional: defaults to \"false\".\n+optional", "type": "boolean", "x-go-name": "SsSegmentedIscsiNetwork" }, "storageContainer": { - "description": "Optional: defaults to \"SelfServiceContainer\"\n+optional", + "description": "Optional: defaults to \"SelfServiceContainer\".\n+optional", "type": "string", "x-go-name": "StorageContainer" }, "username": { - "description": "Prism Element Username for csi driver", + "description": "Prism Element Username for CSI driver.", "type": "string", "x-go-name": "Username" } @@ -37251,19 +37284,22 @@ "$ref": "#/definitions/NutanixCSIConfig" }, "password": { + "description": "Password corresponding to the provided user.", "type": "string", "x-go-name": "Password" }, "projectName": { - "description": "ProjectName is the project that this cluster is deployed into. If none is given, no project will be used.\n+optional", + "description": "The name of the project that this cluster is deployed into. If none is given, no project will be used.\n+optional", "type": "string", "x-go-name": "ProjectName" }, "proxyURL": { + "description": "Optional: Used to configure a HTTP proxy to access Nutanix Prism Central.", "type": "string", "x-go-name": "ProxyURL" }, "username": { + "description": "Username to access the Nutanix Prism Central API.", "type": "string", "x-go-name": "Username" } @@ -37624,10 +37660,12 @@ "x-go-name": "Enabled" }, "floatingIPPool": { + "description": "FloatingIPPool holds the name of the public network The public network is reachable from the outside world and should provide the pool of IP addresses to choose from.", "type": "string", "x-go-name": "FloatingIPPool" }, "network": { + "description": "Network holds the name of the internal network When specified, all worker nodes will be attached to this network. If not specified, a network, subnet \u0026 router will be created.", "type": "string", "x-go-name": "Network" }, @@ -37636,10 +37674,12 @@ "x-go-name": "Password" }, "project": { + "description": "Project, formally known as tenant.", "type": "string", "x-go-name": "Project" }, "projectID": { + "description": "ProjectID, formally known as tenantID.", "type": "string", "x-go-name": "ProjectID" }, @@ -37723,7 +37763,7 @@ "x-go-name": "IPv6SubnetPool" }, "network": { - "description": "Network holds the name of the internal network\nWhen specified, all worker nodes will be attached to this network. If not specified, a network, subnet \u0026 router will be created\n\nNote that the network is internal if the \"External\" field is set to false", + "description": "Network holds the name of the internal network\nWhen specified, all worker nodes will be attached to this network. If not specified, a network, subnet \u0026 router will be created.\n\nNote that the network is internal if the \"External\" field is set to false", "type": "string", "x-go-name": "Network" }, @@ -40148,6 +40188,7 @@ "type": "object", "properties": { "apiToken": { + "description": "The VMware Cloud Director API token.", "type": "string", "x-go-name": "APIToken" }, @@ -40162,22 +40203,27 @@ "x-go-name": "Enabled" }, "organization": { + "description": "The name of organization to use.", "type": "string", "x-go-name": "Organization" }, "ovdcNetwork": { + "description": "The name of organizational virtual data center network that will be associated with the VMs and vApp.", "type": "string", "x-go-name": "OVDCNetwork" }, "password": { + "description": "The VMware Cloud Director user password.", "type": "string", "x-go-name": "Password" }, "username": { + "description": "The VMware Cloud Director user name.", "type": "string", "x-go-name": "Username" }, "vdc": { + "description": "The organizational virtual data center.", "type": "string", "x-go-name": "VDC" } @@ -40224,7 +40270,7 @@ "title": "VMwareCloudDirectorCloudSpec specifies access data to VMware Cloud Director cloud.", "properties": { "apiToken": { - "description": "APIToken is the VMware Cloud Director API token.\n+optional", + "description": "The VMware Cloud Director API token.\n+optional", "type": "string", "x-go-name": "APIToken" }, @@ -40235,22 +40281,22 @@ "$ref": "#/definitions/VMwareCloudDirectorCSIConfig" }, "organization": { - "description": "Organization is the name of organization to use.\n+optional", + "description": "The name of organization to use.\n+optional", "type": "string", "x-go-name": "Organization" }, "ovdcNetwork": { - "description": "Network is the name of organizational virtual data center network that will be associated with the VMs and vApp.", + "description": "The name of organizational virtual data center network that will be associated with the VMs and vApp.", "type": "string", "x-go-name": "OVDCNetwork" }, "password": { - "description": "Password is the VMware Cloud Director user password.\n+optional", + "description": "The VMware Cloud Director user password.\n+optional", "type": "string", "x-go-name": "Password" }, "username": { - "description": "Username is the VMware Cloud Director user name.\n+optional", + "description": "The VMware Cloud Director user name.\n+optional", "type": "string", "x-go-name": "Username" }, @@ -40260,7 +40306,7 @@ "x-go-name": "VApp" }, "vdc": { - "description": "VDC is the organizational virtual data center.\n+optional", + "description": "The organizational virtual data center.\n+optional", "type": "string", "x-go-name": "VDC" } @@ -40429,16 +40475,23 @@ "VSphere": { "type": "object", "properties": { + "basePath": { + "description": "BasePath configures a vCenter folder path that KKP will create an individual cluster folder in.\nIf it's an absolute path, the RootPath configured in the datacenter will be ignored. If it is a relative path,\nthe BasePath part will be appended to the RootPath to construct the full path.", + "type": "string", + "x-go-name": "BasePath" + }, "datacenter": { "description": "If datacenter is set, this preset is only applicable to the\nconfigured datacenter.", "type": "string", "x-go-name": "Datacenter" }, "datastore": { + "description": "Datastore to be used for storing virtual machines and as a default for dynamic volume provisioning, it is mutually exclusive with DatastoreCluster.", "type": "string", "x-go-name": "Datastore" }, "datastoreCluster": { + "description": "DatastoreCluster to be used for storing virtual machines, it is mutually exclusive with Datastore.", "type": "string", "x-go-name": "DatastoreCluster" }, @@ -40448,6 +40501,7 @@ "x-go-name": "Enabled" }, "networks": { + "description": "List of vSphere networks.", "type": "array", "items": { "type": "string" @@ -40455,19 +40509,22 @@ "x-go-name": "Networks" }, "password": { + "description": "The vSphere user password.", "type": "string", "x-go-name": "Password" }, "resourcePool": { + "description": "ResourcePool is used to manage resources such as cpu and memory for vSphere virtual machines. The resource pool should be defined on vSphere cluster level.", "type": "string", "x-go-name": "ResourcePool" }, "username": { + "description": "The vSphere user name.", "type": "string", "x-go-name": "Username" }, "vmNetName": { - "description": "VMNetName is going to be deprecated starting with KKP 2.24 and removed in KKP 2.26+. It's recommended to use Networks instead.", + "description": "Deprecated: Use networks instead.", "type": "string", "x-go-name": "VMNetName" } @@ -40492,7 +40549,7 @@ "x-go-name": "DatastoreCluster" }, "folder": { - "description": "Folder is the folder to be used to group the provisioned virtual\nmachines.\n+optional", + "description": "Folder to be used to group the provisioned virtual\nmachines.\n+optional", "type": "string", "x-go-name": "Folder" }, @@ -40500,7 +40557,7 @@ "$ref": "#/definitions/VSphereCredentials" }, "networks": { - "description": "Networks is the list of vSphere networks.\n+optional", + "description": "List of vSphere networks.\n+optional", "type": "array", "items": { "type": "string" @@ -40508,7 +40565,7 @@ "x-go-name": "Networks" }, "password": { - "description": "Password is the vSphere user password.\n+optional", + "description": "The vSphere user password.\n+optional", "type": "string", "x-go-name": "Password" }, @@ -40526,12 +40583,12 @@ "$ref": "#/definitions/VSphereTag" }, "username": { - "description": "Username is the vSphere user name.\n+optional", + "description": "The vSphere user name.\n+optional", "type": "string", "x-go-name": "Username" }, "vmNetName": { - "description": "VMNetName is the name of the vSphere network.\nVMNetName is going to be deprecated starting with KKP 2.24 and removed in KKP 2.26+. It's recommended to use Networks instead.\n+optional", + "description": "The name of the vSphere network.\nDeprecated: Use networks instead.\n+optional", "type": "string", "x-go-name": "VMNetName" } diff --git a/modules/api/go.mod b/modules/api/go.mod index 7d8200a5af..f3394eb6de 100644 --- a/modules/api/go.mod +++ b/modules/api/go.mod @@ -67,7 +67,7 @@ require ( gopkg.in/square/go-jose.v2 v2.6.0 gopkg.in/yaml.v3 v3.0.1 k8c.io/kubeone v1.6.2 - k8c.io/kubermatic/v2 v2.23.5-0.20231015130915-4eb6fcf4b1c1 + k8c.io/kubermatic/v2 v2.23.6-0.20231023131608-052c6062c1a0 k8c.io/operating-system-manager v1.3.3 k8c.io/reconciler v0.3.1 k8s.io/api v0.26.4 @@ -102,7 +102,7 @@ replace ( replace ( github.com/ajeddeloh/go-json => github.com/coreos/go-json v0.0.0-20220810161552-7cce03887f34 - k8c.io/kubermatic/v2 => k8c.io/kubermatic/v2 v2.23.5-0.20231015130915-4eb6fcf4b1c1 + k8c.io/kubermatic/v2 => k8c.io/kubermatic/v2 v2.23.6-0.20231023131608-052c6062c1a0 ) require ( diff --git a/modules/api/go.sum b/modules/api/go.sum index d80eea6626..77e8a8307a 100644 --- a/modules/api/go.sum +++ b/modules/api/go.sum @@ -1367,8 +1367,8 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8c.io/kubeone v1.6.2 h1:3oEvD90kENhYzvvmSrMNjUam2fq7UMMKVp/Py57xs6M= k8c.io/kubeone v1.6.2/go.mod h1:5U/6sUZAkAl7uvC+VIDIA0VBZMBbFI9QD1C90kxb4qA= -k8c.io/kubermatic/v2 v2.23.5-0.20231015130915-4eb6fcf4b1c1 h1:pOWveo4POhp8SvcPOFC7FAyxZ+olk7fFxZDV4eD7Nf0= -k8c.io/kubermatic/v2 v2.23.5-0.20231015130915-4eb6fcf4b1c1/go.mod h1:1HTLurvUZGrQSkXEKmqb0tBhxPDJoSyc0VHRpKZ/E+0= +k8c.io/kubermatic/v2 v2.23.6-0.20231023131608-052c6062c1a0 h1:IYHkXX/ZXWbyxAQxq4t8LbhHmdSaS3Q5Fy2C1eJrUx8= +k8c.io/kubermatic/v2 v2.23.6-0.20231023131608-052c6062c1a0/go.mod h1:1HTLurvUZGrQSkXEKmqb0tBhxPDJoSyc0VHRpKZ/E+0= k8c.io/operating-system-manager v1.3.3 h1:8E58WGz+67+dDYuvAZu0QRRkslkWa4vMrbseQeRWceA= k8c.io/operating-system-manager v1.3.3/go.mod h1:kKDzXLWrC5BLpDbgXQFRpTVa5Fjru2S3ylxX5hZMRKA= k8c.io/reconciler v0.3.1 h1:fZ8gFvrDxjsJ6jdKogZVX9Er980EDUYnVPuOna32d0k= diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/a_k_s.go b/modules/api/pkg/test/e2e/utils/apiclient/models/a_k_s.go index 5257b1181a..d9287acf62 100644 --- a/modules/api/pkg/test/e2e/utils/apiclient/models/a_k_s.go +++ b/modules/api/pkg/test/e2e/utils/apiclient/models/a_k_s.go @@ -17,10 +17,10 @@ import ( // swagger:model AKS type AKS struct { - // client ID + // The service principal used to access Azure. ClientID string `json:"clientID,omitempty"` - // client secret + // The client secret corresponding to the given service principal. ClientSecret string `json:"clientSecret,omitempty"` // If datacenter is set, this preset is only applicable to the @@ -30,10 +30,10 @@ type AKS struct { // Only enabled presets will be available in the KKP dashboard. Enabled bool `json:"enabled,omitempty"` - // subscription ID + // The Azure Subscription used for the user cluster. SubscriptionID string `json:"subscriptionID,omitempty"` - // tenant ID + // The Azure Active Directory Tenant used for the user cluster. TenantID string `json:"tenantID,omitempty"` } diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/a_w_s.go b/modules/api/pkg/test/e2e/utils/apiclient/models/a_w_s.go index f063f981bb..e9bd30a8b7 100644 --- a/modules/api/pkg/test/e2e/utils/apiclient/models/a_w_s.go +++ b/modules/api/pkg/test/e2e/utils/apiclient/models/a_w_s.go @@ -17,13 +17,17 @@ import ( // swagger:model AWS type AWS struct { - // Access Key ID to authenticate against AWS. + // The Access key ID used to authenticate against AWS. AccessKeyID string `json:"accessKeyID,omitempty"` - // assume role a r n + // Defines the ARN for an IAM role that should be assumed when handling resources on AWS. It will be used + // to acquire temporary security credentials using an STS AssumeRole API operation whenever creating an AWS session. + // +optional AssumeRoleARN string `json:"assumeRoleARN,omitempty"` - // assume role external ID + // An arbitrary string that may be needed when calling the STS AssumeRole API operation. + // Using an external ID can help to prevent the "confused deputy problem". + // +optional AssumeRoleExternalID string `json:"assumeRoleExternalID,omitempty"` // ARN to use. This can be configured, but if left empty will be @@ -45,7 +49,7 @@ type AWS struct { // automatically filled in during reconciliation. RouteTableID string `json:"routeTableID,omitempty"` - // Secret Access Key to authenticate against AWS. + // The Secret Access Key used to authenticate against AWS. SecretAccessKey string `json:"secretAccessKey,omitempty"` // Security group to use. This can be configured, but if left empty will be diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/a_w_s_cloud_spec.go b/modules/api/pkg/test/e2e/utils/apiclient/models/a_w_s_cloud_spec.go index e0ba79bebf..d8de549888 100644 --- a/modules/api/pkg/test/e2e/utils/apiclient/models/a_w_s_cloud_spec.go +++ b/modules/api/pkg/test/e2e/utils/apiclient/models/a_w_s_cloud_spec.go @@ -18,13 +18,17 @@ import ( // swagger:model AWSCloudSpec type AWSCloudSpec struct { - // access key ID + // The Access key ID used to authenticate against AWS. AccessKeyID string `json:"accessKeyID,omitempty"` - // assume role a r n + // Defines the ARN for an IAM role that should be assumed when handling resources on AWS. It will be used + // to acquire temporary security credentials using an STS AssumeRole API operation whenever creating an AWS session. + // +optional AssumeRoleARN string `json:"assumeRoleARN,omitempty"` - // assume role external ID + // An arbitrary string that may be needed when calling the STS AssumeRole API operation. + // Using an external ID can help to prevent the "confused deputy problem". + // +optional AssumeRoleExternalID string `json:"assumeRoleExternalID,omitempty"` // The IAM role, the control plane will use. The control plane will perform an assume-role @@ -45,7 +49,7 @@ type AWSCloudSpec struct { // route table ID RouteTableID string `json:"routeTableID,omitempty"` - // secret access key + // The Secret Access Key used to authenticate against AWS. SecretAccessKey string `json:"secretAccessKey,omitempty"` // security group ID diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/alibaba.go b/modules/api/pkg/test/e2e/utils/apiclient/models/alibaba.go index 5980df0259..23203a0bf9 100644 --- a/modules/api/pkg/test/e2e/utils/apiclient/models/alibaba.go +++ b/modules/api/pkg/test/e2e/utils/apiclient/models/alibaba.go @@ -17,10 +17,10 @@ import ( // swagger:model Alibaba type Alibaba struct { - // Access Key ID to authenticate against Alibaba. + // The Access Key ID used to authenticate against Alibaba. AccessKeyID string `json:"accessKeyID,omitempty"` - // Access Key Secret to authenticate against Alibaba. + // The Access Key Secret used to authenticate against Alibaba. AccessKeySecret string `json:"accessKeySecret,omitempty"` // If datacenter is set, this preset is only applicable to the diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/alibaba_cloud_spec.go b/modules/api/pkg/test/e2e/utils/apiclient/models/alibaba_cloud_spec.go index 90a5660082..c36602ae76 100644 --- a/modules/api/pkg/test/e2e/utils/apiclient/models/alibaba_cloud_spec.go +++ b/modules/api/pkg/test/e2e/utils/apiclient/models/alibaba_cloud_spec.go @@ -18,10 +18,10 @@ import ( // swagger:model AlibabaCloudSpec type AlibabaCloudSpec struct { - // access key ID + // The Access Key ID used to authenticate against Alibaba. AccessKeyID string `json:"accessKeyID,omitempty"` - // access key secret + // The Access Key Secret used to authenticate against Alibaba. AccessKeySecret string `json:"accessKeySecret,omitempty"` // credentials reference diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/anexia_cloud_spec.go b/modules/api/pkg/test/e2e/utils/apiclient/models/anexia_cloud_spec.go index ed79d54ad2..7001e5391a 100644 --- a/modules/api/pkg/test/e2e/utils/apiclient/models/anexia_cloud_spec.go +++ b/modules/api/pkg/test/e2e/utils/apiclient/models/anexia_cloud_spec.go @@ -18,7 +18,7 @@ import ( // swagger:model AnexiaCloudSpec type AnexiaCloudSpec struct { - // token + // Token is used to authenticate with the Anexia API. Token string `json:"token,omitempty"` // credentials reference diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/azure.go b/modules/api/pkg/test/e2e/utils/apiclient/models/azure.go index 847864d983..b3329a26e7 100644 --- a/modules/api/pkg/test/e2e/utils/apiclient/models/azure.go +++ b/modules/api/pkg/test/e2e/utils/apiclient/models/azure.go @@ -18,10 +18,10 @@ import ( // swagger:model Azure type Azure struct { - // client ID + // The service principal used to access Azure. ClientID string `json:"clientID,omitempty"` - // client secret + // The client secret corresponding to the given service principal. ClientSecret string `json:"clientSecret,omitempty"` // If datacenter is set, this preset is only applicable to the @@ -31,28 +31,39 @@ type Azure struct { // Only enabled presets will be available in the KKP dashboard. Enabled bool `json:"enabled,omitempty"` - // resource group + // The resource group that will be used to look up and create resources for the cluster in. + // If set to empty string at cluster creation, a new resource group will be created and this field will be updated to + // the generated resource group's name. ResourceGroup string `json:"resourceGroup,omitempty"` - // route table name + // The name of a route table associated with the subnet referenced by `subnet`. + // If set to empty string at cluster creation, a new route table will be created and this field will be updated to + // the generated route table's name. If no subnet is defined at cluster creation, this field should be empty as well. RouteTableName string `json:"routeTable,omitempty"` - // security group + // The name of a security group associated with the subnet referenced by `subnet`. + // If set to empty string at cluster creation, a new security group will be created and this field will be updated to + // the generated security group's name. If no subnet is defined at cluster creation, this field should be empty as well. SecurityGroup string `json:"securityGroup,omitempty"` - // subnet name + // The name of a subnet in the VNet referenced by `vnet`. + // If set to empty string at cluster creation, a new subnet will be created and this field will be updated to + // the generated subnet's name. If no VNet is defined at cluster creation, this field should be empty as well. SubnetName string `json:"subnet,omitempty"` - // subscription ID + // The Azure Subscription used for the user cluster. SubscriptionID string `json:"subscriptionID,omitempty"` - // tenant ID + // The Azure Active Directory Tenant used for the user cluster. TenantID string `json:"tenantID,omitempty"` - // v net name + // The name of the VNet resource used for setting up networking in. + // If set to empty string at cluster creation, a new VNet will be created and this field will be updated to + // the generated VNet's name. VNetName string `json:"vnet,omitempty"` - // v net resource group + // Optional: Defines a second resource group that will be used for VNet related resources instead. + // If left empty, NO additional resource group will be created and all VNet related resources use the resource group defined by `resourceGroup`. VNetResourceGroup string `json:"vnetResourceGroup,omitempty"` // load balancer s k u diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/azure_cloud_spec.go b/modules/api/pkg/test/e2e/utils/apiclient/models/azure_cloud_spec.go index 46c7fb0dff..fa0e8d0006 100644 --- a/modules/api/pkg/test/e2e/utils/apiclient/models/azure_cloud_spec.go +++ b/modules/api/pkg/test/e2e/utils/apiclient/models/azure_cloud_spec.go @@ -27,11 +27,11 @@ type AzureCloudSpec struct { // will be updated to the generated availability set's name. AvailabilitySet string `json:"availabilitySet,omitempty"` - // ClientID is the service principal used to access Azure. + // The service principal used to access Azure. // Can be read from `credentialsReference` instead. ClientID string `json:"clientID,omitempty"` - // ClientSecret is the client secret corresponding to the given service principal. + // The client secret corresponding to the given service principal. // Can be read from `credentialsReference` instead. ClientSecret string `json:"clientSecret,omitempty"` @@ -60,11 +60,11 @@ type AzureCloudSpec struct { // the generated subnet's name. If no VNet is defined at cluster creation, this field should be empty as well. SubnetName string `json:"subnet,omitempty"` - // SubscriptionID is the Azure Subscription used for this cluster. + // The Azure Subscription used for this cluster. // Can be read from `credentialsReference` instead. SubscriptionID string `json:"subscriptionID,omitempty"` - // TenantID is the Azure Active Directory Tenant used for this cluster. + // The Azure Active Directory Tenant used for this cluster. // Can be read from `credentialsReference` instead. TenantID string `json:"tenantID,omitempty"` @@ -73,7 +73,7 @@ type AzureCloudSpec struct { // the generated VNet's name. VNetName string `json:"vnet,omitempty"` - // Optional: VNetResourceGroup optionally defines a second resource group that will be used for VNet related resources instead. + // Optional: Defines a second resource group that will be used for VNet related resources instead. // If left empty, NO additional resource group will be created and all VNet related resources use the resource group defined by `resourceGroup`. VNetResourceGroup string `json:"vnetResourceGroup,omitempty"` diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/datacenter_spec_openstack.go b/modules/api/pkg/test/e2e/utils/apiclient/models/datacenter_spec_openstack.go index 948d818a7c..87540a8df7 100644 --- a/modules/api/pkg/test/e2e/utils/apiclient/models/datacenter_spec_openstack.go +++ b/modules/api/pkg/test/e2e/utils/apiclient/models/datacenter_spec_openstack.go @@ -18,10 +18,10 @@ import ( // swagger:model DatacenterSpecOpenstack type DatacenterSpecOpenstack struct { - // auth URL + // Authentication URL AuthURL string `json:"authURL,omitempty"` - // availability zone + // Used to configure availability zone. AvailabilityZone string `json:"availabilityZone,omitempty"` // Used for automatic network creation @@ -43,7 +43,7 @@ type DatacenterSpecOpenstack struct { // This setting defaults to true. ManageSecurityGroups bool `json:"manageSecurityGroups,omitempty"` - // region + // Authentication region name Region string `json:"region,omitempty"` // Optional: Gets mapped to the "trust-device-path" setting in the cloud config. diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/digitalocean_cloud_spec.go b/modules/api/pkg/test/e2e/utils/apiclient/models/digitalocean_cloud_spec.go index 3fbeeb76b3..17b7919690 100644 --- a/modules/api/pkg/test/e2e/utils/apiclient/models/digitalocean_cloud_spec.go +++ b/modules/api/pkg/test/e2e/utils/apiclient/models/digitalocean_cloud_spec.go @@ -18,7 +18,7 @@ import ( // swagger:model DigitaloceanCloudSpec type DigitaloceanCloudSpec struct { - // token + // Token is used to authenticate with the DigitalOcean API. Token string `json:"token,omitempty"` // credentials reference diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/e_k_s.go b/modules/api/pkg/test/e2e/utils/apiclient/models/e_k_s.go index b292b02cbb..b4d28726b8 100644 --- a/modules/api/pkg/test/e2e/utils/apiclient/models/e_k_s.go +++ b/modules/api/pkg/test/e2e/utils/apiclient/models/e_k_s.go @@ -17,13 +17,15 @@ import ( // swagger:model EKS type EKS struct { - // access key ID + // The Access key ID used to authenticate against AWS. AccessKeyID string `json:"accessKeyID,omitempty"` - // assume role a r n + // Defines the ARN for an IAM role that should be assumed when handling resources on AWS. It will be used + // to acquire temporary security credentials using an STS AssumeRole API operation whenever creating an AWS session. AssumeRoleARN string `json:"assumeRoleARN,omitempty"` - // assume role external ID + // An arbitrary string that may be needed when calling the STS AssumeRole API operation. + // Using an external ID can help to prevent the "confused deputy problem". AssumeRoleExternalID string `json:"assumeRoleExternalID,omitempty"` // If datacenter is set, this preset is only applicable to the @@ -33,7 +35,7 @@ type EKS struct { // Only enabled presets will be available in the KKP dashboard. Enabled bool `json:"enabled,omitempty"` - // secret access key + // The Secret Access Key used to authenticate against AWS. SecretAccessKey string `json:"secretAccessKey,omitempty"` } diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/g_c_p.go b/modules/api/pkg/test/e2e/utils/apiclient/models/g_c_p.go index f6675b57a7..f27158e86e 100644 --- a/modules/api/pkg/test/e2e/utils/apiclient/models/g_c_p.go +++ b/modules/api/pkg/test/e2e/utils/apiclient/models/g_c_p.go @@ -27,7 +27,7 @@ type GCP struct { // network Network string `json:"network,omitempty"` - // service account + // ServiceAccount is the Google Service Account (JSON format), encoded with base64. ServiceAccount string `json:"serviceAccount,omitempty"` // subnetwork diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/kubevirt.go b/modules/api/pkg/test/e2e/utils/apiclient/models/kubevirt.go index 18c28de2e1..dad65326b5 100644 --- a/modules/api/pkg/test/e2e/utils/apiclient/models/kubevirt.go +++ b/modules/api/pkg/test/e2e/utils/apiclient/models/kubevirt.go @@ -24,7 +24,7 @@ type Kubevirt struct { // Only enabled presets will be available in the KKP dashboard. Enabled bool `json:"enabled,omitempty"` - // kubeconfig + // Kubeconfig is the cluster's kubeconfig file, encoded with base64. Kubeconfig string `json:"kubeconfig,omitempty"` } diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/nutanix.go b/modules/api/pkg/test/e2e/utils/apiclient/models/nutanix.go index d2e1bda0ee..c1d9bdd010 100644 --- a/modules/api/pkg/test/e2e/utils/apiclient/models/nutanix.go +++ b/modules/api/pkg/test/e2e/utils/apiclient/models/nutanix.go @@ -17,19 +17,19 @@ import ( // swagger:model Nutanix type Nutanix struct { - // CSIEndpoint to access Nutanix Prism Element for csi driver + // CSIEndpoint to access Nutanix Prism Element for CSI driver. CSIEndpoint string `json:"csiEndpoint,omitempty"` - // Prism Element Password for csi driver + // Prism Element Password for CSI driver. CSIPassword string `json:"csiPassword,omitempty"` - // CSIPort to use when connecting to the Nutanix Prism Element endpoint (defaults to 9440) + // CSIPort to use when connecting to the Nutanix Prism Element endpoint (defaults to 9440). CSIPort int32 `json:"csiPort,omitempty"` - // Prism Element Username for csi driver + // Prism Element Username for CSI driver. CSIUsername string `json:"csiUsername,omitempty"` - // ClusterName is the Nutanix cluster to deploy resources and nodes to. + // The name of the Nutanix cluster to which the resources and nodes are deployed to. ClusterName string `json:"clusterName,omitempty"` // If datacenter is set, this preset is only applicable to the @@ -39,17 +39,17 @@ type Nutanix struct { // Only enabled presets will be available in the KKP dashboard. Enabled bool `json:"enabled,omitempty"` - // Password is the password corresponding to the provided user. + // Password corresponding to the provided user. Password string `json:"password,omitempty"` - // ProjectName is the optional Nutanix project to use. If none is given, + // Optional: Nutanix project to use. If none is given, // no project will be used. ProjectName string `json:"projectName,omitempty"` - // ProxyURL is used to optionally configure a HTTP proxy to access Nutanix Prism Central. + // Optional: To configure a HTTP proxy to access Nutanix Prism Central. ProxyURL string `json:"proxyURL,omitempty"` - // Username is the username to access the Nutanix Prism Central API. + // Username that is used to access the Nutanix Prism Central API. Username string `json:"username,omitempty"` } diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/nutanix_c_s_i_config.go b/modules/api/pkg/test/e2e/utils/apiclient/models/nutanix_c_s_i_config.go index bf294f6481..7c229888d2 100644 --- a/modules/api/pkg/test/e2e/utils/apiclient/models/nutanix_c_s_i_config.go +++ b/modules/api/pkg/test/e2e/utils/apiclient/models/nutanix_c_s_i_config.go @@ -17,29 +17,29 @@ import ( // swagger:model NutanixCSIConfig type NutanixCSIConfig struct { - // Prism Element Endpoint to access Nutanix Prism Element for csi driver + // Prism Element Endpoint to access Nutanix Prism Element for CSI driver. Endpoint string `json:"endpoint,omitempty"` // Optional: defaults to "xfs" // +optional Fstype string `json:"fstype,omitempty"` - // Prism Element Password for csi driver + // Prism Element Password for CSI driver. Password string `json:"password,omitempty"` - // Optional: Port to use when connecting to the Nutanix Prism Element endpoint (defaults to 9440) + // Optional: Port to use when connecting to the Nutanix Prism Element endpoint (defaults to 9440). // +optional Port int32 `json:"port,omitempty"` - // Optional: defaults to "false" + // Optional: defaults to "false". // +optional SsSegmentedIscsiNetwork bool `json:"ssSegmentedIscsiNetwork,omitempty"` - // Optional: defaults to "SelfServiceContainer" + // Optional: defaults to "SelfServiceContainer". // +optional StorageContainer string `json:"storageContainer,omitempty"` - // Prism Element Username for csi driver + // Prism Element Username for CSI driver. Username string `json:"username,omitempty"` } diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/nutanix_cloud_spec.go b/modules/api/pkg/test/e2e/utils/apiclient/models/nutanix_cloud_spec.go index b745dca313..56e50697a7 100644 --- a/modules/api/pkg/test/e2e/utils/apiclient/models/nutanix_cloud_spec.go +++ b/modules/api/pkg/test/e2e/utils/apiclient/models/nutanix_cloud_spec.go @@ -21,17 +21,17 @@ type NutanixCloudSpec struct { // ClusterName is the Nutanix cluster that this user cluster will be deployed to. ClusterName string `json:"clusterName,omitempty"` - // password + // Password corresponding to the provided user. Password string `json:"password,omitempty"` - // ProjectName is the project that this cluster is deployed into. If none is given, no project will be used. + // The name of the project that this cluster is deployed into. If none is given, no project will be used. // +optional ProjectName string `json:"projectName,omitempty"` - // proxy URL + // Optional: Used to configure a HTTP proxy to access Nutanix Prism Central. ProxyURL string `json:"proxyURL,omitempty"` - // username + // Username to access the Nutanix Prism Central API. Username string `json:"username,omitempty"` // credentials reference diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/openstack.go b/modules/api/pkg/test/e2e/utils/apiclient/models/openstack.go index 6db46212c5..1ec882c04b 100644 --- a/modules/api/pkg/test/e2e/utils/apiclient/models/openstack.go +++ b/modules/api/pkg/test/e2e/utils/apiclient/models/openstack.go @@ -33,19 +33,19 @@ type Openstack struct { // Only enabled presets will be available in the KKP dashboard. Enabled bool `json:"enabled,omitempty"` - // floating IP pool + // FloatingIPPool holds the name of the public network The public network is reachable from the outside world and should provide the pool of IP addresses to choose from. FloatingIPPool string `json:"floatingIPPool,omitempty"` - // network + // Network holds the name of the internal network When specified, all worker nodes will be attached to this network. If not specified, a network, subnet & router will be created. Network string `json:"network,omitempty"` // password Password string `json:"password,omitempty"` - // project + // Project, formally known as tenant. Project string `json:"project,omitempty"` - // project ID + // ProjectID, formally known as tenantID. ProjectID string `json:"projectID,omitempty"` // router ID diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/openstack_cloud_spec.go b/modules/api/pkg/test/e2e/utils/apiclient/models/openstack_cloud_spec.go index 2073b62a7f..0f027c5d42 100644 --- a/modules/api/pkg/test/e2e/utils/apiclient/models/openstack_cloud_spec.go +++ b/modules/api/pkg/test/e2e/utils/apiclient/models/openstack_cloud_spec.go @@ -58,7 +58,7 @@ type OpenstackCloudSpec struct { IngressHostnameSuffix string `json:"ingressHostnameSuffix,omitempty"` // Network holds the name of the internal network - // When specified, all worker nodes will be attached to this network. If not specified, a network, subnet & router will be created + // When specified, all worker nodes will be attached to this network. If not specified, a network, subnet & router will be created. // // Note that the network is internal if the "External" field is set to false Network string `json:"network,omitempty"` diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/v_mware_cloud_director.go b/modules/api/pkg/test/e2e/utils/apiclient/models/v_mware_cloud_director.go index 0c050a8fc0..b79d604a04 100644 --- a/modules/api/pkg/test/e2e/utils/apiclient/models/v_mware_cloud_director.go +++ b/modules/api/pkg/test/e2e/utils/apiclient/models/v_mware_cloud_director.go @@ -17,7 +17,7 @@ import ( // swagger:model VMwareCloudDirector type VMwareCloudDirector struct { - // API token + // The VMware Cloud Director API token. APIToken string `json:"apiToken,omitempty"` // If datacenter is set, this preset is only applicable to the @@ -27,19 +27,19 @@ type VMwareCloudDirector struct { // Only enabled presets will be available in the KKP dashboard. Enabled bool `json:"enabled,omitempty"` - // o v d c network + // The name of organizational virtual data center network that will be associated with the VMs and vApp. OVDCNetwork string `json:"ovdcNetwork,omitempty"` - // organization + // The name of organization to use. Organization string `json:"organization,omitempty"` - // password + // The VMware Cloud Director user password. Password string `json:"password,omitempty"` - // username + // The VMware Cloud Director user name. Username string `json:"username,omitempty"` - // v d c + // The organizational virtual data center. VDC string `json:"vdc,omitempty"` } diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/v_mware_cloud_director_cloud_spec.go b/modules/api/pkg/test/e2e/utils/apiclient/models/v_mware_cloud_director_cloud_spec.go index 2593e9086c..c4e5574a40 100644 --- a/modules/api/pkg/test/e2e/utils/apiclient/models/v_mware_cloud_director_cloud_spec.go +++ b/modules/api/pkg/test/e2e/utils/apiclient/models/v_mware_cloud_director_cloud_spec.go @@ -18,22 +18,22 @@ import ( // swagger:model VMwareCloudDirectorCloudSpec type VMwareCloudDirectorCloudSpec struct { - // APIToken is the VMware Cloud Director API token. + // The VMware Cloud Director API token. // +optional APIToken string `json:"apiToken,omitempty"` - // Network is the name of organizational virtual data center network that will be associated with the VMs and vApp. + // The name of organizational virtual data center network that will be associated with the VMs and vApp. OVDCNetwork string `json:"ovdcNetwork,omitempty"` - // Organization is the name of organization to use. + // The name of organization to use. // +optional Organization string `json:"organization,omitempty"` - // Password is the VMware Cloud Director user password. + // The VMware Cloud Director user password. // +optional Password string `json:"password,omitempty"` - // Username is the VMware Cloud Director user name. + // The VMware Cloud Director user name. // +optional Username string `json:"username,omitempty"` @@ -41,7 +41,7 @@ type VMwareCloudDirectorCloudSpec struct { // +optional VApp string `json:"vapp,omitempty"` - // VDC is the organizational virtual data center. + // The organizational virtual data center. // +optional VDC string `json:"vdc,omitempty"` diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/v_sphere.go b/modules/api/pkg/test/e2e/utils/apiclient/models/v_sphere.go index 64dafed8f1..8d21b50f0e 100644 --- a/modules/api/pkg/test/e2e/utils/apiclient/models/v_sphere.go +++ b/modules/api/pkg/test/e2e/utils/apiclient/models/v_sphere.go @@ -17,32 +17,37 @@ import ( // swagger:model VSphere type VSphere struct { + // BasePath configures a vCenter folder path that KKP will create an individual cluster folder in. + // If it's an absolute path, the RootPath configured in the datacenter will be ignored. If it is a relative path, + // the BasePath part will be appended to the RootPath to construct the full path. + BasePath string `json:"basePath,omitempty"` + // If datacenter is set, this preset is only applicable to the // configured datacenter. Datacenter string `json:"datacenter,omitempty"` - // datastore + // Datastore to be used for storing virtual machines and as a default for dynamic volume provisioning, it is mutually exclusive with DatastoreCluster. Datastore string `json:"datastore,omitempty"` - // datastore cluster + // DatastoreCluster to be used for storing virtual machines, it is mutually exclusive with Datastore. DatastoreCluster string `json:"datastoreCluster,omitempty"` // Only enabled presets will be available in the KKP dashboard. Enabled bool `json:"enabled,omitempty"` - // networks + // List of vSphere networks. Networks []string `json:"networks"` - // password + // The vSphere user password. Password string `json:"password,omitempty"` - // resource pool + // ResourcePool is used to manage resources such as cpu and memory for vSphere virtual machines. The resource pool should be defined on vSphere cluster level. ResourcePool string `json:"resourcePool,omitempty"` - // username + // The vSphere user name. Username string `json:"username,omitempty"` - // VMNetName is going to be deprecated starting with KKP 2.24 and removed in KKP 2.26+. It's recommended to use Networks instead. + // Deprecated: Use networks instead. VMNetName string `json:"vmNetName,omitempty"` } diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/v_sphere_cloud_spec.go b/modules/api/pkg/test/e2e/utils/apiclient/models/v_sphere_cloud_spec.go index 5777afdeaa..8e224bbdf8 100644 --- a/modules/api/pkg/test/e2e/utils/apiclient/models/v_sphere_cloud_spec.go +++ b/modules/api/pkg/test/e2e/utils/apiclient/models/v_sphere_cloud_spec.go @@ -29,16 +29,16 @@ type VSphereCloudSpec struct { // +optional DatastoreCluster string `json:"datastoreCluster,omitempty"` - // Folder is the folder to be used to group the provisioned virtual + // Folder to be used to group the provisioned virtual // machines. // +optional Folder string `json:"folder,omitempty"` - // Networks is the list of vSphere networks. + // List of vSphere networks. // +optional Networks []string `json:"networks"` - // Password is the vSphere user password. + // The vSphere user password. // +optional Password string `json:"password,omitempty"` @@ -50,12 +50,12 @@ type VSphereCloudSpec struct { // StoragePolicy to be used for storage provisioning StoragePolicy string `json:"storagePolicy,omitempty"` - // Username is the vSphere user name. + // The vSphere user name. // +optional Username string `json:"username,omitempty"` - // VMNetName is the name of the vSphere network. - // VMNetName is going to be deprecated starting with KKP 2.24 and removed in KKP 2.26+. It's recommended to use Networks instead. + // The name of the vSphere network. + // Deprecated: Use networks instead. // +optional VMNetName string `json:"vmNetName,omitempty"` diff --git a/modules/web/package-lock.json b/modules/web/package-lock.json index 9c145a7032..b24d282799 100644 --- a/modules/web/package-lock.json +++ b/modules/web/package-lock.json @@ -1,12 +1,12 @@ { "name": "kubermatic-dashboard", - "version": "2.23.5", + "version": "2.23.6", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "kubermatic-dashboard", - "version": "2.23.5", + "version": "2.23.6", "hasInstallScript": true, "license": "proprietary", "dependencies": { diff --git a/modules/web/package.json b/modules/web/package.json index 9a95e07193..7b04593d49 100644 --- a/modules/web/package.json +++ b/modules/web/package.json @@ -1,7 +1,7 @@ { "name": "kubermatic-dashboard", "description": "Kubermatic Dashboard", - "version": "2.23.5", + "version": "2.23.6", "type": "module", "license": "proprietary", "repository": "https://github.com/kubermatic/dashboard", diff --git a/modules/web/src/assets/config/changelog.json b/modules/web/src/assets/config/changelog.json index 9b69ba8222..d9d7d3964b 100644 --- a/modules/web/src/assets/config/changelog.json +++ b/modules/web/src/assets/config/changelog.json @@ -1,37 +1,21 @@ { - "externalChangelogURL": "https://github.com/kubermatic/kubermatic/blob/main/docs/changelogs/CHANGELOG-2.23.md#v2235", + "externalChangelogURL": "https://github.com/kubermatic/kubermatic/blob/main/docs/changelogs/CHANGELOG-2.23.md#v2236", "entries": [ - { - "category": "added", - "description": "Introduce `DisableAdminKubeconfig` flag in `KubermaticSettings` to disable the admin kubeconfig feature from dashboard." - }, - { - "category": "changed", - "description": "Add Cilium 1.13.7 as supported CNI version, deprecate Cilium version 1.13.6 as it's impacted by CVE-2023-39347, CVE-2023-41333 (Moderate Severity), CVE-2023-41332 (Low Severity)." - }, { "category": "changed", - "description": "Update to OSM v1.3.3." + "description": "Add support for Cilium 1.13.8, mitigating an high CVE-2023-44487." }, { "category": "changed", - "description": "Update to nginx-ingress-controller v1.9.3 (fixes CVE-2023-44487, HTTP/2 rapid reset attack)." - }, - { - "category": "changed", - "description": "Update web terminal to use latest curl version (8.4.0)." - }, - { - "category": "fixed", - "description": "Operating system profile is configured correctly when updating a MachineDeployment now." + "description": "Increase default CPU limits for KKP API/seed/master-controller-managers to prevent general slowness." }, { "category": "fixed", - "description": "Fix Hetzner API response validation for server type and networks." + "description": "Fix Digitalocean CSI addon failing to render." }, { "category": "fixed", - "description": "Fix logout failing when Keycloak is used as identity provider." + "description": "Fix node-labeller controller not applying the `x-kubernetes.io/distribution` label to RHEL nodes." } ] }