Browse Source

Merge pull request #1224 from chrisdotm/main

Check v1beta1RemoteRef.Extract for nil
paul-the-alien[bot] 3 years ago
parent
commit
5d69fa818b
1 changed files with 8 additions and 6 deletions
  1. 8 6
      apis/externalsecrets/v1alpha1/externalsecret_conversion.go

+ 8 - 6
apis/externalsecrets/v1alpha1/externalsecret_conversion.go

@@ -78,13 +78,15 @@ func (alpha *ExternalSecret) ConvertFrom(betaRaw conversion.Hub) error {
 	beta := betaRaw.(*esv1beta1.ExternalSecret)
 	v1alpha1DataFrom := make([]ExternalSecretDataRemoteRef, 0)
 	for _, v1beta1RemoteRef := range beta.Spec.DataFrom {
-		if v1beta1RemoteRef.Extract.Key != "" {
-			v1alpha1RemoteRef := ExternalSecretDataRemoteRef{
-				Key:      v1beta1RemoteRef.Extract.Key,
-				Property: v1beta1RemoteRef.Extract.Property,
-				Version:  v1beta1RemoteRef.Extract.Version,
+		if v1beta1RemoteRef.Extract != nil {
+			if v1beta1RemoteRef.Extract.Key != "" {
+				v1alpha1RemoteRef := ExternalSecretDataRemoteRef{
+					Key:      v1beta1RemoteRef.Extract.Key,
+					Property: v1beta1RemoteRef.Extract.Property,
+					Version:  v1beta1RemoteRef.Extract.Version,
+				}
+				v1alpha1DataFrom = append(v1alpha1DataFrom, v1alpha1RemoteRef)
 			}
-			v1alpha1DataFrom = append(v1alpha1DataFrom, v1alpha1RemoteRef)
 		}
 	}
 	alpha.Spec.DataFrom = v1alpha1DataFrom