@@ -739,6 +739,12 @@ var _ = Describe("FeatureStore Controller", func() {
 			}, deploy)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(deploy.Spec.Template.Spec.ServiceAccountName).To(Equal(deploy.Name))
+			Expect(deploy.Spec.Template.Spec.InitContainers).To(HaveLen(2))
+			Expect(deploy.Spec.Template.Spec.InitContainers[1].Name).To(Equal("feast-apply"))
+			Expect(deploy.Spec.Template.Spec.InitContainers[1].Env).To(ContainElements(
+				corev1.EnvVar{Name: testEnvVarName, Value: testEnvVarValue},
+			))
+			Expect(deploy.Spec.Template.Spec.InitContainers[1].EnvFrom).NotTo(BeEmpty())
 			Expect(deploy.Spec.Template.Spec.Containers).To(HaveLen(4))
 			registryContainer := services.GetRegistryContainer(*deploy)
 			Expect(registryContainer.Env).To(HaveLen(1))
 
@@ -733,6 +733,18 @@ func (feast *FeastServices) setInitContainer(podSpec *corev1.PodSpec, fsYamlB64
 				Command:    []string{"feast", "apply"},
 				WorkingDir: featureRepoDir,
 			}
+			// feast apply needs DB/store connectivity, so inherit env/envFrom
+			// from all server container configs (registry, online, offline).
+			for _, feastType := range []FeastServiceType{RegistryFeastType, OnlineFeastType, OfflineFeastType} {
+				if serverConfigs := feast.getServerConfigs(feastType); serverConfigs != nil {
+					if serverConfigs.OptionalCtrConfigs.Env != nil {
+						applyContainer.Env = envOverride(applyContainer.Env, *serverConfigs.OptionalCtrConfigs.Env)
+					}
+					if serverConfigs.OptionalCtrConfigs.EnvFrom != nil {
+						applyContainer.EnvFrom = append(applyContainer.EnvFrom, *serverConfigs.OptionalCtrConfigs.EnvFrom...)
+					}
+				}
+			}
 			podSpec.InitContainers = append(podSpec.InitContainers, applyContainer)
 		}
 	}
 
@@ -997,10 +997,16 @@ def _apply_object(
                     "last_updated_timestamp": update_time,
                     "project_id": project,
                 }
-                insert_stmt = insert(table).values(
-                    values,
-                )
-                conn.execute(insert_stmt)
+                try:
+                    with conn.begin_nested():
+                        conn.execute(insert(table).values(values))
+                except IntegrityError:
+                    logger.info(
+                        "Object %s in project %s already created by another "
+                        "process, skipping.",
+                        name,
+                        project,
+                    )
 
             if not isinstance(obj, Project):
                 self.apply_project(
Original file line number	Diff line number	Diff line change
`@@ -733,6 +733,18 @@ func (feast FeastServices) setInitContainer(podSpec corev1.PodSpec, fsYamlB64`
`733`	`733`	`Command: []string{"feast", "apply"},`
`734`	`734`	`WorkingDir: featureRepoDir,`
`735`	`735`	`}`
	`736`	`+ // feast apply needs DB/store connectivity, so inherit env/envFrom`
	`737`	`+ // from all server container configs (registry, online, offline).`
	`738`	`+ for _, feastType := range []FeastServiceType{RegistryFeastType, OnlineFeastType, OfflineFeastType} {`
	`739`	`+ if serverConfigs := feast.getServerConfigs(feastType); serverConfigs != nil {`
	`740`	`+ if serverConfigs.OptionalCtrConfigs.Env != nil {`
	`741`	`+ applyContainer.Env = envOverride(applyContainer.Env, *serverConfigs.OptionalCtrConfigs.Env)`
	`742`	`+ }`
	`743`	`+ if serverConfigs.OptionalCtrConfigs.EnvFrom != nil {`
	`744`	`+ applyContainer.EnvFrom = append(applyContainer.EnvFrom, *serverConfigs.OptionalCtrConfigs.EnvFrom...)`
	`745`	`+ }`
	`746`	`+ }`
	`747`	`+ }`
`736`	`748`	`podSpec.InitContainers = append(podSpec.InitContainers, applyContainer)`
`737`	`749`	`}`
`738`	`750`	`}`