Skip to content
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

Jump to bottom

Set ProviderConfig as Secret owner reference #123

Closed
wants to merge 2 commits into from
Closed

Set ProviderConfig as Secret owner reference #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c568ca
Add separate Secret for each ProviderConfig
nolancon Dec 15, 2023
96c6e54
Set ProviderConfig as Secret Owner Reference
nolancon Dec 15, 2023
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
22 changes: 21 additions & 1 deletion e2e/localstack/localstack-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,27 @@ apiVersion: v1
kind: Secret
metadata:
namespace: crossplane-system
name: localstack
name: localstack-a
type: Opaque
data:
access_key: "RHVtbXk="
secret_key: "RHVtbXk="
---
apiVersion: v1
kind: Secret
metadata:
namespace: crossplane-system
name: localstack-b
type: Opaque
data:
access_key: "RHVtbXk="
secret_key: "RHVtbXk="
---
apiVersion: v1
kind: Secret
metadata:
namespace: crossplane-system
name: localstack-c
type: Opaque
data:
access_key: "RHVtbXk="
Expand Down
6 changes: 3 additions & 3 deletions e2e/localstack/localstack-provider-cfg.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
source: Secret
secretRef:
namespace: crossplane-system
name: localstack
name: localstack-a
key: credentials
disableHealthCheck: false
healthCheckIntervalSeconds: 5
Expand All @@ -23,7 +23,7 @@ spec:
source: Secret
secretRef:
namespace: crossplane-system
name: localstack
name: localstack-b
key: credentials
disableHealthCheck: false
healthCheckIntervalSeconds: 5
Expand All @@ -38,7 +38,7 @@ spec:
source: Secret
secretRef:
namespace: crossplane-system
name: localstack
name: localstack-c
key: credentials
disableHealthCheck: false
healthCheckIntervalSeconds: 5
3 changes: 3 additions & 0 deletions internal/controller/providerconfig/backendmonitor/backendmonitor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ import (
"github.com/crossplane/crossplane-runtime/pkg/reconciler/providerconfig"
apisv1alpha1 "github.com/linode/provider-ceph/apis/v1alpha1"
"github.com/linode/provider-ceph/internal/backendstore"
corev1 "k8s.io/api/core/v1"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/handler"
)

type Controller struct {
Expand Down Expand Up @@ -54,5 +56,6 @@ func WithS3Timeout(t time.Duration) func(*Controller) {
func (c *Controller) SetupWithManager(mgr ctrl.Manager) error {
return ctrl.NewControllerManagedBy(mgr).
For(&apisv1alpha1.ProviderConfig{}).
Watches(&corev1.Secret{}, &handler.EnqueueRequestForObject{}).
Complete(c)
}
21 changes: 19 additions & 2 deletions internal/controller/providerconfig/backendmonitor/backendmonitor_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,14 @@ import (

v1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
"github.com/crossplane/crossplane-runtime/pkg/errors"
"github.com/crossplane/crossplane-runtime/pkg/meta"

"go.opentelemetry.io/otel"
corev1 "k8s.io/api/core/v1"

kerrors "k8s.io/apimachinery/pkg/api/errors"
apimachinerymetav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"k8s.io/apimachinery/pkg/types"
ctrl "sigs.k8s.io/controller-runtime"

Expand All @@ -35,10 +39,12 @@ import (
)

const (
errCreateS3Client = "failed create s3 client"
errCreateSTSClient = "failed create sts client"
errCreateS3Client = "failed to create s3 client"
errCreateSTSClient = "failed to create sts client"
errAddCtrlRef = "failed to add controller reference"
errGetProviderConfig = "failed to get ProviderConfig"
errGetSecret = "failed to get Secret"
errUpdateSecret = "failed to update Secret"
)

func (c *Controller) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
Expand Down Expand Up @@ -87,6 +93,17 @@ func (c *Controller) addOrUpdateBackend(ctx context.Context, pc *apisv1alpha1.Pr
return errors.Wrap(err, errCreateSTSClient)
}

// Set the ProviderConfig as an owner of the Secret so that any change to the Secret
// will trigger a reconcile of the ProviderConfig. This ensures new clients will
// be created if the Secret's data (SK/AK pair) are changed.
if !apimachinerymetav1.IsControlledBy(secret, pc) {
if err := meta.AddControllerReference(secret, meta.AsController(meta.TypedReferenceTo(pc, pc.GroupVersionKind()))); err != nil {
return errors.Wrap(err, errAddCtrlRef)
}
if err := c.kubeClient.Update(ctx, secret); err != nil {
return errors.Wrap(err, errUpdateSecret)
}
}
readyCondition := pc.Status.GetCondition(v1.TypeReady)
c.backendStore.AddOrUpdateBackend(pc.Name, s3Client, stsClient, true, utils.MapConditionToHealthStatus(readyCondition))

Expand Down
Loading