public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-01 01:53:18 +02:00
Code Issues Projects Releases Wiki Activity

Move CRD definitions into a formal API to allow access from other controllers. (#378)

Browse Source
This commit is contained in:
Noah Kantrowitz
2018-08-31 11:20:02 +02:00
committed by zerg-junior
parent 25fa45fd58
commit a4224f6063
3 changed files with 57 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/controller/util.go
+3 -29
View File
@@ -47,27 +47,7 @@ func (c *Controller) clusterWorkerID(clusterName spec.NamespacedName) uint32 {
return c.clusterWorkers[clusterName]
}
func (c *Controller) createOperatorCRD(name, kind, plural, short string) error {
subResourceStatus := apiextv1beta1.CustomResourceSubresourceStatus{}
crd := &apiextv1beta1.CustomResourceDefinition{
ObjectMeta: metav1.ObjectMeta{
Name: name,
},
Spec: apiextv1beta1.CustomResourceDefinitionSpec{
Group: acidv1.SchemeGroupVersion.Group,
Version: acidv1.SchemeGroupVersion.Version,
Names: apiextv1beta1.CustomResourceDefinitionNames{
Plural: plural,
ShortNames: []string{short},
Kind: kind,
},
Scope: apiextv1beta1.NamespaceScoped,
Subresources: &apiextv1beta1.CustomResourceSubresources{
Status: &subResourceStatus,
},
},
}
func (c *Controller) createOperatorCRD(crd *apiextv1beta1.CustomResourceDefinition) error {
if _, err := c.KubeClient.CustomResourceDefinitions().Create(crd); err != nil {
if !k8sutil.ResourceAlreadyExists(err) {
return fmt.Errorf("could not create customResourceDefinition: %v", err)
@@ -101,17 +81,11 @@ func (c *Controller) createOperatorCRD(name, kind, plural, short string) error {
}
func (c *Controller) createPostgresCRD() error {
return c.createOperatorCRD(acidv1.PostgresCRDResouceName,
acidv1.PostgresCRDResourceKind,
acidv1.PostgresCRDResourcePlural,
acidv1.PostgresCRDResourceShort)
return c.createOperatorCRD(acidv1.PostgresCRD())
}
func (c *Controller) createConfigurationCRD() error {
return c.createOperatorCRD(acidv1.OperatorConfigCRDResourceName,
acidv1.OperatorConfigCRDResouceKind,
acidv1.OperatorConfigCRDResourcePlural,
acidv1.OperatorConfigCRDResourceShort)
return c.createOperatorCRD(acidv1.ConfigurationCRD())
}
func readDecodedRole(s string) (*spec.PgUser, error) {