diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml index 37ba2083f..6031ce439 100644 --- a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml +++ b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml @@ -267,6 +267,24 @@ spec: x-kubernetes-int-or-string: true type: object type: object + tls: + properties: + api: + properties: + internal: + properties: + secretName: + type: string + type: object + public: + properties: + secretName: + type: string + type: object + type: object + caBundleSecretName: + type: string + type: object required: - containerImage type: object @@ -1170,6 +1188,18 @@ spec: type: object resources: properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -1213,8 +1243,6 @@ spec: x-kubernetes-map-type: atomic storageClassName: type: string - volumeAttributesClassName: - type: string volumeMode: type: string volumeName: @@ -1403,43 +1431,6 @@ spec: sources: items: properties: - clusterTrustBundle: - properties: - labelSelector: - properties: - matchExpressions: - items: - properties: - key: - type: string - operator: - type: string - values: - items: - type: string - type: array - required: - - key - - operator - type: object - type: array - matchLabels: - additionalProperties: - type: string - type: object - type: object - x-kubernetes-map-type: atomic - name: - type: string - optional: - type: boolean - path: - type: string - signerName: - type: string - required: - - path - type: object configMap: properties: items: @@ -2970,6 +2961,18 @@ spec: type: object resources: properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -3013,8 +3016,6 @@ spec: x-kubernetes-map-type: atomic storageClassName: type: string - volumeAttributesClassName: - type: string volumeMode: type: string volumeName: @@ -3203,43 +3204,6 @@ spec: sources: items: properties: - clusterTrustBundle: - properties: - labelSelector: - properties: - matchExpressions: - items: - properties: - key: - type: string - operator: - type: string - values: - items: - type: string - type: array - required: - - key - - operator - type: object - type: array - matchLabels: - additionalProperties: - type: string - type: object - type: object - x-kubernetes-map-type: atomic - name: - type: string - optional: - type: boolean - path: - type: string - signerName: - type: string - required: - - path - type: object configMap: properties: items: @@ -3950,6 +3914,18 @@ spec: type: object resources: properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -3993,8 +3969,6 @@ spec: x-kubernetes-map-type: atomic storageClassName: type: string - volumeAttributesClassName: - type: string volumeMode: type: string volumeName: @@ -4183,43 +4157,6 @@ spec: sources: items: properties: - clusterTrustBundle: - properties: - labelSelector: - properties: - matchExpressions: - items: - properties: - key: - type: string - operator: - type: string - values: - items: - type: string - type: array - required: - - key - - operator - type: object - type: array - matchLabels: - additionalProperties: - type: string - type: object - type: object - x-kubernetes-map-type: atomic - name: - type: string - optional: - type: boolean - path: - type: string - signerName: - type: string - required: - - path - type: object configMap: properties: items: @@ -5713,12 +5650,6 @@ spec: type: string databaseInstance: type: string - debug: - properties: - dbSync: - default: false - type: boolean - type: object defaultConfigOverwrite: additionalProperties: type: string @@ -5743,12 +5674,6 @@ spec: customServiceConfig: default: '# add your customization here' type: string - debug: - properties: - service: - default: false - type: boolean - type: object defaultConfigOverwrite: additionalProperties: type: string @@ -5876,12 +5801,6 @@ spec: customServiceConfig: default: '# add your customization here' type: string - debug: - properties: - service: - default: false - type: boolean - type: object defaultConfigOverwrite: additionalProperties: type: string @@ -5971,15 +5890,6 @@ spec: customServiceConfig: default: '# add your customization here' type: string - debug: - properties: - dbSync: - default: false - type: boolean - service: - default: false - type: boolean - type: object defaultConfigOverwrite: additionalProperties: type: string @@ -6149,12 +6059,6 @@ spec: customServiceConfig: default: '# add your customization here' type: string - debug: - properties: - service: - default: false - type: boolean - type: object defaultConfigOverwrite: additionalProperties: type: string @@ -6940,6 +6844,18 @@ spec: type: object resources: properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -6983,8 +6899,6 @@ spec: x-kubernetes-map-type: atomic storageClassName: type: string - volumeAttributesClassName: - type: string volumeMode: type: string volumeName: @@ -7173,43 +7087,6 @@ spec: sources: items: properties: - clusterTrustBundle: - properties: - labelSelector: - properties: - matchExpressions: - items: - properties: - key: - type: string - operator: - type: string - values: - items: - type: string - type: array - required: - - key - - operator - type: object - type: array - matchLabels: - additionalProperties: - type: string - type: object - type: object - x-kubernetes-map-type: atomic - name: - type: string - optional: - type: boolean - path: - type: string - signerName: - type: string - required: - - path - type: object configMap: properties: items: @@ -8153,6 +8030,18 @@ spec: type: object resources: properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -8196,8 +8085,6 @@ spec: x-kubernetes-map-type: atomic storageClassName: type: string - volumeAttributesClassName: - type: string volumeMode: type: string volumeName: @@ -8386,43 +8273,6 @@ spec: sources: items: properties: - clusterTrustBundle: - properties: - labelSelector: - properties: - matchExpressions: - items: - properties: - key: - type: string - operator: - type: string - values: - items: - type: string - type: array - required: - - key - - operator - type: object - type: array - matchLabels: - additionalProperties: - type: string - type: object - type: object - x-kubernetes-map-type: atomic - name: - type: string - optional: - type: boolean - path: - type: string - signerName: - type: string - required: - - path - type: object configMap: properties: items: @@ -9203,10 +9053,6 @@ spec: type: string customServiceConfig: type: string - defaultConfigOverwrite: - additionalProperties: - type: string - type: object networkAttachments: items: type: string @@ -9373,10 +9219,6 @@ spec: type: string customServiceConfig: type: string - defaultConfigOverwrite: - additionalProperties: - type: string - type: object enabled: type: boolean networkAttachments: @@ -9718,10 +9560,6 @@ spec: type: string customServiceConfig: type: string - defaultConfigOverwrite: - additionalProperties: - type: string - type: object networkAttachments: items: type: string @@ -9890,7 +9728,7 @@ spec: type: boolean template: properties: - certssecret: + certsSecret: default: octavia-certs-secret type: string customServiceConfig: @@ -10067,10 +9905,10 @@ spec: type: object octaviaHealthManager: properties: - certspassphrasesecret: + certsPassphraseSecret: default: octavia-ca-passphrase type: string - certssecret: + certsSecret: type: string containerImage: type: string @@ -10160,6 +9998,10 @@ spec: serviceUser: default: octavia type: string + sshPrivkeySecret: + type: string + sshPubkey: + type: string tenantName: default: service type: string @@ -10173,10 +10015,10 @@ spec: type: object octaviaHousekeeping: properties: - certspassphrasesecret: + certsPassphraseSecret: default: octavia-ca-passphrase type: string - certssecret: + certsSecret: type: string containerImage: type: string @@ -10266,6 +10108,10 @@ spec: serviceUser: default: octavia type: string + sshPrivkeySecret: + type: string + sshPubkey: + type: string tenantName: default: service type: string @@ -10279,10 +10125,10 @@ spec: type: object octaviaWorker: properties: - certspassphrasesecret: + certsPassphraseSecret: default: octavia-ca-passphrase type: string - certssecret: + certsSecret: type: string containerImage: type: string @@ -10372,6 +10218,10 @@ spec: serviceUser: default: octavia type: string + sshPrivkeySecret: + type: string + sshPubkey: + type: string tenantName: default: service type: string @@ -10406,8 +10256,14 @@ spec: serviceUser: default: octavia type: string + sshPrivkeySecret: + default: octavia-ssh-privkey-secret + type: string + sshPubkey: + default: octavia-ssh-pubkey + type: string required: - - certssecret + - certsSecret - databaseInstance - octaviaAPI - rabbitMqClusterName @@ -11051,16 +10907,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic namespaceSelector: properties: matchExpressions: @@ -11129,16 +10975,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic namespaceSelector: properties: matchExpressions: @@ -11205,16 +11041,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic namespaceSelector: properties: matchExpressions: @@ -11283,16 +11109,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic namespaceSelector: properties: matchExpressions: @@ -11654,16 +11470,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic namespaceSelector: properties: matchExpressions: @@ -11732,16 +11538,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic namespaceSelector: properties: matchExpressions: @@ -11808,16 +11604,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic namespaceSelector: properties: matchExpressions: @@ -11886,16 +11672,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic namespaceSelector: properties: matchExpressions: @@ -12075,14 +11851,6 @@ spec: required: - port type: object - sleep: - properties: - seconds: - format: int64 - type: integer - required: - - seconds - type: object tcpSocket: properties: host: @@ -12133,14 +11901,6 @@ spec: required: - port type: object - sleep: - properties: - seconds: - format: int64 - type: integer - required: - - seconds - type: object tcpSocket: properties: host: @@ -12735,14 +12495,6 @@ spec: required: - port type: object - sleep: - properties: - seconds: - format: int64 - type: integer - required: - - seconds - type: object tcpSocket: properties: host: @@ -12793,14 +12545,6 @@ spec: required: - port type: object - sleep: - properties: - seconds: - format: int64 - type: integer - required: - - seconds - type: object tcpSocket: properties: host: @@ -13402,14 +13146,6 @@ spec: required: - port type: object - sleep: - properties: - seconds: - format: int64 - type: integer - required: - - seconds - type: object tcpSocket: properties: host: @@ -13460,14 +13196,6 @@ spec: required: - port type: object - sleep: - properties: - seconds: - format: int64 - type: integer - required: - - seconds - type: object tcpSocket: properties: host: @@ -14351,6 +14079,18 @@ spec: type: object resources: properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -14394,8 +14134,6 @@ spec: x-kubernetes-map-type: atomic storageClassName: type: string - volumeAttributesClassName: - type: string volumeMode: type: string volumeName: @@ -14584,43 +14322,6 @@ spec: sources: items: properties: - clusterTrustBundle: - properties: - labelSelector: - properties: - matchExpressions: - items: - properties: - key: - type: string - operator: - type: string - values: - items: - type: string - type: array - required: - - key - - operator - type: object - type: array - matchLabels: - additionalProperties: - type: string - type: object - type: object - x-kubernetes-map-type: atomic - name: - type: string - optional: - type: boolean - path: - type: string - signerName: - type: string - required: - - path - type: object configMap: properties: items: @@ -14936,6 +14637,18 @@ spec: type: object resources: properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -14979,8 +14692,6 @@ spec: x-kubernetes-map-type: atomic storageClassName: type: string - volumeAttributesClassName: - type: string volumeMode: type: string volumeName: @@ -15421,6 +15132,16 @@ spec: properties: containerImage: type: string + minPartHours: + default: 1 + format: int64 + minimum: 1 + type: integer + partPower: + default: 10 + format: int64 + minimum: 1 + type: integer ringReplicas: default: 1 format: int64 @@ -15431,6 +15152,8 @@ spec: type: string required: - containerImage + - minPartHours + - partPower - ringReplicas - swiftConfSecret type: object @@ -15687,6 +15410,14 @@ spec: type: object logging: properties: + annotations: + additionalProperties: + type: string + default: + metallb.universe.tf/address-pool: internalapi + metallb.universe.tf/allow-shared-ip: internalapi + metallb.universe.tf/loadBalancerIPs: 172.17.0.80 + type: object cloNamespace: default: openshift-logging type: string @@ -15695,8 +15426,6 @@ spec: type: boolean ipaddr: type: string - network: - type: string port: default: 10514 format: int32 @@ -15717,7 +15446,6 @@ spec: type: integer required: - ipaddr - - network - rsyslogQueueType type: object metricStorage: @@ -15810,6 +15538,18 @@ spec: type: object resources: properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -15853,8 +15593,6 @@ spec: x-kubernetes-map-type: atomic storageClassName: type: string - volumeAttributesClassName: - type: string volumeMode: type: string volumeName: @@ -16260,6 +15998,10 @@ spec: alertingEnabled: default: true type: boolean + dataplaneNetwork: + default: ctlplane + pattern: ^[a-zA-Z0-9][a-zA-Z0-9\-_]*[a-zA-Z0-9]$ + type: string scrapeInterval: default: 30s type: string @@ -16311,6 +16053,8 @@ spec: - persistent type: string type: object + required: + - dataplaneNetwork type: object type: object type: object diff --git a/apis/go.mod b/apis/go.mod index aaf809d9b..0007fc06c 100644 --- a/apis/go.mod +++ b/apis/go.mod @@ -25,11 +25,12 @@ require ( github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240214224947-9615ae5dbf3c github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240205163246-3add3edb159c github.com/rabbitmq/cluster-operator/v2 v2.5.0 - k8s.io/apimachinery v0.29.0 - sigs.k8s.io/controller-runtime v0.16.4 + k8s.io/apimachinery v0.29.1 + sigs.k8s.io/controller-runtime v0.17.0 ) require ( + github.com/evanphx/json-patch v5.6.0+incompatible // indirect github.com/go-logr/zapr v1.3.0 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect @@ -88,10 +89,10 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/api v0.28.6 - k8s.io/apiextensions-apiserver v0.28.3 //indirect - k8s.io/client-go v0.28.6 - k8s.io/component-base v0.28.3 //indirect + k8s.io/api v0.29.1 + k8s.io/apiextensions-apiserver v0.29.0 //indirect + k8s.io/client-go v0.29.1 + k8s.io/component-base v0.29.0 //indirect k8s.io/klog/v2 v2.120.1 // indirect k8s.io/kube-openapi v0.0.0-20240209001042-7a0d5b415232 //indirect k8s.io/utils v0.0.0-20240102154912-e7106e64919e //indirect diff --git a/apis/go.sum b/apis/go.sum index 8d611bc29..b37b6b099 100644 --- a/apis/go.sum +++ b/apis/go.sum @@ -143,7 +143,7 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= @@ -225,24 +225,18 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.28.6 h1:yy6u9CuIhmg55YvF/BavPBBXB+5QicB64njJXxVnzLo= -k8s.io/api v0.28.6/go.mod h1:AM6Ys6g9MY3dl/XNaNfg/GePI0FT7WBGu8efU/lirAo= -k8s.io/apiextensions-apiserver v0.28.3 h1:Od7DEnhXHnHPZG+W9I97/fSQkVpVPQx2diy+2EtmY08= -k8s.io/apiextensions-apiserver v0.28.3/go.mod h1:NE1XJZ4On0hS11aWWJUTNkmVB03j9LM7gJSisbRt8Lc= -k8s.io/apimachinery v0.29.0 h1:+ACVktwyicPz0oc6MTMLwa2Pw3ouLAfAon1wPLtG48o= -k8s.io/apimachinery v0.29.0/go.mod h1:eVBxQ/cwiJxH58eK/jd/vAk4mrxmVlnpBH5J2GbMeis= -k8s.io/client-go v0.28.6 h1:Gge6ziyIdafRchfoBKcpaARuz7jfrK1R1azuwORIsQI= -k8s.io/client-go v0.28.6/go.mod h1:+nu0Yp21Oeo/cBCsprNVXB2BfJTV51lFfe5tXl2rUL8= -k8s.io/component-base v0.28.3 h1:rDy68eHKxq/80RiMb2Ld/tbH8uAE75JdCqJyi6lXMzI= -k8s.io/component-base v0.28.3/go.mod h1:fDJ6vpVNSk6cRo5wmDa6eKIG7UlIQkaFmZN2fYgIUD8= +k8s.io/api v0.29.1 h1:DAjwWX/9YT7NQD4INu49ROJuZAAAP/Ijki48GUPzxqw= +k8s.io/apiextensions-apiserver v0.29.0 h1:0VuspFG7Hj+SxyF/Z/2T0uFbI5gb5LRgEyUVE3Q4lV0= +k8s.io/apimachinery v0.29.1 h1:KY4/E6km/wLBguvCZv8cKTeOwwOBqFNjwJIdMkMbbRc= +k8s.io/client-go v0.29.1 h1:19B/+2NGEwnFLzt0uB5kNJnfTsbV8w6TgQRz9l7ti7A= +k8s.io/component-base v0.29.0 h1:T7rjd5wvLnPBV1vC4zWd/iWRbV8Mdxs+nGaoaFzGw3s= k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20240209001042-7a0d5b415232 h1:MMq4iF9pHuAz/9dLnHwBQKEoeigXClzs3MFh/seyqtA= k8s.io/kube-openapi v0.0.0-20240209001042-7a0d5b415232/go.mod h1:Pa1PvrP7ACSkuX6I7KYomY6cmMA0Tx86waBhDUgoKPw= k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ= k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -sigs.k8s.io/controller-runtime v0.16.4 h1:XMh7dF19MlyvMfQCHvH929YGg2WFrIuJ4N5sx3G7U+k= -sigs.k8s.io/controller-runtime v0.16.4/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0= +sigs.k8s.io/controller-runtime v0.17.0 h1:fjJQf8Ukya+VjogLO6/bNX9HE6Y2xpsO5+fyS26ur/s= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= diff --git a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml index 37ba2083f..6031ce439 100644 --- a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml +++ b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml @@ -267,6 +267,24 @@ spec: x-kubernetes-int-or-string: true type: object type: object + tls: + properties: + api: + properties: + internal: + properties: + secretName: + type: string + type: object + public: + properties: + secretName: + type: string + type: object + type: object + caBundleSecretName: + type: string + type: object required: - containerImage type: object @@ -1170,6 +1188,18 @@ spec: type: object resources: properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -1213,8 +1243,6 @@ spec: x-kubernetes-map-type: atomic storageClassName: type: string - volumeAttributesClassName: - type: string volumeMode: type: string volumeName: @@ -1403,43 +1431,6 @@ spec: sources: items: properties: - clusterTrustBundle: - properties: - labelSelector: - properties: - matchExpressions: - items: - properties: - key: - type: string - operator: - type: string - values: - items: - type: string - type: array - required: - - key - - operator - type: object - type: array - matchLabels: - additionalProperties: - type: string - type: object - type: object - x-kubernetes-map-type: atomic - name: - type: string - optional: - type: boolean - path: - type: string - signerName: - type: string - required: - - path - type: object configMap: properties: items: @@ -2970,6 +2961,18 @@ spec: type: object resources: properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -3013,8 +3016,6 @@ spec: x-kubernetes-map-type: atomic storageClassName: type: string - volumeAttributesClassName: - type: string volumeMode: type: string volumeName: @@ -3203,43 +3204,6 @@ spec: sources: items: properties: - clusterTrustBundle: - properties: - labelSelector: - properties: - matchExpressions: - items: - properties: - key: - type: string - operator: - type: string - values: - items: - type: string - type: array - required: - - key - - operator - type: object - type: array - matchLabels: - additionalProperties: - type: string - type: object - type: object - x-kubernetes-map-type: atomic - name: - type: string - optional: - type: boolean - path: - type: string - signerName: - type: string - required: - - path - type: object configMap: properties: items: @@ -3950,6 +3914,18 @@ spec: type: object resources: properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -3993,8 +3969,6 @@ spec: x-kubernetes-map-type: atomic storageClassName: type: string - volumeAttributesClassName: - type: string volumeMode: type: string volumeName: @@ -4183,43 +4157,6 @@ spec: sources: items: properties: - clusterTrustBundle: - properties: - labelSelector: - properties: - matchExpressions: - items: - properties: - key: - type: string - operator: - type: string - values: - items: - type: string - type: array - required: - - key - - operator - type: object - type: array - matchLabels: - additionalProperties: - type: string - type: object - type: object - x-kubernetes-map-type: atomic - name: - type: string - optional: - type: boolean - path: - type: string - signerName: - type: string - required: - - path - type: object configMap: properties: items: @@ -5713,12 +5650,6 @@ spec: type: string databaseInstance: type: string - debug: - properties: - dbSync: - default: false - type: boolean - type: object defaultConfigOverwrite: additionalProperties: type: string @@ -5743,12 +5674,6 @@ spec: customServiceConfig: default: '# add your customization here' type: string - debug: - properties: - service: - default: false - type: boolean - type: object defaultConfigOverwrite: additionalProperties: type: string @@ -5876,12 +5801,6 @@ spec: customServiceConfig: default: '# add your customization here' type: string - debug: - properties: - service: - default: false - type: boolean - type: object defaultConfigOverwrite: additionalProperties: type: string @@ -5971,15 +5890,6 @@ spec: customServiceConfig: default: '# add your customization here' type: string - debug: - properties: - dbSync: - default: false - type: boolean - service: - default: false - type: boolean - type: object defaultConfigOverwrite: additionalProperties: type: string @@ -6149,12 +6059,6 @@ spec: customServiceConfig: default: '# add your customization here' type: string - debug: - properties: - service: - default: false - type: boolean - type: object defaultConfigOverwrite: additionalProperties: type: string @@ -6940,6 +6844,18 @@ spec: type: object resources: properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -6983,8 +6899,6 @@ spec: x-kubernetes-map-type: atomic storageClassName: type: string - volumeAttributesClassName: - type: string volumeMode: type: string volumeName: @@ -7173,43 +7087,6 @@ spec: sources: items: properties: - clusterTrustBundle: - properties: - labelSelector: - properties: - matchExpressions: - items: - properties: - key: - type: string - operator: - type: string - values: - items: - type: string - type: array - required: - - key - - operator - type: object - type: array - matchLabels: - additionalProperties: - type: string - type: object - type: object - x-kubernetes-map-type: atomic - name: - type: string - optional: - type: boolean - path: - type: string - signerName: - type: string - required: - - path - type: object configMap: properties: items: @@ -8153,6 +8030,18 @@ spec: type: object resources: properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -8196,8 +8085,6 @@ spec: x-kubernetes-map-type: atomic storageClassName: type: string - volumeAttributesClassName: - type: string volumeMode: type: string volumeName: @@ -8386,43 +8273,6 @@ spec: sources: items: properties: - clusterTrustBundle: - properties: - labelSelector: - properties: - matchExpressions: - items: - properties: - key: - type: string - operator: - type: string - values: - items: - type: string - type: array - required: - - key - - operator - type: object - type: array - matchLabels: - additionalProperties: - type: string - type: object - type: object - x-kubernetes-map-type: atomic - name: - type: string - optional: - type: boolean - path: - type: string - signerName: - type: string - required: - - path - type: object configMap: properties: items: @@ -9203,10 +9053,6 @@ spec: type: string customServiceConfig: type: string - defaultConfigOverwrite: - additionalProperties: - type: string - type: object networkAttachments: items: type: string @@ -9373,10 +9219,6 @@ spec: type: string customServiceConfig: type: string - defaultConfigOverwrite: - additionalProperties: - type: string - type: object enabled: type: boolean networkAttachments: @@ -9718,10 +9560,6 @@ spec: type: string customServiceConfig: type: string - defaultConfigOverwrite: - additionalProperties: - type: string - type: object networkAttachments: items: type: string @@ -9890,7 +9728,7 @@ spec: type: boolean template: properties: - certssecret: + certsSecret: default: octavia-certs-secret type: string customServiceConfig: @@ -10067,10 +9905,10 @@ spec: type: object octaviaHealthManager: properties: - certspassphrasesecret: + certsPassphraseSecret: default: octavia-ca-passphrase type: string - certssecret: + certsSecret: type: string containerImage: type: string @@ -10160,6 +9998,10 @@ spec: serviceUser: default: octavia type: string + sshPrivkeySecret: + type: string + sshPubkey: + type: string tenantName: default: service type: string @@ -10173,10 +10015,10 @@ spec: type: object octaviaHousekeeping: properties: - certspassphrasesecret: + certsPassphraseSecret: default: octavia-ca-passphrase type: string - certssecret: + certsSecret: type: string containerImage: type: string @@ -10266,6 +10108,10 @@ spec: serviceUser: default: octavia type: string + sshPrivkeySecret: + type: string + sshPubkey: + type: string tenantName: default: service type: string @@ -10279,10 +10125,10 @@ spec: type: object octaviaWorker: properties: - certspassphrasesecret: + certsPassphraseSecret: default: octavia-ca-passphrase type: string - certssecret: + certsSecret: type: string containerImage: type: string @@ -10372,6 +10218,10 @@ spec: serviceUser: default: octavia type: string + sshPrivkeySecret: + type: string + sshPubkey: + type: string tenantName: default: service type: string @@ -10406,8 +10256,14 @@ spec: serviceUser: default: octavia type: string + sshPrivkeySecret: + default: octavia-ssh-privkey-secret + type: string + sshPubkey: + default: octavia-ssh-pubkey + type: string required: - - certssecret + - certsSecret - databaseInstance - octaviaAPI - rabbitMqClusterName @@ -11051,16 +10907,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic namespaceSelector: properties: matchExpressions: @@ -11129,16 +10975,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic namespaceSelector: properties: matchExpressions: @@ -11205,16 +11041,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic namespaceSelector: properties: matchExpressions: @@ -11283,16 +11109,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic namespaceSelector: properties: matchExpressions: @@ -11654,16 +11470,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic namespaceSelector: properties: matchExpressions: @@ -11732,16 +11538,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic namespaceSelector: properties: matchExpressions: @@ -11808,16 +11604,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic namespaceSelector: properties: matchExpressions: @@ -11886,16 +11672,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic namespaceSelector: properties: matchExpressions: @@ -12075,14 +11851,6 @@ spec: required: - port type: object - sleep: - properties: - seconds: - format: int64 - type: integer - required: - - seconds - type: object tcpSocket: properties: host: @@ -12133,14 +11901,6 @@ spec: required: - port type: object - sleep: - properties: - seconds: - format: int64 - type: integer - required: - - seconds - type: object tcpSocket: properties: host: @@ -12735,14 +12495,6 @@ spec: required: - port type: object - sleep: - properties: - seconds: - format: int64 - type: integer - required: - - seconds - type: object tcpSocket: properties: host: @@ -12793,14 +12545,6 @@ spec: required: - port type: object - sleep: - properties: - seconds: - format: int64 - type: integer - required: - - seconds - type: object tcpSocket: properties: host: @@ -13402,14 +13146,6 @@ spec: required: - port type: object - sleep: - properties: - seconds: - format: int64 - type: integer - required: - - seconds - type: object tcpSocket: properties: host: @@ -13460,14 +13196,6 @@ spec: required: - port type: object - sleep: - properties: - seconds: - format: int64 - type: integer - required: - - seconds - type: object tcpSocket: properties: host: @@ -14351,6 +14079,18 @@ spec: type: object resources: properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -14394,8 +14134,6 @@ spec: x-kubernetes-map-type: atomic storageClassName: type: string - volumeAttributesClassName: - type: string volumeMode: type: string volumeName: @@ -14584,43 +14322,6 @@ spec: sources: items: properties: - clusterTrustBundle: - properties: - labelSelector: - properties: - matchExpressions: - items: - properties: - key: - type: string - operator: - type: string - values: - items: - type: string - type: array - required: - - key - - operator - type: object - type: array - matchLabels: - additionalProperties: - type: string - type: object - type: object - x-kubernetes-map-type: atomic - name: - type: string - optional: - type: boolean - path: - type: string - signerName: - type: string - required: - - path - type: object configMap: properties: items: @@ -14936,6 +14637,18 @@ spec: type: object resources: properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -14979,8 +14692,6 @@ spec: x-kubernetes-map-type: atomic storageClassName: type: string - volumeAttributesClassName: - type: string volumeMode: type: string volumeName: @@ -15421,6 +15132,16 @@ spec: properties: containerImage: type: string + minPartHours: + default: 1 + format: int64 + minimum: 1 + type: integer + partPower: + default: 10 + format: int64 + minimum: 1 + type: integer ringReplicas: default: 1 format: int64 @@ -15431,6 +15152,8 @@ spec: type: string required: - containerImage + - minPartHours + - partPower - ringReplicas - swiftConfSecret type: object @@ -15687,6 +15410,14 @@ spec: type: object logging: properties: + annotations: + additionalProperties: + type: string + default: + metallb.universe.tf/address-pool: internalapi + metallb.universe.tf/allow-shared-ip: internalapi + metallb.universe.tf/loadBalancerIPs: 172.17.0.80 + type: object cloNamespace: default: openshift-logging type: string @@ -15695,8 +15426,6 @@ spec: type: boolean ipaddr: type: string - network: - type: string port: default: 10514 format: int32 @@ -15717,7 +15446,6 @@ spec: type: integer required: - ipaddr - - network - rsyslogQueueType type: object metricStorage: @@ -15810,6 +15538,18 @@ spec: type: object resources: properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -15853,8 +15593,6 @@ spec: x-kubernetes-map-type: atomic storageClassName: type: string - volumeAttributesClassName: - type: string volumeMode: type: string volumeName: @@ -16260,6 +15998,10 @@ spec: alertingEnabled: default: true type: boolean + dataplaneNetwork: + default: ctlplane + pattern: ^[a-zA-Z0-9][a-zA-Z0-9\-_]*[a-zA-Z0-9]$ + type: string scrapeInterval: default: 30s type: string @@ -16311,6 +16053,8 @@ spec: - persistent type: string type: object + required: + - dataplaneNetwork type: object type: object type: object