From 2a6ff09340836debbf0ff61fd934e3560996056b Mon Sep 17 00:00:00 2001 From: Dario Tranchitella Date: Tue, 20 Jul 2021 23:11:06 +0200 Subject: [PATCH] build(kustomize): CRD update for v1beta1 service options --- .../crd/bases/capsule.clastix.io_tenants.yaml | 36 ++++++++++++------ config/install.yaml | 38 ++++++++++++------- config/manager/kustomization.yaml | 2 +- 3 files changed, 50 insertions(+), 26 deletions(-) diff --git a/config/crd/bases/capsule.clastix.io_tenants.yaml b/config/crd/bases/capsule.clastix.io_tenants.yaml index 3e0874b7..609b9bc2 100644 --- a/config/crd/bases/capsule.clastix.io_tenants.yaml +++ b/config/crd/bases/capsule.clastix.io_tenants.yaml @@ -646,10 +646,6 @@ spec: allowedRegex: type: string type: object - enableNodePorts: - default: true - description: Specifies if NodePort service type resources are allowed for the Tenant. Default is true. Optional. - type: boolean 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: @@ -1141,16 +1137,32 @@ spec: type: object type: array type: object - servicesMetadata: - description: Specifies additional labels and annotations the Capsule operator places on any Service resource in the Tenant. Optional. + serviceOptions: + description: Specifies options for the Service, such as additional metadata or block of certain type of Services. Optional. properties: - additionalAnnotations: - additionalProperties: - type: string + additionalMetadata: + description: Specifies additional labels and annotations the Capsule operator places on any Service resource in the Tenant. Optional. + properties: + additionalAnnotations: + additionalProperties: + type: string + type: object + additionalLabels: + additionalProperties: + type: string + type: object type: object - additionalLabels: - additionalProperties: - type: string + allowedServices: + description: Block or deny certain type of Services. Optional. + properties: + externalName: + default: true + description: Specifies if ExternalName service type resources are allowed for the Tenant. Default is true. Optional. + type: boolean + nodePort: + default: true + description: Specifies if NodePort service type resources are allowed for the Tenant. Default is true. Optional. + type: boolean type: object type: object storageClasses: diff --git a/config/install.yaml b/config/install.yaml index 7acc033e..7f473042 100644 --- a/config/install.yaml +++ b/config/install.yaml @@ -725,10 +725,6 @@ spec: allowedRegex: type: string type: object - enableNodePorts: - default: true - description: Specifies if NodePort service type resources are allowed for the Tenant. Default is true. Optional. - type: boolean 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: @@ -1220,16 +1216,32 @@ spec: type: object type: array type: object - servicesMetadata: - description: Specifies additional labels and annotations the Capsule operator places on any Service resource in the Tenant. Optional. + serviceOptions: + description: Specifies options for the Service, such as additional metadata or block of certain type of Services. Optional. properties: - additionalAnnotations: - additionalProperties: - type: string + additionalMetadata: + description: Specifies additional labels and annotations the Capsule operator places on any Service resource in the Tenant. Optional. + properties: + additionalAnnotations: + additionalProperties: + type: string + type: object + additionalLabels: + additionalProperties: + type: string + type: object type: object - additionalLabels: - additionalProperties: - type: string + allowedServices: + description: Block or deny certain type of Services. Optional. + properties: + externalName: + default: true + description: Specifies if ExternalName service type resources are allowed for the Tenant. Default is true. Optional. + type: boolean + nodePort: + default: true + description: Specifies if NodePort service type resources are allowed for the Tenant. Default is true. Optional. + type: boolean type: object type: object storageClasses: @@ -1361,7 +1373,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: quay.io/clastix/capsule:v0.1.0-rc3 + image: quay.io/clastix/capsule:v0.1.0-rc4 imagePullPolicy: IfNotPresent name: manager ports: diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 6903f24c..216be557 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -7,4 +7,4 @@ kind: Kustomization images: - name: controller newName: quay.io/clastix/capsule - newTag: v0.1.0-rc3 + newTag: v0.1.0-rc4