diff --git a/config/crd/bases/capsule.clastix.io_tenants.yaml b/config/crd/bases/capsule.clastix.io_tenants.yaml index 393f0322..e6250698 100644 --- a/config/crd/bases/capsule.clastix.io_tenants.yaml +++ b/config/crd/bases/capsule.clastix.io_tenants.yaml @@ -646,17 +646,6 @@ spec: allowedRegex: type: string type: object - externalServiceIPs: - description: Specifies the external IPs that can be used in Services with type ClusterIP. An empty list means all the IPs are allowed. Optional. - properties: - allowed: - items: - pattern: ^([0-9]{1,3}.){3}[0-9]{1,3}(/([0-9]|[1-2][0-9]|3[0-2]))?$ - type: string - type: array - required: - - allowed - type: object imagePullPolicies: description: Specify the allowed values for the imagePullPolicies option in Pod resources. Capsule assures that all Pod resources created in the Tenant can use only one of the allowed policy. Optional. items: @@ -1165,6 +1154,17 @@ spec: description: Specifies if NodePort service type resources are allowed for the Tenant. Default is true. Optional. type: boolean type: object + externalIPs: + description: Specifies the external IPs that can be used in Services with type ClusterIP. An empty list means all the IPs are allowed. Optional. + properties: + allowed: + items: + pattern: ^([0-9]{1,3}.){3}[0-9]{1,3}(/([0-9]|[1-2][0-9]|3[0-2]))?$ + type: string + type: array + required: + - allowed + type: object type: object storageClasses: description: Specifies the allowed StorageClasses assigned to the Tenant. Capsule assures that all PersistentVolumeClaim resources created in the Tenant can use only one of the allowed StorageClasses. Optional. diff --git a/config/install.yaml b/config/install.yaml index 3de9f1d7..b63973fb 100644 --- a/config/install.yaml +++ b/config/install.yaml @@ -725,17 +725,6 @@ spec: allowedRegex: type: string type: object - externalServiceIPs: - description: Specifies the external IPs that can be used in Services with type ClusterIP. An empty list means all the IPs are allowed. Optional. - properties: - allowed: - items: - pattern: ^([0-9]{1,3}.){3}[0-9]{1,3}(/([0-9]|[1-2][0-9]|3[0-2]))?$ - type: string - type: array - required: - - allowed - type: object imagePullPolicies: description: Specify the allowed values for the imagePullPolicies option in Pod resources. Capsule assures that all Pod resources created in the Tenant can use only one of the allowed policy. Optional. items: @@ -1244,6 +1233,17 @@ spec: description: Specifies if NodePort service type resources are allowed for the Tenant. Default is true. Optional. type: boolean type: object + externalIPs: + description: Specifies the external IPs that can be used in Services with type ClusterIP. An empty list means all the IPs are allowed. Optional. + properties: + allowed: + items: + pattern: ^([0-9]{1,3}.){3}[0-9]{1,3}(/([0-9]|[1-2][0-9]|3[0-2]))?$ + type: string + type: array + required: + - allowed + type: object type: object storageClasses: description: Specifies the allowed StorageClasses assigned to the Tenant. Capsule assures that all PersistentVolumeClaim resources created in the Tenant can use only one of the allowed StorageClasses. Optional. diff --git a/config/samples/capsule_v1beta1_tenant.yaml b/config/samples/capsule_v1beta1_tenant.yaml index 0774ebfc..f13af856 100644 --- a/config/samples/capsule_v1beta1_tenant.yaml +++ b/config/samples/capsule_v1beta1_tenant.yaml @@ -25,10 +25,10 @@ spec: allowedServices: nodePort: false externalName: false - externalServiceIPs: - allowed: - - 10.20.0.0/16 - - "10.96.42.42" + externalIPs: + allowed: + - 10.20.0.0/16 + - "10.96.42.42" imagePullPolicies: - Always ingressClasses: