Skip to content

Use envFrom for Wal-G-Exporter #595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Use envFrom for Wal-G-Exporter #595

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b87a7cd
Revert "Change UID and SCOPE for wal-g-exporter Pod (#594)"
eberlep Apr 24, 2025
1f1b570
Change uid and scope
eberlep Apr 23, 2025
d2fcd96
Read complete configMap and secret, specifically set SCOPE
eberlep Apr 24, 2025
399bf03
Fix order
eberlep Apr 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 31 additions & 66 deletions controllers/postgres_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,14 +249,8 @@ func (r *PostgresReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
log.V(debugLogLevel).Info("finalizer added")
}

backupConfig, err := r.getBackupConfig(ctx, instance.Namespace, instance.Spec.BackupSecretRef)
if err != nil {
r.recorder.Eventf(instance, "Warning", "Self-Reconciliation", "failed to fetch backupConfig: %v", err)
return ctrl.Result{}, fmt.Errorf("failed to fetch backupConfig: %w", err)
}

// Check if zalando dependencies are installed. If not, install them.
if err := r.ensureZalandoDependencies(log, ctx, instance, backupConfig); err != nil {
if err := r.ensureZalandoDependencies(log, ctx, instance); err != nil {
r.recorder.Eventf(instance, "Warning", "Error", "failed to install operator: %v", err)
return ctrl.Result{}, fmt.Errorf("error while ensuring Zalando dependencies: %w", err)
}
Expand Down Expand Up @@ -312,7 +306,7 @@ func (r *PostgresReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
}

// Add service monitor for our exporter sidecar
err = r.createOrUpdateExporterSidecarServiceMonitor(log, ctx, namespace, instance)
err := r.createOrUpdateExporterSidecarServiceMonitor(log, ctx, namespace, instance)
if err != nil {
return ctrl.Result{}, fmt.Errorf("error while creating sidecars servicemonitor %v: %w", namespace, err)
}
Expand Down Expand Up @@ -345,7 +339,7 @@ func (r *PostgresReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
}

if r.EnableWalGExporter {
if err := r.createOrUpdateWalGExporterDeployment(log, ctx, namespace, instance, backupConfig); err != nil {
if err := r.createOrUpdateWalGExporterDeployment(log, ctx, namespace, instance); err != nil {
r.recorder.Eventf(instance, "Warning", "Error", "failed to deploy wal-g-exporter: %v", err)
return ctrl.Result{}, fmt.Errorf("error while deploying wal-g-exporter %v: %w", namespace, err)
}
Expand Down Expand Up @@ -483,7 +477,7 @@ func (r *PostgresReconciler) deleteUserPasswordsSecret(ctx context.Context, inst
}

// ensureZalandoDependencies makes sure Zalando resources are installed in the service-cluster.
func (r *PostgresReconciler) ensureZalandoDependencies(log logr.Logger, ctx context.Context, p *pg.Postgres, b *pg.BackupConfig) error {
func (r *PostgresReconciler) ensureZalandoDependencies(log logr.Logger, ctx context.Context, p *pg.Postgres) error {
namespace := p.ToPeripheralResourceNamespace()
isInstalled, err := r.OperatorManager.IsOperatorInstalled(ctx, namespace)
if err != nil {
Expand All @@ -496,7 +490,7 @@ func (r *PostgresReconciler) ensureZalandoDependencies(log logr.Logger, ctx cont
}
}

if err := r.updatePodEnvironmentConfigMap(log, ctx, p, b); err != nil {
if err := r.updatePodEnvironmentConfigMap(log, ctx, p); err != nil {
return fmt.Errorf("error while updating backup config: %w", err)
}

Expand All @@ -507,13 +501,18 @@ func (r *PostgresReconciler) ensureZalandoDependencies(log logr.Logger, ctx cont
return nil
}

func (r *PostgresReconciler) updatePodEnvironmentConfigMap(log logr.Logger, ctx context.Context, p *pg.Postgres, b *pg.BackupConfig) error {
if b == nil {
log.Info("No backupConfig found, skipping configuration of postgres backup")
func (r *PostgresReconciler) updatePodEnvironmentConfigMap(log logr.Logger, ctx context.Context, p *pg.Postgres) error {
if p.Spec.BackupSecretRef == "" {
log.Info("No configured backupSecretRef found, skipping configuration of postgres backup")
return nil
}

s3url, err := url.Parse(b.S3Endpoint)
backupConfig, err := r.getBackupConfig(ctx, p.Namespace, p.Spec.BackupSecretRef)
if err != nil {
return err
}

s3url, err := url.Parse(backupConfig.S3Endpoint)
if err != nil {
return fmt.Errorf("error while parsing the s3 endpoint url in the backup secret: %w", err)
}
Expand All @@ -524,7 +523,7 @@ func (r *PostgresReconciler) updatePodEnvironmentConfigMap(log logr.Logger, ctx
// use the modified s3 endpoint
walES3Endpoint := s3url.String()
// region
region := b.S3Region
region := backupConfig.S3Region

// set the WALG_UPLOAD_DISK_CONCURRENCY based on the configured cpu limits
q, err := resource.ParseQuantity(p.Spec.Size.CPU)
Expand All @@ -541,9 +540,9 @@ func (r *PostgresReconciler) updatePodEnvironmentConfigMap(log logr.Logger, ctx
downloadConcurrency := "32"

// use the rest as provided in the secret
bucketName := b.S3BucketName
backupSchedule := b.Schedule
backupNumToRetain := b.Retention
bucketName := backupConfig.S3BucketName
backupSchedule := backupConfig.Schedule
backupNumToRetain := backupConfig.Retention

// s3 server side encryption SSE is disabled
// we use client side encryption
Expand Down Expand Up @@ -2030,12 +2029,7 @@ func (r *PostgresReconciler) createOrUpdateCertificate(log logr.Logger, ctx cont
}

// createOrUpdateWalGExporterDeployment ensures the deployment for the wal-g-exporter
func (r *PostgresReconciler) createOrUpdateWalGExporterDeployment(log logr.Logger, ctx context.Context, namespace string, instance *pg.Postgres, b *pg.BackupConfig) error {
if b == nil {
log.Info("No backupConfig found, skipping configuration of wa-l-exporter")
return nil
}

func (r *PostgresReconciler) createOrUpdateWalGExporterDeployment(log logr.Logger, ctx context.Context, namespace string, instance *pg.Postgres) error {
labels := map[string]string{
"app.kubernetes.io/name": walGExporterName,
pg.UIDLabelName: string(instance.UID),
Expand All @@ -2050,9 +2044,8 @@ func (r *PostgresReconciler) createOrUpdateWalGExporterDeployment(log logr.Logge
matchLabels := labels

var replicas int32 = 1

var uid int64 = 65534
var gid int64 = 65534
var uid int64 = 65534 // nobody
var gid int64 = 65534 // nobody

deploy := &appsv1.Deployment{
ObjectMeta: metav1.ObjectMeta{
Expand Down Expand Up @@ -2106,53 +2099,25 @@ func (r *PostgresReconciler) createOrUpdateWalGExporterDeployment(log logr.Logge
},
},
{
Name: "AWS_ACCESS_KEY_ID",
ValueFrom: &corev1.EnvVarSource{
SecretKeyRef: &corev1.SecretKeySelector{
Key: "AWS_ACCESS_KEY_ID",
LocalObjectReference: corev1.LocalObjectReference{
Name: operatormanager.PodEnvSecretName,
},
},
},
},
{
Name: "AWS_SECRET_ACCESS_KEY",
ValueFrom: &corev1.EnvVarSource{
SecretKeyRef: &corev1.SecretKeySelector{
Key: "AWS_SECRET_ACCESS_KEY",
LocalObjectReference: corev1.LocalObjectReference{
Name: operatormanager.PodEnvSecretName,
},
},
},
Name: "SCOPE",
Value: instance.ToPeripheralResourceName(),
},
},
EnvFrom: []corev1.EnvFromSource{
{
Name: "AWS_ENDPOINT",
ValueFrom: &corev1.EnvVarSource{
ConfigMapKeyRef: &corev1.ConfigMapKeySelector{
Key: "AWS_ENDPOINT",
LocalObjectReference: corev1.LocalObjectReference{
Name: operatormanager.PodEnvCMName,
},
ConfigMapRef: &corev1.ConfigMapEnvSource{
LocalObjectReference: corev1.LocalObjectReference{
Name: operatormanager.PodEnvCMName,
},
},
},
{
Name: "AWS_S3_FORCE_PATH_STYLE",
ValueFrom: &corev1.EnvVarSource{
ConfigMapKeyRef: &corev1.ConfigMapKeySelector{
Key: "AWS_S3_FORCE_PATH_STYLE",
LocalObjectReference: corev1.LocalObjectReference{
Name: operatormanager.PodEnvCMName,
},
SecretRef: &corev1.SecretEnvSource{
LocalObjectReference: corev1.LocalObjectReference{
Name: operatormanager.PodEnvSecretName,
},
},
},
{
Name: "WALG_S3_PREFIX",
Value: "s3://" + b.S3BucketName + "/" + instance.ToPeripheralResourceName(),
},
},
Image: r.WalGExporterImage,
Name: walGExporterName,
Expand Down
Loading