Просмотр исходного кода

Renamed secretsink to pushsecret

Co-authored-by: Lilly Daniell <lilly.daniell@engineerbetter.com>
Signed-off-by: Dominic Meddick <dom.meddick@engineerbetter.com>
Dominic Meddick 4 лет назад
Родитель
Сommit
3aab005dfb

+ 5 - 5
apis/externalsecrets/v1alpha1/register.go

@@ -61,15 +61,15 @@ var (
 )
 
 var (
-	SecretSinkKind             = reflect.TypeOf(SecretSink{}).Name()
-	SecretSinkGroupKind        = schema.GroupKind{Group: Group, Kind: SecretSinkKind}.String()
-	SecretSinkKindAPIVersion   = SecretSinkKind + "." + SchemeGroupVersion.String()
-	SecretSinkGroupVersionKind = SchemeGroupVersion.WithKind(SecretSinkKind)
+	PushSecretKind             = reflect.TypeOf(PushSecret{}).Name()
+	PushSecretGroupKind        = schema.GroupKind{Group: Group, Kind: PushSecretKind}.String()
+	PushSecretKindAPIVersion   = PushSecretKind + "." + SchemeGroupVersion.String()
+	PushSecretGroupVersionKind = SchemeGroupVersion.WithKind(PushSecretKind)
 )
 
 func init() {
 	SchemeBuilder.Register(&ExternalSecret{}, &ExternalSecretList{})
 	SchemeBuilder.Register(&SecretStore{}, &SecretStoreList{})
 	SchemeBuilder.Register(&ClusterSecretStore{}, &ClusterSecretStoreList{})
-	SchemeBuilder.Register(&SecretSink{}, &SecretSinkList{})
+	SchemeBuilder.Register(&PushSecret{}, &PushSecretList{})
 }

+ 32 - 32
apis/externalsecrets/v1alpha1/secretsink_types.go

@@ -19,7 +19,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-type SecretSinkStoreRef struct {
+type PushSecretStoreRef struct {
 	// Name of the SecretStore resource
 	Name string `json:"name"`
 
@@ -29,48 +29,48 @@ type SecretSinkStoreRef struct {
 	Kind string `json:"kind,omitempty"`
 }
 
-// SecretSinkSpec configures the behavior of the SecretSink.
-type SecretSinkSpec struct {
-	SecretStoreRefs []SecretSinkStoreRef `json:"secretStoreRefs"`
-	Selector        SecretSinkSelector   `json:"selector"`
-	Data            []SecretSinkData     `json:"data,omitempty"`
+// PushSecretSpec configures the behavior of the PushSecret.
+type PushSecretSpec struct {
+	SecretStoreRefs []PushSecretStoreRef `json:"secretStoreRefs"`
+	Selector        PushSecretSelector   `json:"selector"`
+	Data            []PushSecretData     `json:"data,omitempty"`
 }
 
-type SecretSinkSecret struct {
+type PushSecretSecret struct {
 	Name string `json:"name"`
 }
 
-type SecretSinkSelector struct {
-	Secret SecretSinkSecret `json:"secret"`
+type PushSecretSelector struct {
+	Secret PushSecretSecret `json:"secret"`
 }
 
-type SecretSinkRemoteRefs struct {
+type PushSecretRemoteRefs struct {
 	RemoteKey string `json:"remoteKey"`
 }
 
-func (r SecretSinkRemoteRefs) GetRemoteKey() string {
+func (r PushSecretRemoteRefs) GetRemoteKey() string {
 	return r.RemoteKey
 }
 
-type SecretSinkMatch struct {
+type PushSecretMatch struct {
 	SecretKey  string                 `json:"secretKey"`
-	RemoteRefs []SecretSinkRemoteRefs `json:"remoteRefs"`
+	RemoteRefs []PushSecretRemoteRefs `json:"remoteRefs"`
 }
 
-type SecretSinkData struct {
-	Match []SecretSinkMatch `json:"match"`
+type PushSecretData struct {
+	Match []PushSecretMatch `json:"match"`
 }
 
-// SecretSinkConditionType indicates the condition of the SecretSink.
-type SecretSinkConditionType string
+// PushSecretConditionType indicates the condition of the PushSecret.
+type PushSecretConditionType string
 
 const (
-	SecretSinkReady SecretSinkConditionType = "Ready"
+	PushSecretReady PushSecretConditionType = "Ready"
 )
 
-// SecretSinkStatusCondition indicates the status of the SecretSink.
-type SecretSinkStatusCondition struct {
-	Type   SecretSinkConditionType `json:"type"`
+// PushSecretStatusCondition indicates the status of the PushSecret.
+type PushSecretStatusCondition struct {
+	Type   PushSecretConditionType `json:"type"`
 	Status corev1.ConditionStatus  `json:"status"`
 
 	// +optional
@@ -83,8 +83,8 @@ type SecretSinkStatusCondition struct {
 	LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"`
 }
 
-// SecretSinkStatus indicates the history of the status of SecretSink.
-type SecretSinkStatus struct {
+// PushSecretStatus indicates the history of the status of PushSecret.
+type PushSecretStatus struct {
 	// +nullable
 	// refreshTime is the time and date the external secret was fetched and
 	// the target secret updated
@@ -94,31 +94,31 @@ type SecretSinkStatus struct {
 	SyncedResourceVersion string `json:"syncedResourceVersion,omitempty"`
 
 	// +optional
-	Conditions []SecretSinkStatusCondition `json:"conditions,omitempty"`
+	Conditions []PushSecretStatusCondition `json:"conditions,omitempty"`
 }
 
 // +kubebuilder:object:root=true
 // +kubebuilder:storageversion
-// Secretsinks is the Schema for the secretsinks API.
+// PushSecrets is the Schema for the PushSecrets API.
 // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp"
 // +kubebuilder:printcolumn:name="Status",type=string,JSONPath=`.status.conditions[?(@.type=="Ready")].reason`
 // +kubebuilder:subresource:status
-// +kubebuilder:resource:scope=Namespaced,categories={secretsinks}
+// +kubebuilder:resource:scope=Namespaced,categories={PushSecrets}
 
-type SecretSink struct {
+type PushSecret struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   SecretSinkSpec   `json:"spec,omitempty"`
-	Status SecretSinkStatus `json:"status,omitempty"`
+	Spec   PushSecretSpec   `json:"spec,omitempty"`
+	Status PushSecretStatus `json:"status,omitempty"`
 }
 
 // +kubebuilder:object:root=true
 // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp"
 // +kubebuilder:printcolumn:name="Status",type=string,JSONPath=`.status.conditions[?(@.type=="Ready")].reason`
-// SecretSinkList contains a list of SecretSink resources.
-type SecretSinkList struct {
+// PushSecretList contains a list of PushSecret resources.
+type PushSecretList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []SecretSink `json:"items"`
+	Items           []PushSecret `json:"items"`
 }

+ 52 - 52
apis/externalsecrets/v1alpha1/zz_generated.deepcopy.go

@@ -965,7 +965,7 @@ func (in *OracleSecretRef) DeepCopy() *OracleSecretRef {
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *SecretSink) DeepCopyInto(out *SecretSink) {
+func (in *PushSecret) DeepCopyInto(out *PushSecret) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
@@ -973,18 +973,18 @@ func (in *SecretSink) DeepCopyInto(out *SecretSink) {
 	in.Status.DeepCopyInto(&out.Status)
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SecretSink.
-func (in *SecretSink) DeepCopy() *SecretSink {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PushSecret.
+func (in *PushSecret) DeepCopy() *PushSecret {
 	if in == nil {
 		return nil
 	}
-	out := new(SecretSink)
+	out := new(PushSecret)
 	in.DeepCopyInto(out)
 	return out
 }
 
 // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *SecretSink) DeepCopyObject() runtime.Object {
+func (in *PushSecret) DeepCopyObject() runtime.Object {
 	if c := in.DeepCopy(); c != nil {
 		return c
 	}
@@ -992,53 +992,53 @@ func (in *SecretSink) DeepCopyObject() runtime.Object {
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *SecretSinkData) DeepCopyInto(out *SecretSinkData) {
+func (in *PushSecretData) DeepCopyInto(out *PushSecretData) {
 	*out = *in
 	if in.Match != nil {
 		in, out := &in.Match, &out.Match
-		*out = make([]SecretSinkMatch, len(*in))
+		*out = make([]PushSecretMatch, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SecretSinkData.
-func (in *SecretSinkData) DeepCopy() *SecretSinkData {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PushSecretData.
+func (in *PushSecretData) DeepCopy() *PushSecretData {
 	if in == nil {
 		return nil
 	}
-	out := new(SecretSinkData)
+	out := new(PushSecretData)
 	in.DeepCopyInto(out)
 	return out
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *SecretSinkList) DeepCopyInto(out *SecretSinkList) {
+func (in *PushSecretList) DeepCopyInto(out *PushSecretList) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
 	in.ListMeta.DeepCopyInto(&out.ListMeta)
 	if in.Items != nil {
 		in, out := &in.Items, &out.Items
-		*out = make([]SecretSink, len(*in))
+		*out = make([]PushSecret, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SecretSinkList.
-func (in *SecretSinkList) DeepCopy() *SecretSinkList {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PushSecretList.
+func (in *PushSecretList) DeepCopy() *PushSecretList {
 	if in == nil {
 		return nil
 	}
-	out := new(SecretSinkList)
+	out := new(PushSecretList)
 	in.DeepCopyInto(out)
 	return out
 }
 
 // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *SecretSinkList) DeepCopyObject() runtime.Object {
+func (in *PushSecretList) DeepCopyObject() runtime.Object {
 	if c := in.DeepCopy(); c != nil {
 		return c
 	}
@@ -1046,149 +1046,149 @@ func (in *SecretSinkList) DeepCopyObject() runtime.Object {
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *SecretSinkMatch) DeepCopyInto(out *SecretSinkMatch) {
+func (in *PushSecretMatch) DeepCopyInto(out *PushSecretMatch) {
 	*out = *in
 	if in.RemoteRefs != nil {
 		in, out := &in.RemoteRefs, &out.RemoteRefs
-		*out = make([]SecretSinkRemoteRefs, len(*in))
+		*out = make([]PushSecretRemoteRefs, len(*in))
 		copy(*out, *in)
 	}
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SecretSinkMatch.
-func (in *SecretSinkMatch) DeepCopy() *SecretSinkMatch {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PushSecretMatch.
+func (in *PushSecretMatch) DeepCopy() *PushSecretMatch {
 	if in == nil {
 		return nil
 	}
-	out := new(SecretSinkMatch)
+	out := new(PushSecretMatch)
 	in.DeepCopyInto(out)
 	return out
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *SecretSinkRemoteRefs) DeepCopyInto(out *SecretSinkRemoteRefs) {
+func (in *PushSecretRemoteRefs) DeepCopyInto(out *PushSecretRemoteRefs) {
 	*out = *in
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SecretSinkRemoteRefs.
-func (in *SecretSinkRemoteRefs) DeepCopy() *SecretSinkRemoteRefs {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PushSecretRemoteRefs.
+func (in *PushSecretRemoteRefs) DeepCopy() *PushSecretRemoteRefs {
 	if in == nil {
 		return nil
 	}
-	out := new(SecretSinkRemoteRefs)
+	out := new(PushSecretRemoteRefs)
 	in.DeepCopyInto(out)
 	return out
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *SecretSinkSecret) DeepCopyInto(out *SecretSinkSecret) {
+func (in *PushSecretSecret) DeepCopyInto(out *PushSecretSecret) {
 	*out = *in
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SecretSinkSecret.
-func (in *SecretSinkSecret) DeepCopy() *SecretSinkSecret {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PushSecretSecret.
+func (in *PushSecretSecret) DeepCopy() *PushSecretSecret {
 	if in == nil {
 		return nil
 	}
-	out := new(SecretSinkSecret)
+	out := new(PushSecretSecret)
 	in.DeepCopyInto(out)
 	return out
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *SecretSinkSelector) DeepCopyInto(out *SecretSinkSelector) {
+func (in *PushSecretSelector) DeepCopyInto(out *PushSecretSelector) {
 	*out = *in
 	out.Secret = in.Secret
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SecretSinkSelector.
-func (in *SecretSinkSelector) DeepCopy() *SecretSinkSelector {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PushSecretSelector.
+func (in *PushSecretSelector) DeepCopy() *PushSecretSelector {
 	if in == nil {
 		return nil
 	}
-	out := new(SecretSinkSelector)
+	out := new(PushSecretSelector)
 	in.DeepCopyInto(out)
 	return out
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *SecretSinkSpec) DeepCopyInto(out *SecretSinkSpec) {
+func (in *PushSecretSpec) DeepCopyInto(out *PushSecretSpec) {
 	*out = *in
 	if in.SecretStoreRefs != nil {
 		in, out := &in.SecretStoreRefs, &out.SecretStoreRefs
-		*out = make([]SecretSinkStoreRef, len(*in))
+		*out = make([]PushSecretStoreRef, len(*in))
 		copy(*out, *in)
 	}
 	out.Selector = in.Selector
 	if in.Data != nil {
 		in, out := &in.Data, &out.Data
-		*out = make([]SecretSinkData, len(*in))
+		*out = make([]PushSecretData, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SecretSinkSpec.
-func (in *SecretSinkSpec) DeepCopy() *SecretSinkSpec {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PushSecretSpec.
+func (in *PushSecretSpec) DeepCopy() *PushSecretSpec {
 	if in == nil {
 		return nil
 	}
-	out := new(SecretSinkSpec)
+	out := new(PushSecretSpec)
 	in.DeepCopyInto(out)
 	return out
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *SecretSinkStatus) DeepCopyInto(out *SecretSinkStatus) {
+func (in *PushSecretStatus) DeepCopyInto(out *PushSecretStatus) {
 	*out = *in
 	in.RefreshTime.DeepCopyInto(&out.RefreshTime)
 	if in.Conditions != nil {
 		in, out := &in.Conditions, &out.Conditions
-		*out = make([]SecretSinkStatusCondition, len(*in))
+		*out = make([]PushSecretStatusCondition, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SecretSinkStatus.
-func (in *SecretSinkStatus) DeepCopy() *SecretSinkStatus {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PushSecretStatus.
+func (in *PushSecretStatus) DeepCopy() *PushSecretStatus {
 	if in == nil {
 		return nil
 	}
-	out := new(SecretSinkStatus)
+	out := new(PushSecretStatus)
 	in.DeepCopyInto(out)
 	return out
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *SecretSinkStatusCondition) DeepCopyInto(out *SecretSinkStatusCondition) {
+func (in *PushSecretStatusCondition) DeepCopyInto(out *PushSecretStatusCondition) {
 	*out = *in
 	in.LastTransitionTime.DeepCopyInto(&out.LastTransitionTime)
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SecretSinkStatusCondition.
-func (in *SecretSinkStatusCondition) DeepCopy() *SecretSinkStatusCondition {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PushSecetStatusCondition.
+func (in *PushSecretStatusCondition) DeepCopy() *PushSecretStatusCondition {
 	if in == nil {
 		return nil
 	}
-	out := new(SecretSinkStatusCondition)
+	out := new(PushSecretStatusCondition)
 	in.DeepCopyInto(out)
 	return out
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *SecretSinkStoreRef) DeepCopyInto(out *SecretSinkStoreRef) {
+func (in *PushSecretStoreRef) DeepCopyInto(out *PushSecretStoreRef) {
 	*out = *in
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SecretSinkStoreRef.
-func (in *SecretSinkStoreRef) DeepCopy() *SecretSinkStoreRef {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PushSecretStoreRef.
+func (in *PushSecretStoreRef) DeepCopy() *PushSecretStoreRef {
 	if in == nil {
 		return nil
 	}
-	out := new(SecretSinkStoreRef)
+	out := new(PushSecretStoreRef)
 	in.DeepCopyInto(out)
 	return out
 }

+ 4 - 4
cmd/root.go

@@ -37,7 +37,7 @@ import (
 	esv1beta1 "github.com/external-secrets/external-secrets/apis/externalsecrets/v1beta1"
 	"github.com/external-secrets/external-secrets/pkg/controllers/clusterexternalsecret"
 	"github.com/external-secrets/external-secrets/pkg/controllers/externalsecret"
-	"github.com/external-secrets/external-secrets/pkg/controllers/secretsink"
+	"github.com/external-secrets/external-secrets/pkg/controllers/pushsecret"
 	"github.com/external-secrets/external-secrets/pkg/controllers/secretstore"
 )
 
@@ -147,14 +147,14 @@ var rootCmd = &cobra.Command{
 			setupLog.Error(err, errCreateController, "controller", "ExternalSecret")
 			os.Exit(1)
 		}
-		if err = (&secretsink.Reconciler{
+		if err = (&pushsecret.Reconciler{
 			Client:          mgr.GetClient(),
-			Log:             ctrl.Log.WithName("controllers").WithName("SecretSink"),
+			Log:             ctrl.Log.WithName("controllers").WithName("PushSecret"),
 			Scheme:          mgr.GetScheme(),
 			ControllerClass: controllerClass,
 			RequeueInterval: time.Hour,
 		}).SetupWithManager(mgr); err != nil {
-			setupLog.Error(err, errCreateController, "controller", "SecretSink")
+			setupLog.Error(err, errCreateController, "controller", "PushSecret")
 			os.Exit(1)
 		}
 		if enableClusterExternalSecretReconciler {

+ 12 - 12
config/crds/bases/external-secrets.io_secretsinks.yaml

@@ -4,16 +4,16 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.9.0
   creationTimestamp: null
-  name: secretsinks.external-secrets.io
+  name: pushsecrets.external-secrets.io
 spec:
   group: external-secrets.io
   names:
     categories:
-    - secretsinks
-    kind: SecretSink
-    listKind: SecretSinkList
-    plural: secretsinks
-    singular: secretsink
+    - pushsecrets
+    kind: PushSecret
+    listKind: PushSecretList
+    plural: pushsecrets
+    singular: pushsecret
   scope: Namespaced
   versions:
   - additionalPrinterColumns:
@@ -40,7 +40,7 @@ spec:
           metadata:
             type: object
           spec:
-            description: SecretSinkSpec configures the behavior of the SecretSink.
+            description: PushSecretSpec configures the behavior of the PushSecret.
             properties:
               data:
                 items:
@@ -99,12 +99,12 @@ spec:
             - selector
             type: object
           status:
-            description: SecretSinkStatus indicates the history of the status of SecretSink.
+            description: PushSecretStatus indicates the history of the status of PushSecret.
             properties:
               conditions:
                 items:
-                  description: SecretSinkStatusCondition indicates the status of the
-                    SecretSink.
+                  description: PushSecretStatusCondition indicates the status of the
+                    PushSecret.
                   properties:
                     lastTransitionTime:
                       format: date-time
@@ -116,8 +116,8 @@ spec:
                     status:
                       type: string
                     type:
-                      description: SecretSinkConditionType indicates the condition
-                        of the SecretSink.
+                      description: PushSecretConditionType indicates the condition
+                        of the PushSecret.
                       type: string
                   required:
                   - status

+ 6 - 6
deploy/charts/external-secrets/templates/rbac.yaml

@@ -20,7 +20,7 @@ rules:
     - "clustersecretstores"
     - "externalsecrets"
     - "clusterexternalsecrets"
-    - "secretsinks"
+    - "pushsecrets"
     verbs:
     - "get"
     - "list"
@@ -40,9 +40,9 @@ rules:
     - "clusterexternalsecrets"
     - "clusterexternalsecrets/status"
     - "clusterexternalsecrets/finalizers"
-    - "secretsinks"
-    - "secretsinks/status"
-    - "secretsinks/finalizers"
+    - "pushsecrets"
+    - "pushsecrets/status"
+    - "pushsecrets/finalizers"
     verbs:
     - "update"
     - "patch"
@@ -119,7 +119,7 @@ rules:
       - "externalsecrets"
       - "secretstores"
       - "clustersecretstores"
-      - "secretsinks"
+      - "pushsecrets"
     verbs:
       - "get"
       - "watch"
@@ -147,7 +147,7 @@ rules:
       - "externalsecrets"
       - "secretstores"
       - "clustersecretstores"
-      - "secretsinks"
+      - "pushsecrets"
     verbs:
       - "create"
       - "delete"

+ 10 - 10
deploy/crds/bundle.yaml

@@ -3014,16 +3014,16 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.9.0
   creationTimestamp: null
-  name: secretsinks.external-secrets.io
+  name: pushsecrets.external-secrets.io
 spec:
   group: external-secrets.io
   names:
     categories:
-      - secretsinks
-    kind: SecretSink
-    listKind: SecretSinkList
-    plural: secretsinks
-    singular: secretsink
+      - pushsecrets
+    kind: PushSecret
+    listKind: PushSecretList
+    plural: pushsecrets
+    singular: pushsecret
   scope: Namespaced
   versions:
     - additionalPrinterColumns:
@@ -3046,7 +3046,7 @@ spec:
             metadata:
               type: object
             spec:
-              description: SecretSinkSpec configures the behavior of the SecretSink.
+              description: PushSecretSpec configures the behavior of the PushSecret.
               properties:
                 data:
                   items:
@@ -3104,11 +3104,11 @@ spec:
                 - selector
               type: object
             status:
-              description: SecretSinkStatus indicates the history of the status of SecretSink.
+              description: PushSecretStatus indicates the history of the status of PushSecret.
               properties:
                 conditions:
                   items:
-                    description: SecretSinkStatusCondition indicates the status of the SecretSink.
+                    description: PushSecretStatusCondition indicates the status of the PushSecret.
                     properties:
                       lastTransitionTime:
                         format: date-time
@@ -3120,7 +3120,7 @@ spec:
                       status:
                         type: string
                       type:
-                        description: SecretSinkConditionType indicates the condition of the SecretSink.
+                        description: PushSecretConditionType indicates the condition of the PushSecret.
                         type: string
                     required:
                       - status

+ 8 - 8
design/001-secretsink.md

@@ -1,6 +1,6 @@
 ```yaml
 ---
-title: SecretSink
+title: PushSecret
 version: v1alpha1
 authors: 
 creation-date: 2022-01-25
@@ -18,13 +18,13 @@ status: draft
 
 
 ## Summary
-The Secret Sink is a feature to allow Secrets from Kubernetes to be saved back into some providers. Where ExternalSecret is responsible to download a Secret from a Provider into Kubernetes (as a K8s Secret), SecretSink will upload a Kubernetes Secret to a Provider.
+The Secret Sink is a feature to allow Secrets from Kubernetes to be saved back into some providers. Where ExternalSecret is responsible to download a Secret from a Provider into Kubernetes (as a K8s Secret), PushSecret will upload a Kubernetes Secret to a Provider.
 
 ## Motivation
 Secret Sink allows some inCluster generated secrets to also be available on a given secret provider. It also allows multiple Providers having the same secret (which means a way to perform failover in case a given secret provider is on downtime or compromised for whatever the reason).
 
 ### Goals
-- CRD Design for the SecretSink
+- CRD Design for the PushSecret
 - Define the need for a SinkStore
 - 
 ### Non-Goals
@@ -113,7 +113,7 @@ spec:
 
 ```yaml
 apiVersion: external-secrets.io/v1alpha1
-kind: SecretSink
+kind: PushSecret
 metadata:
   name: "hello-world"
   namespace: my-ns # Same of the SecretStores
@@ -165,7 +165,7 @@ status:
 ```
 
 ### Behavior
-When checking SecretSink for the Source Secret, check existing labels for SecretStore reference of that particular Secret. If this SecretStore reference is an object in SecretSink SecretStore lists, a SecretSyncError should be emited as we cannot sync the secret to the same SecretStore.
+When checking PushSecret for the Source Secret, check existing labels for SecretStore reference of that particular Secret. If this SecretStore reference is an object in PushSecret SecretStore lists, a SecretSyncError should be emited as we cannot sync the secret to the same SecretStore.
 
 If the SecretStores are all fine or if the Secret has no labels (secret created by user / another tool), for Each SecretStore, get the SyncState of this store (New, SecretSynced, SecretSyncedErr).
 
@@ -177,9 +177,9 @@ We had several discussions on how to implement this feature, and it turns out ju
 
 ### Acceptance Criteria
 + ExternalSecrets create appropriate labels on generated Secrets
-+ SecretSinks can read labels on source Secrets
-+ SecretSinks cannot have same references to SecretStores
-+ SecretSinks respect refreshInterval
++ PushSecrets can read labels on source Secrets
++ PushSecrets cannot have same references to SecretStores
++ PushSecrets respect refreshInterval
 ## Alternatives
 Using some integration with Crossplane can allow to sync the secrets. Cons is this must be either manual or through some integration that would be an independent project on its own.
 

+ 3 - 3
e2e/framework/addon/eso.go

@@ -17,7 +17,7 @@ import (
 	"os"
 
 	// nolint
-	. "github.com/onsi/ginkgo/v2"
+	ginkgo "github.com/onsi/ginkgo/v2"
 )
 
 type ESO struct {
@@ -155,7 +155,7 @@ func WithCRDs() MutationFunc {
 }
 
 func (l *ESO) Install() error {
-	By("Installing eso\n")
+	ginkgo.By("Installing eso\n")
 	err := l.HelmChart.Install()
 	if err != nil {
 		return err
@@ -165,7 +165,7 @@ func (l *ESO) Install() error {
 }
 
 func (l *ESO) Uninstall() error {
-	By("Uninstalling eso")
+	ginkgo.By("Uninstalling eso")
 	err := l.HelmChart.Uninstall()
 	if err != nil {
 		return err

+ 8 - 8
e2e/framework/addon/vault.go

@@ -32,7 +32,7 @@ import (
 	vault "github.com/hashicorp/vault/api"
 
 	// nolint
-	. "github.com/onsi/ginkgo/v2"
+	ginkgo "github.com/onsi/ginkgo/v2"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
@@ -93,7 +93,7 @@ type OperatorInitResponse struct {
 }
 
 func (l *Vault) Install() error {
-	By("Installing vault in " + l.Namespace)
+	ginkgo.By("Installing vault in " + l.Namespace)
 	err := l.chart.Install()
 	if err != nil {
 		return err
@@ -168,13 +168,13 @@ func (l *Vault) initVault() error {
 	l.KubernetesAuthPath = "mykubernetes"              // see configure-vault.sh
 	l.KubernetesAuthRole = "external-secrets-operator" // see configure-vault.sh
 
-	By("Creating vault TLS secret")
+	ginkgo.By("Creating vault TLS secret")
 	err = l.chart.config.CRClient.Create(context.Background(), sec)
 	if err != nil {
 		return err
 	}
 
-	By("Waiting for vault pods to be running")
+	ginkgo.By("Waiting for vault pods to be running")
 	pl, err := util.WaitForPodsRunning(l.chart.config.KubeClientSet, 1, l.Namespace, metav1.ListOptions{
 		LabelSelector: "app.kubernetes.io/name=vault",
 	})
@@ -183,7 +183,7 @@ func (l *Vault) initVault() error {
 	}
 	l.PodName = pl.Items[0].Name
 
-	By("Initializing vault")
+	ginkgo.By("Initializing vault")
 	out, err := util.ExecCmd(
 		l.chart.config.KubeClientSet,
 		l.chart.config.KubeConfig,
@@ -192,7 +192,7 @@ func (l *Vault) initVault() error {
 		return fmt.Errorf("error initializing vault: %w", err)
 	}
 
-	By("Parsing init response")
+	ginkgo.By("Parsing init response")
 	var res OperatorInitResponse
 	err = json.Unmarshal([]byte(out), &res)
 	if err != nil {
@@ -200,7 +200,7 @@ func (l *Vault) initVault() error {
 	}
 	l.RootToken = res.RootToken
 
-	By("Unsealing vault")
+	ginkgo.By("Unsealing vault")
 	for _, k := range res.UnsealKeysB64 {
 		_, err = util.ExecCmd(
 			l.chart.config.KubeClientSet,
@@ -238,7 +238,7 @@ func (l *Vault) initVault() error {
 }
 
 func (l *Vault) configureVault() error {
-	By("configuring vault")
+	ginkgo.By("configuring vault")
 	cmd := `sh /etc/vault-config/configure-vault.sh %s`
 	_, err := util.ExecCmd(
 		l.chart.config.KubeClientSet,

+ 0 - 0
pkg/controllers/secretsink/internal/fakes/client.go → pkg/controllers/pushsecret/internal/fakes/client.go


+ 0 - 0
pkg/controllers/secretsink/internal/fakes/manager.go → pkg/controllers/pushsecret/internal/fakes/manager.go


+ 0 - 0
pkg/controllers/secretsink/internal/fakes/statuswriter.go → pkg/controllers/pushsecret/internal/fakes/statuswriter.go


+ 24 - 24
pkg/controllers/secretsink/secretsink_controller.go → pkg/controllers/pushsecret/pushsecret_controller.go

@@ -12,7 +12,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package secretsink
+package pushsecret
 
 import (
 	"context"
@@ -55,13 +55,13 @@ type Reconciler struct {
 }
 
 func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
-	log := r.Log.WithValues("secretsink", req.NamespacedName)
-	var ss esapi.SecretSink
+	log := r.Log.WithValues("pushsecret", req.NamespacedName)
+	var ss esapi.PushSecret
 	err := r.Get(ctx, req.NamespacedName, &ss)
 	if apierrors.IsNotFound(err) {
 		return ctrl.Result{}, nil
 	} else if err != nil {
-		log.Error(err, "unable to get SecretSink")
+		log.Error(err, "unable to get PushSecret")
 		return ctrl.Result{}, fmt.Errorf("get resource: %w", err)
 	}
 
@@ -74,29 +74,29 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 	}()
 	secret, err := r.GetSecret(ctx, ss)
 	if err != nil {
-		cond := NewSecretSinkCondition(esapi.SecretSinkReady, v1.ConditionFalse, "SecretSyncFailed", errFailedGetSecret)
-		ss = SetSecretSinkCondition(ss, *cond)
+		cond := NewPushSecretCondition(esapi.PushSecretReady, v1.ConditionFalse, "SecretSyncFailed", errFailedGetSecret)
+		ss = SetPushSecretCondition(ss, *cond)
 		return ctrl.Result{}, err
 	}
 	secretStores, err := r.GetSecretStores(ctx, ss)
 	if err != nil {
-		cond := NewSecretSinkCondition(esapi.SecretSinkReady, v1.ConditionFalse, "SecretSyncFailed", err.Error())
-		ss = SetSecretSinkCondition(ss, *cond)
+		cond := NewPushSecretCondition(esapi.PushSecretReady, v1.ConditionFalse, "SecretSyncFailed", err.Error())
+		ss = SetPushSecretCondition(ss, *cond)
 	}
 	err = r.SetSecretToProviders(ctx, secretStores, ss, secret)
 	if err != nil {
 		msg := fmt.Sprintf(errFailedSetSecret, err)
-		cond := NewSecretSinkCondition(esapi.SecretSinkReady, v1.ConditionFalse, "SecretSyncFailed", msg)
-		ss = SetSecretSinkCondition(ss, *cond)
+		cond := NewPushSecretCondition(esapi.PushSecretReady, v1.ConditionFalse, "SecretSyncFailed", msg)
+		ss = SetPushSecretCondition(ss, *cond)
 		return ctrl.Result{}, err
 	}
-	cond := NewSecretSinkCondition(esapi.SecretSinkReady, v1.ConditionTrue, "SecretSynced", "SecretSink synced successfully")
-	ss = SetSecretSinkCondition(ss, *cond)
-	// Set status for SecretSink
+	cond := NewPushSecretCondition(esapi.PushSecretReady, v1.ConditionTrue, "SecretSynced", "PushSecret synced successfully")
+	ss = SetPushSecretCondition(ss, *cond)
+	// Set status for PushSecret
 	return ctrl.Result{}, nil
 }
 
-func (r *Reconciler) SetSecretToProviders(ctx context.Context, stores []v1beta1.GenericStore, ss esapi.SecretSink, secret *v1.Secret) error {
+func (r *Reconciler) SetSecretToProviders(ctx context.Context, stores []v1beta1.GenericStore, ss esapi.PushSecret, secret *v1.Secret) error {
 	for _, store := range stores {
 		provider, err := v1beta1.GetProvider(store)
 		if err != nil {
@@ -130,7 +130,7 @@ func (r *Reconciler) SetSecretToProviders(ctx context.Context, stores []v1beta1.
 	return nil
 }
 
-func (r *Reconciler) GetSecret(ctx context.Context, ss esapi.SecretSink) (*v1.Secret, error) {
+func (r *Reconciler) GetSecret(ctx context.Context, ss esapi.PushSecret) (*v1.Secret, error) {
 	secretName := types.NamespacedName{Name: ss.Spec.Selector.Secret.Name, Namespace: ss.Namespace}
 	secret := &v1.Secret{}
 	err := r.Client.Get(ctx, secretName, secret)
@@ -140,7 +140,7 @@ func (r *Reconciler) GetSecret(ctx context.Context, ss esapi.SecretSink) (*v1.Se
 	return secret, nil
 }
 
-func (r *Reconciler) GetSecretStores(ctx context.Context, ss esapi.SecretSink) ([]v1beta1.GenericStore, error) {
+func (r *Reconciler) GetSecretStores(ctx context.Context, ss esapi.PushSecret) ([]v1beta1.GenericStore, error) {
 	stores := make([]v1beta1.GenericStore, 0)
 	for _, refStore := range ss.Spec.SecretStoreRefs {
 		ref := types.NamespacedName{
@@ -172,12 +172,12 @@ func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
 	r.recorder = mgr.GetEventRecorderFor("secret-sink")
 
 	return ctrl.NewControllerManagedBy(mgr).
-		For(&esapi.SecretSink{}).
+		For(&esapi.PushSecret{}).
 		Complete(r)
 }
 
-func NewSecretSinkCondition(condType esapi.SecretSinkConditionType, status v1.ConditionStatus, reason, message string) *esapi.SecretSinkStatusCondition {
-	return &esapi.SecretSinkStatusCondition{
+func NewPushSecretCondition(condType esapi.PushSecretConditionType, status v1.ConditionStatus, reason, message string) *esapi.PushSecretStatusCondition {
+	return &esapi.PushSecretStatusCondition{
 		Type:               condType,
 		Status:             status,
 		LastTransitionTime: metav1.Now(),
@@ -186,9 +186,9 @@ func NewSecretSinkCondition(condType esapi.SecretSinkConditionType, status v1.Co
 	}
 }
 
-func SetSecretSinkCondition(gs esapi.SecretSink, condition esapi.SecretSinkStatusCondition) esapi.SecretSink {
+func SetPushSecretCondition(gs esapi.PushSecret, condition esapi.PushSecretStatusCondition) esapi.PushSecret {
 	status := gs.Status
-	currentCond := GetSecretSinkCondition(status, condition.Type)
+	currentCond := GetPushSecretCondition(status, condition.Type)
 	if currentCond != nil && currentCond.Status == condition.Status &&
 		currentCond.Reason == condition.Reason && currentCond.Message == condition.Message {
 		return gs
@@ -205,8 +205,8 @@ func SetSecretSinkCondition(gs esapi.SecretSink, condition esapi.SecretSinkStatu
 }
 
 // filterOutCondition returns an empty set of conditions with the provided type.
-func filterOutCondition(conditions []esapi.SecretSinkStatusCondition, condType esapi.SecretSinkConditionType) []esapi.SecretSinkStatusCondition {
-	newConditions := make([]esapi.SecretSinkStatusCondition, 0, len(conditions))
+func filterOutCondition(conditions []esapi.PushSecretStatusCondition, condType esapi.PushSecretConditionType) []esapi.PushSecretStatusCondition {
+	newConditions := make([]esapi.PushSecretStatusCondition, 0, len(conditions))
 	for _, c := range conditions {
 		if c.Type == condType {
 			continue
@@ -217,7 +217,7 @@ func filterOutCondition(conditions []esapi.SecretSinkStatusCondition, condType e
 }
 
 // GetSecretStoreCondition returns the condition with the provided type.
-func GetSecretSinkCondition(status esapi.SecretSinkStatus, condType esapi.SecretSinkConditionType) *esapi.SecretSinkStatusCondition {
+func GetPushSecretCondition(status esapi.PushSecretStatus, condType esapi.PushSecretConditionType) *esapi.PushSecretStatusCondition {
 	for i := range status.Conditions {
 		c := status.Conditions[i]
 		if c.Type == condType {

+ 40 - 40
pkg/controllers/secretsink/secretsink_controller_test.go → pkg/controllers/pushsecret/pushsecret_controller_test.go

@@ -12,7 +12,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package secretsink
+package pushsecret
 
 import (
 	"context"
@@ -29,13 +29,13 @@ import (
 
 	esapi "github.com/external-secrets/external-secrets/apis/externalsecrets/v1alpha1"
 	v1beta1 "github.com/external-secrets/external-secrets/apis/externalsecrets/v1beta1"
-	"github.com/external-secrets/external-secrets/pkg/controllers/secretsink/internal/fakes"
+	"github.com/external-secrets/external-secrets/pkg/controllers/pushsecret/internal/fakes"
 	"github.com/external-secrets/external-secrets/pkg/provider/testing/fake"
 )
 
 var fakeProvider *fake.Client
 
-var _ = Describe("secretsink", func() {
+var _ = Describe("pushsecret", func() {
 	var (
 		reconciler *Reconciler
 		client     *fakes.Client
@@ -98,58 +98,58 @@ var _ = Describe("secretsink", func() {
 		})
 	})
 
-	Describe("#GetSecretSinkCondition", func() {
+	Describe("#GetPushSecretCondition", func() {
 		It("returns nil for empty secret sink status", func() {
-			secretSinkStatus := new(esapi.SecretSinkStatus)
-			secretSinkConditionType := new(esapi.SecretSinkConditionType)
+			pushSecretStatus := new(esapi.PushSecretStatus)
+			pushSecretConditionType := new(esapi.PushSecretConditionType)
 
-			Expect(GetSecretSinkCondition(*secretSinkStatus, *secretSinkConditionType)).To(BeNil())
+			Expect(GetPushSecretCondition(*pushSecretStatus, *pushSecretConditionType)).To(BeNil())
 		})
 
 		It("returns correct condition for secret sink status", func() {
-			secretSinkStatusCondition := esapi.SecretSinkStatusCondition{Type: esapi.SecretSinkReady}
-			secretSinkStatus := esapi.SecretSinkStatus{Conditions: []esapi.SecretSinkStatusCondition{secretSinkStatusCondition}}
-			secretSinkConditionType := esapi.SecretSinkReady
+			pushSecretStatusCondition := esapi.PushSecretStatusCondition{Type: esapi.PushSecretReady}
+			pushSecretStatus := esapi.PushSecretStatus{Conditions: []esapi.PushSecretStatusCondition{pushSecretStatusCondition}}
+			pushSecretConditionType := esapi.PushSecretReady
 
-			Expect(GetSecretSinkCondition(secretSinkStatus, secretSinkConditionType)).To(Equal(&secretSinkStatusCondition))
+			Expect(GetPushSecretCondition(pushSecretStatus, pushSecretConditionType)).To(Equal(&pushSecretStatusCondition))
 		})
 	})
 
-	Describe("#SetSecretSinkCondition", func() {
+	Describe("#SetPushSecretCondition", func() {
 		It("appends a condition", func() {
-			secretSink := esapi.SecretSink{}
+			pushSecret := esapi.PushSecret{}
 
-			secretSinkStatusCondition := esapi.SecretSinkStatusCondition{}
-			secretSinkStatus := esapi.SecretSinkStatus{Conditions: []esapi.SecretSinkStatusCondition{secretSinkStatusCondition}}
-			expected := esapi.SecretSink{Status: secretSinkStatus}
-			Expect(SetSecretSinkCondition(secretSink, secretSinkStatusCondition)).To(Equal(expected))
+			pushSecretStatusCondition := esapi.PushSecretStatusCondition{}
+			pushSecretStatus := esapi.PushSecretStatus{Conditions: []esapi.PushSecretStatusCondition{pushSecretStatusCondition}}
+			expected := esapi.PushSecret{Status: pushSecretStatus}
+			Expect(SetPushSecretCondition(pushSecret, pushSecretStatusCondition)).To(Equal(expected))
 		})
 
 		It("changes an existing condition", func() {
 			conditionStatusTrue := v1.ConditionTrue
-			secretSinkWithCondition := esapi.SecretSink{Status: esapi.SecretSinkStatus{Conditions: []esapi.SecretSinkStatusCondition{
+			pushSecretWithCondition := esapi.PushSecret{Status: esapi.PushSecretStatus{Conditions: []esapi.PushSecretStatusCondition{
 				{
 					Status: conditionStatusTrue,
-					Type:   esapi.SecretSinkReady,
+					Type:   esapi.PushSecretReady,
 				},
 			}},
 			}
-			secretSinkStatusConditionTrue := esapi.SecretSinkStatusCondition{Status: conditionStatusTrue,
-				Type:    esapi.SecretSinkReady,
+			pushSecretStatusConditionTrue := esapi.PushSecretStatusCondition{Status: conditionStatusTrue,
+				Type:    esapi.PushSecretReady,
 				Message: "Update status",
 			}
 
-			got := SetSecretSinkCondition(secretSinkWithCondition, secretSinkStatusConditionTrue)
+			got := SetPushSecretCondition(pushSecretWithCondition, pushSecretStatusConditionTrue)
 			Expect(len(got.Status.Conditions)).To(Equal(1))
-			Expect(got.Status.Conditions[0]).To(Equal(secretSinkStatusConditionTrue))
+			Expect(got.Status.Conditions[0]).To(Equal(pushSecretStatusConditionTrue))
 		})
 	})
 	Describe("#GetSecret", func() {
 		It("returns a secret if it exists", func() {
-			sink := esapi.SecretSink{
-				Spec: esapi.SecretSinkSpec{
-					Selector: esapi.SecretSinkSelector{
-						Secret: esapi.SecretSinkSecret{
+			sink := esapi.PushSecret{
+				Spec: esapi.PushSecretSpec{
+					Selector: esapi.PushSecretSelector{
+						Secret: esapi.PushSecretSecret{
 							Name: "foo",
 						},
 					},
@@ -166,15 +166,15 @@ var _ = Describe("secretsink", func() {
 
 		It("returns an error if it doesn't exist", func() {
 			client.GetReturns(errors.New("secret not found"))
-			_, err := reconciler.GetSecret(context.TODO(), esapi.SecretSink{})
+			_, err := reconciler.GetSecret(context.TODO(), esapi.PushSecret{})
 			Expect(err).To(HaveOccurred())
 		})
 	})
 
 	Describe("#GetSecretStore", func() {
-		sink := esapi.SecretSink{
-			Spec: esapi.SecretSinkSpec{
-				SecretStoreRefs: []esapi.SecretSinkStoreRef{
+		sink := esapi.PushSecret{
+			Spec: esapi.PushSecretSpec{
+				SecretStoreRefs: []esapi.PushSecretStoreRef{
 					{
 						Name: "foo",
 					},
@@ -183,9 +183,9 @@ var _ = Describe("secretsink", func() {
 		}
 		sink.Namespace = "bar"
 
-		clusterSink := esapi.SecretSink{
-			Spec: esapi.SecretSinkSpec{
-				SecretStoreRefs: []esapi.SecretSinkStoreRef{
+		clusterSink := esapi.PushSecret{
+			Spec: esapi.PushSecretSpec{
+				SecretStoreRefs: []esapi.PushSecretStoreRef{
 					{
 						Name: "foo",
 						Kind: "ClusterSecretStore",
@@ -226,19 +226,19 @@ var _ = Describe("secretsink", func() {
 				"foo": []byte(val),
 			},
 		}
-		sink := esapi.SecretSink{
-			Spec: esapi.SecretSinkSpec{
-				SecretStoreRefs: []esapi.SecretSinkStoreRef{
+		sink := esapi.PushSecret{
+			Spec: esapi.PushSecretSpec{
+				SecretStoreRefs: []esapi.PushSecretStoreRef{
 					{
 						Name: "foo",
 					},
 				},
-				Data: []esapi.SecretSinkData{
+				Data: []esapi.PushSecretData{
 					{
-						Match: []esapi.SecretSinkMatch{
+						Match: []esapi.PushSecretMatch{
 							{
 								SecretKey: "foo",
-								RemoteRefs: []esapi.SecretSinkRemoteRefs{
+								RemoteRefs: []esapi.PushSecretRemoteRefs{
 									{
 										RemoteKey: "bar",
 									},

+ 1 - 1
pkg/controllers/secretsink/suite_test.go → pkg/controllers/pushsecret/suite_test.go

@@ -12,7 +12,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package secretsink
+package pushsecret
 
 import (
 	"testing"

+ 1 - 1
pkg/provider/fake/fake_test.go

@@ -198,7 +198,7 @@ func TestSetSecret(t *testing.T) {
 				},
 			}, nil, "")
 			gomega.Expect(err).ToNot(gomega.HaveOccurred())
-			err = cl.SetSecret(context.TODO(), []byte(row.expValue), esv1alpha1.SecretSinkRemoteRefs{
+			err = cl.SetSecret(context.TODO(), []byte(row.expValue), esv1alpha1.PushSecretRemoteRefs{
 				RemoteKey: row.requestKey,
 			})
 			if row.expErr != "" {