@@ -157,12 +157,12 @@ func createSparkPodSpec(
157
157
config .GetK8sPluginConfig ().DefaultLabels ,
158
158
pluginsUtils .CopyMap (taskCtx .TaskExecutionMetadata ().GetLabels ()),
159
159
)
160
- if k8sPod != nil && k8sPod .Metadata != nil {
160
+ if k8sPod != nil && k8sPod .GetMetadata () != nil {
161
161
if k8sPod .Metadata .Annotations != nil {
162
- annotations = pluginsUtils .UnionMaps (annotations , k8sPod .Metadata . Annotations )
162
+ annotations = pluginsUtils .UnionMaps (annotations , k8sPod .GetMetadata (). GetAnnotations () )
163
163
}
164
164
if k8sPod .Metadata .Labels != nil {
165
- labels = pluginsUtils .UnionMaps (labels , k8sPod .Metadata . Labels )
165
+ labels = pluginsUtils .UnionMaps (labels , k8sPod .GetMetadata (). GetLabels () )
166
166
}
167
167
}
168
168
@@ -204,10 +204,10 @@ func createDriverSpec(ctx context.Context, taskCtx pluginsCore.TaskExecutionCont
204
204
if driverPod != nil {
205
205
var customPodSpec * v1.PodSpec
206
206
207
- err = utils .UnmarshalStructToObj (driverPod .PodSpec , & customPodSpec )
207
+ err = utils .UnmarshalStructToObj (driverPod .GetPodSpec () , & customPodSpec )
208
208
if err != nil {
209
209
return nil , errors .Errorf (errors .BadTaskSpecification ,
210
- "Unable to unmarshal pod spec [%v], Err: [%v]" , driverPod .PodSpec , err .Error ())
210
+ "Unable to unmarshal pod spec [%v], Err: [%v]" , driverPod .GetPodSpec () , err .Error ())
211
211
}
212
212
213
213
podSpec , err = flytek8s .MergePodSpecs (podSpec , customPodSpec , primaryContainerName , "" )
@@ -247,14 +247,14 @@ func createExecutorSpec(ctx context.Context, taskCtx pluginsCore.TaskExecutionCo
247
247
return nil , err
248
248
}
249
249
250
- executorPod := sparkJob .ExecutorPod
250
+ executorPod := sparkJob .GetExecutorPod ()
251
251
if executorPod != nil {
252
252
var customPodSpec * v1.PodSpec
253
253
254
- err = utils .UnmarshalStructToObj (executorPod .PodSpec , & customPodSpec )
254
+ err = utils .UnmarshalStructToObj (executorPod .GetPodSpec () , & customPodSpec )
255
255
if err != nil {
256
256
return nil , errors .Errorf (errors .BadTaskSpecification ,
257
- "Unable to unmarshal pod spec [%v], Err: [%v]" , executorPod .PodSpec , err .Error ())
257
+ "Unable to unmarshal pod spec [%v], Err: [%v]" , executorPod .GetPodSpec () , err .Error ())
258
258
}
259
259
260
260
podSpec , err = flytek8s .MergePodSpecs (podSpec , customPodSpec , primaryContainerName , "" )
@@ -267,7 +267,7 @@ func createExecutorSpec(ctx context.Context, taskCtx pluginsCore.TaskExecutionCo
267
267
if err != nil {
268
268
return nil , err
269
269
}
270
- sparkPodSpec := createSparkPodSpec (taskCtx , podSpec , primaryContainer , sparkJob .ExecutorPod )
270
+ sparkPodSpec := createSparkPodSpec (taskCtx , podSpec , primaryContainer , sparkJob .GetExecutorPod () )
271
271
serviceAccountName := serviceAccountName (taskCtx .TaskExecutionMetadata ())
272
272
spec := executorSpec {
273
273
primaryContainer ,
0 commit comments