Networkrestrictions in cluster inputs (#107)

fi-ts · Feb 1, 2024 · fb6c304 · fb6c304
1 parent 94e2242
commit fb6c304
Show file tree

Hide file tree

Showing 7 changed files with 232 additions and 11 deletions.
diff --git a/api/models/models_v1_machine_allocation.go b/api/models/models_v1_machine_allocation.go
diff --git a/api/models/v1_machine_usage.go b/api/models/v1_machine_usage.go
diff --git a/api/models/v1_network_access_restrictions.go b/api/models/v1_network_access_restrictions.go
diff --git a/api/models/v1_shoot_constraints.go b/api/models/v1_shoot_constraints.go
diff --git a/cloud-api.json b/cloud-api.json
@@ -439,6 +439,9 @@
     },
     "models.V1MachineAllocation": {
       "properties": {
+        "allocationuuid": {
+          "type": "string"
+        },
         "boot_info": {
           "$ref": "#/definitions/models.V1BootInfo"
         },
@@ -495,6 +498,7 @@
         }
       },
       "required": [
+        "allocationuuid",
         "created",
         "creator",
         "hostname",
@@ -2661,6 +2665,10 @@
     },
     "v1.MachineUsage": {
       "properties": {
+        "allocationid": {
+          "description": "the allocation id of this machine",
+          "type": "string"
+        },
         "clusterid": {
           "description": "the cluster id of this machine",
           "type": "string"
@@ -2726,6 +2734,7 @@
         }
       },
       "required": [
+        "allocationid",
         "clusterid",
         "contract",
         "debtorid",
@@ -2967,6 +2976,28 @@
         "Prefixes"
       ]
     },
+    "v1.NetworkAccessRestrictions": {
+      "properties": {
+        "allowed_networks": {
+          "description": "the list of networks which are allowed to configure if networkAccessTypeForbidden is specified",
+          "items": {
+            "type": "string"
+          },
+          "type": "array"
+        },
+        "masked_registries": {
+          "description": "list of registries which are configured to pull only strictly required container images",
+          "items": {
+            "type": "string"
+          },
+          "type": "array"
+        }
+      },
+      "required": [
+        "allowed_networks",
+        "masked_registries"
+      ]
+    },
     "v1.NetworkUsage": {
       "properties": {
         "annotations": {
@@ -4706,6 +4737,13 @@
           },
           "type": "array"
         },
+        "network_access_restrictions": {
+          "additionalProperties": {
+            "$ref": "#/definitions/v1.NetworkAccessRestrictions"
+          },
+          "description": "network restrictions by partition",
+          "type": "object"
+        },
         "networks": {
           "description": "the list of available networks for cluster creation",
           "items": {
@@ -4738,6 +4776,7 @@
         "kubernetes_versions",
         "machine_images",
         "machine_types",
+        "network_access_restrictions",
         "networks",
         "partitions",
         "seeds"

diff --git a/go.mod b/go.mod
@@ -8,14 +8,14 @@ require (
 	github.com/go-openapi/strfmt v0.22.0
 	github.com/go-openapi/swag v0.22.9
 	github.com/go-openapi/validate v0.22.6
-	github.com/metal-stack/metal-lib v0.14.3
+	github.com/metal-stack/metal-lib v0.14.4
 	github.com/metal-stack/security v0.7.1
 	github.com/stretchr/testify v1.8.4
 )
 
 require (
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
-	github.com/coreos/go-oidc/v3 v3.8.0 // indirect
+	github.com/coreos/go-oidc/v3 v3.9.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
 	github.com/go-jose/go-jose/v3 v3.0.1 // indirect
@@ -44,15 +44,15 @@ require (
 	github.com/opentracing/opentracing-go v1.2.0 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/segmentio/asm v1.2.0 // indirect
-	github.com/stretchr/objx v0.5.0 // indirect
+	github.com/stretchr/objx v0.5.1 // indirect
 	go.mongodb.org/mongo-driver v1.13.1 // indirect
 	go.opentelemetry.io/otel v1.17.0 // indirect
 	go.opentelemetry.io/otel/metric v1.17.0 // indirect
 	go.opentelemetry.io/otel/trace v1.17.0 // indirect
 	golang.org/x/crypto v0.18.0 // indirect
 	golang.org/x/net v0.20.0 // indirect
 	golang.org/x/oauth2 v0.16.0 // indirect
-	golang.org/x/sync v0.5.0 // indirect
+	golang.org/x/sync v0.6.0 // indirect
 	golang.org/x/sys v0.16.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/protobuf v1.32.0 // indirect