mirror of
https://github.com/cloudnative-pg/plugin-barman-cloud.git
synced 2026-01-11 21:23:12 +01:00
Merge 2cb76ef622 into 0153abba82
This commit is contained in:
commit
ea69e41d63
@ -15,6 +15,7 @@ RUN go mod download
|
|||||||
COPY ../cmd/manager/main.go cmd/manager/main.go
|
COPY ../cmd/manager/main.go cmd/manager/main.go
|
||||||
COPY ../api/ api/
|
COPY ../api/ api/
|
||||||
COPY ../internal/ internal/
|
COPY ../internal/ internal/
|
||||||
|
COPY ../pkg/ pkg/
|
||||||
|
|
||||||
ENV GOCACHE=/root/.cache/go-build
|
ENV GOCACHE=/root/.cache/go-build
|
||||||
ENV GOMODCACHE=/go/pkg/mod
|
ENV GOMODCACHE=/go/pkg/mod
|
||||||
|
|||||||
@ -24,6 +24,7 @@ ENV GOMODCACHE=/go/pkg/mod
|
|||||||
COPY ../cmd/manager/main.go cmd/manager/main.go
|
COPY ../cmd/manager/main.go cmd/manager/main.go
|
||||||
COPY ../api/ api/
|
COPY ../api/ api/
|
||||||
COPY ../internal/ internal/
|
COPY ../internal/ internal/
|
||||||
|
COPY ../pkg/ pkg/
|
||||||
|
|
||||||
# Build
|
# Build
|
||||||
# the GOARCH has not a default value to allow the binary be built according to the host where the command
|
# the GOARCH has not a default value to allow the binary be built according to the host where the command
|
||||||
|
|||||||
@ -20,13 +20,17 @@ SPDX-License-Identifier: Apache-2.0
|
|||||||
package common
|
package common
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"path"
|
"path"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
barmanapi "github.com/cloudnative-pg/barman-cloud/pkg/api"
|
barmanapi "github.com/cloudnative-pg/barman-cloud/pkg/api"
|
||||||
|
"github.com/cloudnative-pg/barman-cloud/pkg/command"
|
||||||
|
|
||||||
|
apiv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1"
|
||||||
"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata"
|
"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata"
|
||||||
|
pluginmetadata "github.com/cloudnative-pg/plugin-barman-cloud/pkg/metadata"
|
||||||
)
|
)
|
||||||
|
|
||||||
// TODO: refactor.
|
// TODO: refactor.
|
||||||
@ -97,3 +101,14 @@ func MergeEnv(env []string, incomingEnv []string) []string {
|
|||||||
func BuildCertificateFilePath(objectStoreName string) string {
|
func BuildCertificateFilePath(objectStoreName string) string {
|
||||||
return path.Join(metadata.BarmanCertificatesPath, objectStoreName, metadata.BarmanCertificatesFileName)
|
return path.Join(metadata.BarmanCertificatesPath, objectStoreName, metadata.BarmanCertificatesFileName)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ContextWithProviderOptions enriches the context with cloud service provider specific options
|
||||||
|
// based on the ObjectStore resource
|
||||||
|
func ContextWithProviderOptions(ctx context.Context, objectStore apiv1.ObjectStore) context.Context {
|
||||||
|
if objectStore.GetAnnotations()[pluginmetadata.UseDefaultAzureCredentialAnnotationName] ==
|
||||||
|
pluginmetadata.UseDefaultAzureCredentialTrueValue {
|
||||||
|
return command.ContextWithDefaultAzureCredentials(ctx, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
return ctx
|
||||||
|
}
|
||||||
|
|||||||
@ -127,6 +127,8 @@ func (w WALServiceImplementation) Archive(
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ctx = ContextWithProviderOptions(ctx, objectStore)
|
||||||
|
|
||||||
envArchive, err := barmanCredentials.EnvSetCloudCredentialsAndCertificates(
|
envArchive, err := barmanCredentials.EnvSetCloudCredentialsAndCertificates(
|
||||||
ctx,
|
ctx,
|
||||||
w.Client,
|
w.Client,
|
||||||
|
|||||||
@ -87,6 +87,8 @@ func (b BackupServiceImplementation) Backup(
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ctx = common.ContextWithProviderOptions(ctx, objectStore)
|
||||||
|
|
||||||
if err := fileutils.EnsureDirectoryExists(postgres.BackupTemporaryDirectory); err != nil {
|
if err := fileutils.EnsureDirectoryExists(postgres.BackupTemporaryDirectory); err != nil {
|
||||||
contextLogger.Error(err, "Cannot create backup temporary directory", "err", err)
|
contextLogger.Error(err, "Cannot create backup temporary directory", "err", err)
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|||||||
@ -93,6 +93,8 @@ func (c *CatalogMaintenanceRunnable) cycle(ctx context.Context) (time.Duration,
|
|||||||
return 0, err
|
return 0, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ctx = common.ContextWithProviderOptions(ctx, barmanObjectStore)
|
||||||
|
|
||||||
if err := c.maintenance(ctx, &cluster, &barmanObjectStore); err != nil {
|
if err := c.maintenance(ctx, &cluster, &barmanObjectStore); err != nil {
|
||||||
return 0, err
|
return 0, err
|
||||||
}
|
}
|
||||||
|
|||||||
@ -109,7 +109,7 @@ func (impl JobHookImpl) Restore(
|
|||||||
}
|
}
|
||||||
|
|
||||||
if err := impl.checkBackupDestination(
|
if err := impl.checkBackupDestination(
|
||||||
ctx,
|
common.ContextWithProviderOptions(ctx, targetObjectStore),
|
||||||
configuration.Cluster,
|
configuration.Cluster,
|
||||||
&targetObjectStore.Spec.Configuration,
|
&targetObjectStore.Spec.Configuration,
|
||||||
targetObjectStore.Name,
|
targetObjectStore.Name,
|
||||||
@ -118,6 +118,8 @@ func (impl JobHookImpl) Restore(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ctx = common.ContextWithProviderOptions(ctx, recoveryObjectStore)
|
||||||
|
|
||||||
// Detect the backup to recover
|
// Detect the backup to recover
|
||||||
backup, env, err := loadBackupObjectFromExternalCluster(
|
backup, env, err := loadBackupObjectFromExternalCluster(
|
||||||
ctx,
|
ctx,
|
||||||
|
|||||||
2
pkg/metadata/doc.go
Normal file
2
pkg/metadata/doc.go
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
// Package metadata provides metadata utilities for the Barman Cloud plugin
|
||||||
|
package metadata
|
||||||
15
pkg/metadata/labels_annotations.go
Normal file
15
pkg/metadata/labels_annotations.go
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
package metadata
|
||||||
|
|
||||||
|
// MetadataNamespace is the namespace used for the Barman Cloud plugin metadata
|
||||||
|
const MetadataNamespace = "barmancloud.cnpg.io"
|
||||||
|
|
||||||
|
const (
|
||||||
|
// UseDefaultAzureCredentialAnnotationName is an annotation that can be set
|
||||||
|
// on an ObjectStore resource to enable the authentication to Azure via DefaultAzureCredential.
|
||||||
|
// This is meant to be used with inheritFromAzureAD enabled.
|
||||||
|
UseDefaultAzureCredentialAnnotationName = MetadataNamespace + "/useDefaultAzureCredential"
|
||||||
|
|
||||||
|
// UseDefaultAzureCredentialTrueValue is the value for the annotation
|
||||||
|
// barmancloud.cnpg.io/useDefaultAzureCredential to enable the DefaultAzureCredentials auth mechanism.
|
||||||
|
UseDefaultAzureCredentialTrueValue = "true"
|
||||||
|
)
|
||||||
@ -233,6 +233,7 @@ Barman Cloud supports the following authentication methods:
|
|||||||
- Storage Account Name + [Access Key](https://learn.microsoft.com/en-us/azure/storage/common/storage-account-keys-manage)
|
- Storage Account Name + [Access Key](https://learn.microsoft.com/en-us/azure/storage/common/storage-account-keys-manage)
|
||||||
- Storage Account Name + [SAS Token](https://learn.microsoft.com/en-us/azure/storage/blobs/sas-service-create)
|
- Storage Account Name + [SAS Token](https://learn.microsoft.com/en-us/azure/storage/blobs/sas-service-create)
|
||||||
- [Azure AD Workload Identity](https://azure.github.io/azure-workload-identity/docs/introduction.html)
|
- [Azure AD Workload Identity](https://azure.github.io/azure-workload-identity/docs/introduction.html)
|
||||||
|
- [DefaultAzureCredential](https://learn.microsoft.com/en-us/azure/developer/go/sdk/authentication/credential-chains#defaultazurecredential-overview)
|
||||||
|
|
||||||
### Azure AD Workload Identity
|
### Azure AD Workload Identity
|
||||||
|
|
||||||
@ -252,6 +253,27 @@ spec:
|
|||||||
[...]
|
[...]
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### DefaultAzureCredential
|
||||||
|
|
||||||
|
To authenticate using `DefaultAzureCredential`, set the annotation
|
||||||
|
`barmancloud.cnpg.io/useDefaultAzureCredential="true"` on the ObjectStore in
|
||||||
|
conjunction with the `.spec.configuration.inheritFromAzureAD` option:
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
apiVersion: barmancloud.cnpg.io/v1
|
||||||
|
kind: ObjectStore
|
||||||
|
metadata:
|
||||||
|
name: azure-store
|
||||||
|
annotations:
|
||||||
|
barmancloud.cnpg.io/useDefaultAzureCredential: "true"
|
||||||
|
spec:
|
||||||
|
configuration:
|
||||||
|
destinationPath: "<destination path here>"
|
||||||
|
azureCredentials:
|
||||||
|
inheritFromAzureAD: true
|
||||||
|
[...]
|
||||||
|
```
|
||||||
|
|
||||||
### Access Key, SAS Token, or Connection String
|
### Access Key, SAS Token, or Connection String
|
||||||
|
|
||||||
Store credentials in a Kubernetes secret:
|
Store credentials in a Kubernetes secret:
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user