Merge pull request #2848 from Infisical/daniel/fix-k8-build

fix(k8-operator): fix build

helm-charts/secrets-operator/Chart.yaml

@@ -13,9 +13,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: v0.7.4
+version: v0.7.5
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v0.7.4"
+appVersion: "v0.7.5"

helm-charts/secrets-operator/templates/infisicalsecret-crd.yaml

@@ -282,6 +282,20 @@ spec:
                     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

helm-charts/secrets-operator/values.yaml

@@ -32,7 +32,7 @@ controllerManager:
         - ALL
     image:
       repository: infisical/kubernetes-operator
-      tag: v0.7.4
+      tag: v0.7.5
     resources:
       limits:
         cpu: 500m

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

@@ -133,7 +133,7 @@ func (in *InfisicalSecret) DeepCopyInto(out *InfisicalSecret) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	out.Spec = in.Spec
+	in.Spec.DeepCopyInto(&out.Spec)
 	in.Status.DeepCopyInto(&out.Status)
 }
 
@@ -192,7 +192,7 @@ func (in *InfisicalSecretSpec) DeepCopyInto(out *InfisicalSecretSpec) {
 	*out = *in
 	out.TokenSecretReference = in.TokenSecretReference
 	out.Authentication = in.Authentication
-	out.ManagedSecretReference = in.ManagedSecretReference
+	in.ManagedSecretReference.DeepCopyInto(&out.ManagedSecretReference)
 	out.TLS = in.TLS
 }
 
@@ -228,6 +228,28 @@ func (in *InfisicalSecretStatus) DeepCopy() *InfisicalSecretStatus {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *InfisicalSecretTemplate) DeepCopyInto(out *InfisicalSecretTemplate) {
+	*out = *in
+	if in.Data != nil {
+		in, out := &in.Data, &out.Data
+		*out = make(map[string]string, len(*in))
+		for key, val := range *in {
+			(*out)[key] = val
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new InfisicalSecretTemplate.
+func (in *InfisicalSecretTemplate) DeepCopy() *InfisicalSecretTemplate {
+	if in == nil {
+		return nil
+	}
+	out := new(InfisicalSecretTemplate)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *KubeSecretReference) DeepCopyInto(out *KubeSecretReference) {
 	*out = *in
@@ -293,6 +315,11 @@ func (in *MachineIdentityScopeInWorkspace) DeepCopy() *MachineIdentityScopeInWor
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *MangedKubeSecretConfig) DeepCopyInto(out *MangedKubeSecretConfig) {
 	*out = *in
+	if in.Template != nil {
+		in, out := &in.Template, &out.Template
+		*out = new(InfisicalSecretTemplate)
+		(*in).DeepCopyInto(*out)
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MangedKubeSecretConfig.

k8-operator/controllers/infisicalsecret_helper.go

@@ -250,13 +250,13 @@ func (r *InfisicalSecretReconciler) CreateInfisicalManagedKubeSecret(ctx context
 		for templateKey, userTemplate := range managedTemplateData.Data {
 			tmpl, err := template.New("secret-templates").Parse(userTemplate)
 			if err != nil {
-				return fmt.Errorf("Unable to compile template: %s", templateKey, err)
+				return fmt.Errorf("unable to compile template: %s [err=%v]", templateKey, err)
 			}
 
 			buf := bytes.NewBuffer(nil)
 			err = tmpl.Execute(buf, secretKeyValue)
 			if err != nil {
-				return fmt.Errorf("Unable to execute template: %s", templateKey, err)
+				return fmt.Errorf("unable to execute template: %s [err=%v]", templateKey, err)
 			}
 			plainProcessedSecrets[templateKey] = buf.Bytes()
 		}
@@ -336,13 +336,13 @@ func (r *InfisicalSecretReconciler) UpdateInfisicalManagedKubeSecret(ctx context
 		for templateKey, userTemplate := range managedTemplateData.Data {
 			tmpl, err := template.New("secret-templates").Parse(userTemplate)
 			if err != nil {
-				return fmt.Errorf("Unable to compile template: %s", templateKey, err)
+				return fmt.Errorf("unable to compile template: %s [err=%v]", templateKey, err)
 			}
 
 			buf := bytes.NewBuffer(nil)
 			err = tmpl.Execute(buf, secretKeyValue)
 			if err != nil {
-				return fmt.Errorf("Unable to execute template: %s", templateKey, err)
+				return fmt.Errorf("unable to execute template: %s [err=%v]", templateKey, err)
 			}
 			plainProcessedSecrets[templateKey] = buf.Bytes()
 		}