Skip to content

Commit

Permalink
Merge pull request #284 from fmount/topologyref
Browse files Browse the repository at this point in the history 
Consume Topology CR by reference
  • Loading branch information
@openshift-merge-bot
openshift-merge-bot[bot] authored Feb 14, 2025
2 parents 0aa0912 + 34408a1 commit 7fc73e6
Show file tree
Hide file tree
Showing 53 changed files with 1,907 additions and 98 deletions.
3 changes: 3 additions & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ endif
SHELL = /usr/bin/env bash -o pipefail
.SHELLFLAGS = -ec

PROCS?=$(shell expr $(shell nproc --ignore 2) / 4)
PROC_CMD = --procs ${PROCS}

DOCKER_BUILD_ARGS ?=

.PHONY: all
Expand Down
20 changes: 20 additions & 0 deletions api/bases/designate.openstack.org_designateapis.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,23 @@ spec:
bundle file
type: string
type: object
topologyRef:
description: |-
TopologyRef to apply the Topology defined by the associated CR referenced
by name
properties:
name:
description: Name - The Topology CR name that the Service references
type: string
namespace:
description: |-
Namespace - The Namespace to fetch the Topology CR referenced
NOTE: Namespace currently points by default to the same namespace where
the Service is deployed. Customizing the namespace is not supported and
webhooks prevent editing this field to a value different from the
current project
type: string
type: object
transportURLSecret:
description: Secret containing RabbitMq transport URL
type: string
Expand Down Expand Up @@ -460,6 +477,9 @@ spec:
type: string
description: Map of hashes to track e.g. job status
type: object
lastAppliedTopology:
description: LastAppliedTopology - the last applied Topology
type: string
networkAttachments:
additionalProperties:
items:
Expand Down
20 changes: 20 additions & 0 deletions api/bases/designate.openstack.org_designatebackendbind9s.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,23 @@ spec:
storageRequest:
description: StorageRequest
type: string
topologyRef:
description: |-
TopologyRef to apply the Topology defined by the associated CR referenced
by name
properties:
name:
description: Name - The Topology CR name that the Service references
type: string
namespace:
description: |-
Namespace - The Namespace to fetch the Topology CR referenced
NOTE: Namespace currently points by default to the same namespace where
the Service is deployed. Customizing the namespace is not supported and
webhooks prevent editing this field to a value different from the
current project
type: string
type: object
transportURLSecret:
description: Secret containing RabbitMq transport URL
type: string
Expand Down Expand Up @@ -277,6 +294,9 @@ spec:
type: string
description: Map of hashes to track e.g. job status
type: object
lastAppliedTopology:
description: LastAppliedTopology - the last applied Topology
type: string
networkAttachments:
additionalProperties:
items:
Expand Down
20 changes: 20 additions & 0 deletions api/bases/designate.openstack.org_designatecentrals.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,23 @@ spec:
bundle file
type: string
type: object
topologyRef:
description: |-
TopologyRef to apply the Topology defined by the associated CR referenced
by name
properties:
name:
description: Name - The Topology CR name that the Service references
type: string
namespace:
description: |-
Namespace - The Namespace to fetch the Topology CR referenced
NOTE: Namespace currently points by default to the same namespace where
the Service is deployed. Customizing the namespace is not supported and
webhooks prevent editing this field to a value different from the
current project
type: string
type: object
transportURLSecret:
description: Secret containing RabbitMq transport URL
type: string
Expand Down Expand Up @@ -276,6 +293,9 @@ spec:
type: string
description: Map of hashes to track e.g. job status
type: object
lastAppliedTopology:
description: LastAppliedTopology - the last applied Topology
type: string
networkAttachments:
additionalProperties:
items:
Expand Down
20 changes: 20 additions & 0 deletions api/bases/designate.openstack.org_designatemdnses.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,23 @@ spec:
bundle file
type: string
type: object
topologyRef:
description: |-
TopologyRef to apply the Topology defined by the associated CR referenced
by name
properties:
name:
description: Name - The Topology CR name that the Service references
type: string
namespace:
description: |-
Namespace - The Namespace to fetch the Topology CR referenced
NOTE: Namespace currently points by default to the same namespace where
the Service is deployed. Customizing the namespace is not supported and
webhooks prevent editing this field to a value different from the
current project
type: string
type: object
transportURLSecret:
description: Secret containing RabbitMq transport URL
type: string
Expand Down Expand Up @@ -283,6 +300,9 @@ spec:
type: string
description: Map of hashes to track e.g. job status
type: object
lastAppliedTopology:
description: LastAppliedTopology - the last applied Topology
type: string
networkAttachments:
additionalProperties:
items:
Expand Down
20 changes: 20 additions & 0 deletions api/bases/designate.openstack.org_designateproducers.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,23 @@ spec:
bundle file
type: string
type: object
topologyRef:
description: |-
TopologyRef to apply the Topology defined by the associated CR referenced
by name
properties:
name:
description: Name - The Topology CR name that the Service references
type: string
namespace:
description: |-
Namespace - The Namespace to fetch the Topology CR referenced
NOTE: Namespace currently points by default to the same namespace where
the Service is deployed. Customizing the namespace is not supported and
webhooks prevent editing this field to a value different from the
current project
type: string
type: object
transportURLSecret:
description: Secret containing RabbitMq transport URL
type: string
Expand Down Expand Up @@ -275,6 +292,9 @@ spec:
type: string
description: Map of hashes to track e.g. job status
type: object
lastAppliedTopology:
description: LastAppliedTopology - the last applied Topology
type: string
networkAttachments:
additionalProperties:
items:
Expand Down
143 changes: 143 additions & 0 deletions api/bases/designate.openstack.org_designates.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,24 @@ spec:
a pre-created bundle file
type: string
type: object
topologyRef:
description: |-
TopologyRef to apply the Topology defined by the associated CR referenced
by name
properties:
name:
description: Name - The Topology CR name that the Service
references
type: string
namespace:
description: |-
Namespace - The Namespace to fetch the Topology CR referenced
NOTE: Namespace currently points by default to the same namespace where
the Service is deployed. Customizing the namespace is not supported and
webhooks prevent editing this field to a value different from the
current project
type: string
type: object
transportURLSecret:
description: Secret containing RabbitMq transport URL
type: string
Expand Down Expand Up @@ -626,6 +644,24 @@ spec:
storageRequest:
description: StorageRequest
type: string
topologyRef:
description: |-
TopologyRef to apply the Topology defined by the associated CR referenced
by name
properties:
name:
description: Name - The Topology CR name that the Service
references
type: string
namespace:
description: |-
Namespace - The Namespace to fetch the Topology CR referenced
NOTE: Namespace currently points by default to the same namespace where
the Service is deployed. Customizing the namespace is not supported and
webhooks prevent editing this field to a value different from the
current project
type: string
type: object
transportURLSecret:
description: Secret containing RabbitMq transport URL
type: string
Expand Down Expand Up @@ -803,6 +839,24 @@ spec:
a pre-created bundle file
type: string
type: object
topologyRef:
description: |-
TopologyRef to apply the Topology defined by the associated CR referenced
by name
properties:
name:
description: Name - The Topology CR name that the Service
references
type: string
namespace:
description: |-
Namespace - The Namespace to fetch the Topology CR referenced
NOTE: Namespace currently points by default to the same namespace where
the Service is deployed. Customizing the namespace is not supported and
webhooks prevent editing this field to a value different from the
current project
type: string
type: object
transportURLSecret:
description: Secret containing RabbitMq transport URL
type: string
Expand Down Expand Up @@ -982,6 +1036,24 @@ spec:
a pre-created bundle file
type: string
type: object
topologyRef:
description: |-
TopologyRef to apply the Topology defined by the associated CR referenced
by name
properties:
name:
description: Name - The Topology CR name that the Service
references
type: string
namespace:
description: |-
Namespace - The Namespace to fetch the Topology CR referenced
NOTE: Namespace currently points by default to the same namespace where
the Service is deployed. Customizing the namespace is not supported and
webhooks prevent editing this field to a value different from the
current project
type: string
type: object
transportURLSecret:
description: Secret containing RabbitMq transport URL
type: string
Expand Down Expand Up @@ -1164,6 +1236,24 @@ spec:
a pre-created bundle file
type: string
type: object
topologyRef:
description: |-
TopologyRef to apply the Topology defined by the associated CR referenced
by name
properties:
name:
description: Name - The Topology CR name that the Service
references
type: string
namespace:
description: |-
Namespace - The Namespace to fetch the Topology CR referenced
NOTE: Namespace currently points by default to the same namespace where
the Service is deployed. Customizing the namespace is not supported and
webhooks prevent editing this field to a value different from the
current project
type: string
type: object
transportURLSecret:
description: Secret containing RabbitMq transport URL
type: string
Expand Down Expand Up @@ -1281,6 +1371,24 @@ spec:
description: ServiceAccount - service account name used internally
to provide Designate services the default SA name
type: string
topologyRef:
description: |-
TopologyRef to apply the Topology defined by the associated CR referenced
by name
properties:
name:
description: Name - The Topology CR name that the Service
references
type: string
namespace:
description: |-
Namespace - The Namespace to fetch the Topology CR referenced
NOTE: Namespace currently points by default to the same namespace where
the Service is deployed. Customizing the namespace is not supported and
webhooks prevent editing this field to a value different from the
current project
type: string
type: object
required:
- containerImage
type: object
Expand Down Expand Up @@ -1449,6 +1557,24 @@ spec:
a pre-created bundle file
type: string
type: object
topologyRef:
description: |-
TopologyRef to apply the Topology defined by the associated CR referenced
by name
properties:
name:
description: Name - The Topology CR name that the Service
references
type: string
namespace:
description: |-
Namespace - The Namespace to fetch the Topology CR referenced
NOTE: Namespace currently points by default to the same namespace where
the Service is deployed. Customizing the namespace is not supported and
webhooks prevent editing this field to a value different from the
current project
type: string
type: object
transportURLSecret:
description: Secret containing RabbitMq transport URL
type: string
Expand Down Expand Up @@ -1555,6 +1681,23 @@ spec:
description: ServiceUser - optional username used for this service
to register in designate
type: string
topologyRef:
description: |-
TopologyRef to apply the Topology defined by the associated CR referenced
by name
properties:
name:
description: Name - The Topology CR name that the Service references
type: string
namespace:
description: |-
Namespace - The Namespace to fetch the Topology CR referenced
NOTE: Namespace currently points by default to the same namespace where
the Service is deployed. Customizing the namespace is not supported and
webhooks prevent editing this field to a value different from the
current project
type: string
type: object
required:
- databaseInstance
- designateAPI
Expand Down
Loading

0 comments on commit 7fc73e6

Please sign in to comment.