Bump KKP Version in the API (#7068)

* bump kkp version * updating swagger and reconciling functions Signed-off-by: moadqassem <[email protected]> --------- Signed-off-by: moadqassem <[email protected]>
kubermatic · Jan 10, 2025 · 27fa664 · 27fa664
1 parent 0a2b837
commit 27fa664
Show file tree

Hide file tree

Showing 7 changed files with 237 additions and 8 deletions.
diff --git a/modules/api/cmd/kubermatic-api/swagger.json b/modules/api/cmd/kubermatic-api/swagger.json
@@ -27484,6 +27484,40 @@
       "type": "object",
       "x-go-package": "github.com/open-policy-agent/frameworks/constraint/pkg/core/templates"
     },
+    "AppNamespaceSpec": {
+      "type": "object",
+      "title": "AppNamespaceSpec describe the desired state of the namespace where application will be created.",
+      "properties": {
+        "annotations": {
+          "description": "Annotations of the namespace\nMore info: http://kubernetes.io/docs/user-guide/annotations\n+optional",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "x-go-name": "Annotations"
+        },
+        "create": {
+          "description": "Create defines whether the namespace should be created if it does not exist. Defaults to true",
+          "type": "boolean",
+          "x-go-name": "Create"
+        },
+        "labels": {
+          "description": "Labels of the namespace\nMore info: http://kubernetes.io/docs/user-guide/labels\n+optional",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "x-go-name": "Labels"
+        },
+        "name": {
+          "description": "Name is the namespace to deploy the Application into.\nShould be a valid lowercase RFC1123 domain name",
+          "type": "string",
+          "pattern": "=`^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$`",
+          "x-go-name": "Name"
+        }
+      },
+      "x-go-package": "k8c.io/kubermatic/v2/pkg/apis/apps.kubermatic/v1"
+    },
     "Application": {
       "description": "Application represents a set of applications that are to be installed for the cluster",
       "type": "object",
@@ -27713,6 +27747,9 @@
         "defaultDeployOptions": {
           "$ref": "#/definitions/DeployOptions"
         },
+        "defaultNamespace": {
+          "$ref": "#/definitions/AppNamespaceSpec"
+        },
         "defaultValues": {
           "$ref": "#/definitions/RawExtension"
         },
@@ -30361,6 +30398,9 @@
       "type": "object",
       "title": "DatacenterSpecAzure describes an Azure cloud datacenter.",
       "properties": {
+        "images": {
+          "$ref": "#/definitions/ImageList"
+        },
         "location": {
           "description": "Region to use, for example \"westeurope\". A list of available regions can be\nfound at https://azure.microsoft.com/en-us/global-infrastructure/locations/",
           "type": "string",

diff --git a/modules/api/go.mod b/modules/api/go.mod
@@ -67,7 +67,7 @@ require (
 	google.golang.org/api v0.209.0
 	gopkg.in/yaml.v3 v3.0.1
 	k8c.io/kubeone v1.9.0
-	k8c.io/kubermatic/v2 v2.26.0-rc.0.0.20241203100657-ffb3742e9ddf
+	k8c.io/kubermatic/v2 v2.26.0-rc.0.0.20250108204244-266fa5d264c1
 	k8c.io/machine-controller v1.60.1-0.20241118073303-4f251c4bc5a3
 	k8c.io/operating-system-manager v1.6.1-0.20241118134103-5db575f65108
 	k8c.io/reconciler v0.5.0
@@ -249,7 +249,7 @@ require (
 	golang.org/x/crypto v0.31.0 // indirect
 	golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
 	golang.org/x/mod v0.22.0 // indirect
-	golang.org/x/net v0.31.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
 	golang.org/x/sync v0.10.0 // indirect
 	golang.org/x/sys v0.28.0 // indirect
 	golang.org/x/term v0.27.0 // indirect

diff --git a/modules/api/go.sum b/modules/api/go.sum
@@ -871,8 +871,8 @@ golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
-golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo=
-golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=
 golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
@@ -1108,8 +1108,8 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 k8c.io/kubeone v1.9.0 h1:+CPaUwOWHyw+dJmy3tR/KtRbVP0CuYPQpfaaEXeEIYU=
 k8c.io/kubeone v1.9.0/go.mod h1:l5ehlxg5fE900c2JBL6by6oN9a/TV+T0zunwlO7FNtY=
-k8c.io/kubermatic/v2 v2.26.0-rc.0.0.20241203100657-ffb3742e9ddf h1:DCWnv/s55/JRQ4jurR+8HieOwXfl1wCLU2MMcOmAsmc=
-k8c.io/kubermatic/v2 v2.26.0-rc.0.0.20241203100657-ffb3742e9ddf/go.mod h1:6TdZL1CDNzaxPQhr2sfq4TJoKibaEKOYp6PycKdQk/I=
+k8c.io/kubermatic/v2 v2.26.0-rc.0.0.20250108204244-266fa5d264c1 h1:c4vjOw2GG9c5m5fF4UvIi8KcEGEaaLChBemsK6/42G4=
+k8c.io/kubermatic/v2 v2.26.0-rc.0.0.20250108204244-266fa5d264c1/go.mod h1:kBRStqhpogxx4pLo2X15++pCi+ZC+sHMZCUwHKgGpQY=
 k8c.io/machine-controller v1.60.1-0.20241118073303-4f251c4bc5a3 h1:1cm25uLinNABgDhOAGXACa0HLI0alf678QsVfw/Rt2s=
 k8c.io/machine-controller v1.60.1-0.20241118073303-4f251c4bc5a3/go.mod h1:Xn3sAXDb3eIQFvyPgMxG3auvMfOJxP6rXGPT/STpzJM=
 k8c.io/operating-system-manager v1.6.1-0.20241118134103-5db575f65108 h1:xiKGpydY/jsBVD5XT3zvAxW2pPKEtgcv526zdVFzbuw=

diff --git a/modules/api/pkg/resources/reconciling/zz_generated_reconcile.go b/modules/api/pkg/resources/reconciling/zz_generated_reconcile.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2024 The Kubermatic Kubernetes Platform contributors.
+Copyright 2025 The Kubermatic Kubernetes Platform contributors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/app_namespace_spec.go b/modules/api/pkg/test/e2e/utils/apiclient/models/app_namespace_spec.go
diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/application_definition_spec.go b/modules/api/pkg/test/e2e/utils/apiclient/models/application_definition_spec.go
diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/datacenter_spec_azure.go b/modules/api/pkg/test/e2e/utils/apiclient/models/datacenter_spec_azure.go