fix: rename managedSecretReferneces to managedKubeSecretReferences

k8-operator/api/v1alpha1/infisicalsecret_types.go

@@ -138,7 +138,7 @@ type InfisicalSecretSpec struct {
 	ManagedSecretReference ManagedKubeSecretConfig `json:"managedSecretReference"`
 
 	// +kubebuilder:validation:Optional
-	ManagedSecretReferences []ManagedKubeSecretConfig `json:"managedSecretReferences"`
+	ManagedKubeSecretReferences []ManagedKubeSecretConfig `json:"managedKubeSecretReferences"`
 
 	// +kubebuilder:default:=60
 	ResyncInterval int `json:"resyncInterval"`

k8-operator/api/v1alpha1/zz_generated.deepcopy.go

@@ -565,8 +565,8 @@ func (in *InfisicalSecretSpec) DeepCopyInto(out *InfisicalSecretSpec) {
 	out.TokenSecretReference = in.TokenSecretReference
 	out.Authentication = in.Authentication
 	in.ManagedSecretReference.DeepCopyInto(&out.ManagedSecretReference)
-	if in.ManagedSecretReferences != nil {
-		in, out := &in.ManagedSecretReferences, &out.ManagedSecretReferences
+	if in.ManagedKubeSecretReferences != nil {
+		in, out := &in.ManagedKubeSecretReferences, &out.ManagedKubeSecretReferences
 		*out = make([]ManagedKubeSecretConfig, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])

k8-operator/config/crd/bases/secrets.infisical.com_infisicalsecrets.yaml

@@ -261,47 +261,7 @@ spec:
               hostAPI:
                 description: Infisical host to pull secrets from
                 type: string
-              managedSecretReference:
-                properties:
-                  creationPolicy:
-                    default: Orphan
-                    description: 'The Kubernetes Secret creation policy. Enum with
-                      values: ''Owner'', ''Orphan''. Owner creates the secret and
-                      sets .metadata.ownerReferences of the InfisicalSecret CRD that
-                      created it. Orphan will not set the secret owner. This will
-                      result in the secret being orphaned and not deleted when the
-                      resource is deleted.'
-                    type: string
-                  secretName:
-                    description: The name of the Kubernetes Secret
-                    type: string
-                  secretNamespace:
-                    description: The name space where the Kubernetes Secret is located
-                    type: string
-                  secretType:
-                    default: Opaque
-                    description: 'The Kubernetes Secret type (experimental feature).
-                      More info: https://kubernetes.io/docs/concepts/configuration/secret/#secret-types'
-                    type: string
-                  template:
-                    description: The template to transform the secret data
-                    properties:
-                      data:
-                        additionalProperties:
-                          type: string
-                        description: The template key values
-                        type: object
-                      includeAllSecrets:
-                        description: This injects all retrieved secrets into the top
-                          level of your template. Secrets defined in the template
-                          will take precedence over the injected ones.
-                        type: boolean
-                    type: object
-                required:
-                - secretName
-                - secretNamespace
-                type: object
-              managedSecretReferences:
+              managedKubeSecretReferences:
                 items:
                   properties:
                     creationPolicy:
@@ -343,6 +303,46 @@ spec:
                   - secretNamespace
                   type: object
                 type: array
+              managedSecretReference:
+                properties:
+                  creationPolicy:
+                    default: Orphan
+                    description: 'The Kubernetes Secret creation policy. Enum with
+                      values: ''Owner'', ''Orphan''. Owner creates the secret and
+                      sets .metadata.ownerReferences of the InfisicalSecret CRD that
+                      created it. Orphan will not set the secret owner. This will
+                      result in the secret being orphaned and not deleted when the
+                      resource is deleted.'
+                    type: string
+                  secretName:
+                    description: The name of the Kubernetes Secret
+                    type: string
+                  secretNamespace:
+                    description: The name space where the Kubernetes Secret is located
+                    type: string
+                  secretType:
+                    default: Opaque
+                    description: 'The Kubernetes Secret type (experimental feature).
+                      More info: https://kubernetes.io/docs/concepts/configuration/secret/#secret-types'
+                    type: string
+                  template:
+                    description: The template to transform the secret data
+                    properties:
+                      data:
+                        additionalProperties:
+                          type: string
+                        description: The template key values
+                        type: object
+                      includeAllSecrets:
+                        description: This injects all retrieved secrets into the top
+                          level of your template. Secrets defined in the template
+                          will take precedence over the injected ones.
+                        type: boolean
+                    type: object
+                required:
+                - secretName
+                - secretNamespace
+                type: object
               resyncInterval:
                 default: 60
                 type: integer

k8-operator/controllers/infisicalsecret/infisicalsecret_controller.go

@@ -72,25 +72,25 @@ func (r *InfisicalSecretReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 	}
 
 	// It's important we don't directly modify the CRD object, so we create a copy of it and move existing data into it.
-	managedSecretReferences := infisicalSecretCRD.Spec.ManagedSecretReferences
+	managedKubeSecretReferences := infisicalSecretCRD.Spec.ManagedKubeSecretReferences
 
-	if infisicalSecretCRD.Spec.ManagedSecretReference.SecretName != "" && managedSecretReferences != nil && len(managedSecretReferences) > 0 {
-		errMessage := "InfisicalSecret CRD cannot have both managedSecretReference and managedSecretReferences"
+	if infisicalSecretCRD.Spec.ManagedSecretReference.SecretName != "" && managedKubeSecretReferences != nil && len(managedKubeSecretReferences) > 0 {
+		errMessage := "InfisicalSecret CRD cannot have both managedSecretReference and managedKubeSecretReferences"
 		logger.Error(defaultErrors.New(errMessage), errMessage)
 		return ctrl.Result{}, defaultErrors.New(errMessage)
 	}
 
 	if infisicalSecretCRD.Spec.ManagedSecretReference.SecretName != "" {
-		logger.Info("\n\n\nThe field `managedSecretReference` will be deprecated in the near future, please use `managedSecretReferences` instead.\n\nRefer to the documentation for more information: https://infisical.com/docs/integrations/platforms/kubernetes/infisical-secret-crd\n\n\n")
+		logger.Info("\n\n\nThe field `managedSecretReference` will be deprecated in the near future, please use `managedKubeSecretReferences` instead.\n\nRefer to the documentation for more information: https://infisical.com/docs/integrations/platforms/kubernetes/infisical-secret-crd\n\n\n")
 
-		if managedSecretReferences == nil {
-			managedSecretReferences = []secretsv1alpha1.ManagedKubeSecretConfig{}
+		if managedKubeSecretReferences == nil {
+			managedKubeSecretReferences = []secretsv1alpha1.ManagedKubeSecretConfig{}
 		}
-		managedSecretReferences = append(managedSecretReferences, infisicalSecretCRD.Spec.ManagedSecretReference)
+		managedKubeSecretReferences = append(managedKubeSecretReferences, infisicalSecretCRD.Spec.ManagedSecretReference)
 	}
 
-	if len(managedSecretReferences) == 0 {
-		errMessage := "InfisicalSecret CRD must have at least one managed secret reference set in the `managedSecretReferences` field"
+	if len(managedKubeSecretReferences) == 0 {
+		errMessage := "InfisicalSecret CRD must have at least one managed secret reference set in the `managedKubeSecretReferences` field"
 		logger.Error(defaultErrors.New(errMessage), errMessage)
 		return ctrl.Result{}, defaultErrors.New(errMessage)
 	}
@@ -151,7 +151,7 @@ func (r *InfisicalSecretReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 		api.API_CA_CERTIFICATE = ""
 	}
 
-	err = r.ReconcileInfisicalSecret(ctx, logger, infisicalSecretCRD, managedSecretReferences)
+	err = r.ReconcileInfisicalSecret(ctx, logger, infisicalSecretCRD, managedKubeSecretReferences)
 	r.SetReadyToSyncSecretsConditions(ctx, &infisicalSecretCRD, err)
 
 	if err != nil {
@@ -162,7 +162,7 @@ func (r *InfisicalSecretReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 		}, nil
 	}
 
-	numDeployments, err := controllerhelpers.ReconcileDeploymentsWithMultipleManagedSecrets(ctx, r.Client, logger, managedSecretReferences)
+	numDeployments, err := controllerhelpers.ReconcileDeploymentsWithMultipleManagedSecrets(ctx, r.Client, logger, managedKubeSecretReferences)
 	r.SetInfisicalAutoRedeploymentReady(ctx, logger, &infisicalSecretCRD, numDeployments, err)
 	if err != nil {
 		logger.Error(err, fmt.Sprintf("unable to reconcile auto redeployment. Will requeue after [requeueTime=%v]", requeueTime))

k8-operator/controllers/infisicalsecret/infisicalsecret_helper.go

@@ -337,7 +337,7 @@ func (r *InfisicalSecretReconciler) updateResourceVariables(infisicalSecret v1al
 	infisicalSecretResourceVariablesMap[string(infisicalSecret.UID)] = resourceVariables
 }
 
-func (r *InfisicalSecretReconciler) ReconcileInfisicalSecret(ctx context.Context, logger logr.Logger, infisicalSecret v1alpha1.InfisicalSecret, managedSecretReferences []v1alpha1.ManagedKubeSecretConfig) error {
+func (r *InfisicalSecretReconciler) ReconcileInfisicalSecret(ctx context.Context, logger logr.Logger, infisicalSecret v1alpha1.InfisicalSecret, managedKubeSecretReferences []v1alpha1.ManagedKubeSecretConfig) error {
 
 	resourceVariables := r.getResourceVariables(infisicalSecret)
 	infisicalClient := resourceVariables.InfisicalClient
@@ -361,7 +361,7 @@ func (r *InfisicalSecretReconciler) ReconcileInfisicalSecret(ctx context.Context
 		})
 	}
 
-	for _, managedSecretReference := range managedSecretReferences {
+	for _, managedSecretReference := range managedKubeSecretReferences {
 		// Look for managed secret by name and namespace
 		managedKubeSecret, err := util.GetKubeSecretByNamespacedName(ctx, r.Client, types.NamespacedName{
 			Name:      managedSecretReference.SecretName,