Skip to content

Commit 5612e00

Browse files
committed
debug an fix issues
1 parent 8f75403 commit 5612e00

3 files changed

Lines changed: 30 additions & 7 deletions

File tree

pkg/apis/cpo.opensource.cybertec.at/v1/crds.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1444,6 +1444,18 @@ var PostgresCRDResourceValidation = apiextv1.CustomResourceValidation{
14441444
"enable": {
14451445
Type: "boolean",
14461446
},
1447+
"keybits": {
1448+
Type: "integer",
1449+
Format: "int32",
1450+
Enum: []apiextv1.JSON{
1451+
{Raw: []byte("128")},
1452+
{Raw: []byte("192")},
1453+
{Raw: []byte("256")},
1454+
},
1455+
Default: &apiextv1.JSON{
1456+
Raw: []byte("128"),
1457+
},
1458+
},
14471459
},
14481460
},
14491461
"monitor": {

pkg/apis/cpo.opensource.cybertec.at/v1/zz_generated.deepcopy.go

Lines changed: 6 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/cluster/sync.go

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1684,14 +1684,16 @@ func (c *Cluster) syncPgbackrestJob(forceRemove bool) error {
16841684
func (c *Cluster) createTDESecret() error {
16851685
c.logger.Info("creating TDE secret")
16861686
c.setProcessName("creating TDE secret")
1687-
var bits int32 = 256
1687+
1688+
var bits int32 = 128
16881689
ptr := c.Postgresql.Spec.TDE.Keybits
16891690
if ptr != nil {
16901691
val := *ptr
1691-
if val == 128 || val == 192 {
1692+
if val == 256 || val == 192 {
16921693
bits = val
16931694
}
16941695
}
1696+
16951697
generatedKey := make([]byte, (bits / 8))
16961698
rand.Read(generatedKey)
16971699

@@ -1706,15 +1708,19 @@ func (c *Cluster) createTDESecret() error {
17061708
},
17071709
}
17081710
secret, err := c.KubeClient.Secrets(generatedSecret.Namespace).Create(context.TODO(), &generatedSecret, metav1.CreateOptions{})
1711+
17091712
if err == nil {
17101713
c.Secrets[secret.UID] = secret
17111714
c.logger.Debugf("created new secret %s, namespace: %s, uid: %s", util.NameFromMeta(secret.ObjectMeta), generatedSecret.Namespace, secret.UID)
1712-
}
1713-
if k8sutil.ResourceAlreadyExists(err) {
1714-
c.logger.Warningf("TDE secret already exists, skip key generation and use existing one.")
17151715
} else {
1716-
return fmt.Errorf("could not create secret for TDE %s: in namespace %s: %v", util.NameFromMeta(secret.ObjectMeta), generatedSecret.Namespace, err)
1716+
1717+
if k8sutil.ResourceAlreadyExists(err) {
1718+
c.logger.Warningf("TDE secret already exists, skip key generation and use existing one.")
1719+
} else {
1720+
return fmt.Errorf("could not create secret for TDE %s: in namespace %s: %v", generatedSecret.Name, generatedSecret.Namespace, err)
1721+
}
17171722
}
1723+
17181724
return nil
17191725
}
17201726

0 commit comments

Comments
 (0)