Skip to content

Commit 0129892

Browse files
rncrnc
committed
Remove tls workspace from pipeline. Normalize tls references.
1 parent 600e891 commit 0129892

File tree

5 files changed

+16
-22
lines changed

5 files changed

+16
-22
lines changed

‎deploy/tasks/maven-deployment.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ spec:
3333
type: string
3434
default: "quay.io/redhat-appstudio/hacbs-jvm-build-request-processor:dev"
3535
workspaces:
36-
- description: Workspace.
37-
name: source
36+
- name: source
3837
mountPath: /var/workdir
3938
steps:
4039
- name: restore-trusted-artifact

‎deploy/tasks/pre-build.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ spec:
6767
- description: The git repo will be cloned onto the volume backing this Workspace.
6868
name: source
6969
mountPath: /var/workdir
70-
- name: tls
7170
steps:
7271
- name: preprocessor
7372
image: $(params.JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE)

‎pkg/apis/jvmbuildservice/v1alpha1/systemconfig_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ type SystemConfigList struct {
4747

4848
const (
4949
KonfluxGitDefinition = "https://raw.githubusercontent.com/konflux-ci/build-definitions/refs/heads/main/task/git-clone/0.1/git-clone.yaml"
50-
KonfluxPreBuildDefinitions = "https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/main/deploy/tasks/pre-build.yaml"
50+
KonfluxPreBuildDefinitions = "https://raw.githubusercontent.com/rnc/jvm-build-service/PIPELINE/deploy/tasks/pre-build.yaml"
5151
KonfluxBuildDefinitions = "https://raw.githubusercontent.com/konflux-ci/build-definitions/refs/heads/main/task/buildah-oci-ta/0.2/buildah-oci-ta.yaml"
5252
KonfluxMavenDeployDefinitions = "https://raw.githubusercontent.com/rnc/jvm-build-service/PIPELINE/deploy/tasks/maven-deployment.yaml"
5353
)

‎pkg/reconciler/dependencybuild/buildrecipeyaml.go‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ func createPipelineSpec(log logr.Logger, tool string, commitTime int64, jbsConfi
273273
runAfterBuild = append(runAfter, BuildTaskName)
274274

275275
ps := &tektonpipeline.PipelineSpec{
276-
Workspaces: []tektonpipeline.PipelineWorkspaceDeclaration{{Name: WorkspaceSource}, {Name: WorkspaceTls}},
276+
Workspaces: []tektonpipeline.PipelineWorkspaceDeclaration{{Name: WorkspaceSource}},
277277
}
278278

279279
if preBuildImageRequired {
@@ -345,7 +345,6 @@ func createPipelineSpec(log logr.Logger, tool string, commitTime int64, jbsConfi
345345
},
346346
Workspaces: []tektonpipeline.WorkspacePipelineTaskBinding{
347347
{Name: WorkspaceSource, Workspace: WorkspaceSource},
348-
{Name: WorkspaceTls, Workspace: WorkspaceTls},
349348
},
350349
Params: []tektonpipeline.Param{
351350
{
@@ -585,10 +584,6 @@ use-archive oci:$URL@$AARCHIVE=$(workspaces.source.path)/artifacts`, orasOptions
585584
},
586585
Timeout: &v12.Duration{Duration: time.Hour * v1alpha1.DefaultTimeout},
587586
Params: []tektonpipeline.Param{{Name: PipelineResultPreBuildImageDigest, Value: tektonpipeline.ParamValue{Type: tektonpipeline.ParamTypeString, StringVal: preBuildImage}}},
588-
Workspaces: []tektonpipeline.WorkspacePipelineTaskBinding{
589-
{Name: WorkspaceSource, Workspace: WorkspaceSource},
590-
{Name: WorkspaceTls, Workspace: WorkspaceTls},
591-
},
592587
}}
593588
ps.Tasks = append(pipelineTask, ps.Tasks...)
594589
for _, i := range postBuildTask.Results {

‎pkg/reconciler/dependencybuild/dependencybuild.go‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -236,9 +236,9 @@ func (r *ReconcileDependencyBuild) handleStateNew(ctx context.Context, db *v1alp
236236
return reconcile.Result{}, err
237237
}
238238
if !jbsConfig.Spec.CacheSettings.DisableTLS {
239-
pr.Spec.Workspaces = []tektonpipeline.WorkspaceBinding{{Name: "tls", ConfigMap: &v1.ConfigMapVolumeSource{LocalObjectReference: v1.LocalObjectReference{Name: v1alpha1.TlsConfigMapName}}}}
239+
pr.Spec.Workspaces = []tektonpipeline.WorkspaceBinding{{Name: WorkspaceTls, ConfigMap: &v1.ConfigMapVolumeSource{LocalObjectReference: v1.LocalObjectReference{Name: v1alpha1.TlsConfigMapName}}}}
240240
} else {
241-
pr.Spec.Workspaces = []tektonpipeline.WorkspaceBinding{{Name: "tls", EmptyDir: &v1.EmptyDirVolumeSource{}}}
241+
pr.Spec.Workspaces = []tektonpipeline.WorkspaceBinding{{Name: WorkspaceTls, EmptyDir: &v1.EmptyDirVolumeSource{}}}
242242
}
243243
pr.Namespace = db.Namespace
244244
pr.Name = fmt.Sprintf("%s-build-discovery-%d", db.Name, db.Status.PipelineRetries)
@@ -644,11 +644,12 @@ func (r *ReconcileDependencyBuild) handleStateBuilding(ctx context.Context, db *
644644
},
645645
}}
646646
}
647-
if !jbsConfig.Spec.CacheSettings.DisableTLS {
648-
pr.Spec.Workspaces = append(pr.Spec.Workspaces, tektonpipeline.WorkspaceBinding{Name: "tls", ConfigMap: &v1.ConfigMapVolumeSource{LocalObjectReference: v1.LocalObjectReference{Name: v1alpha1.TlsConfigMapName}}})
649-
} else {
650-
pr.Spec.Workspaces = append(pr.Spec.Workspaces, tektonpipeline.WorkspaceBinding{Name: "tls", EmptyDir: &v1.EmptyDirVolumeSource{}})
651-
}
647+
// TODO: DisableTLS defaults to true. Further the tls workspace has been removed from the build pipeline so an alternate method would be needed.
648+
//if !jbsConfig.Spec.CacheSettings.DisableTLS {
649+
// pr.Spec.Workspaces = append(pr.Spec.Workspaces, tektonpipeline.WorkspaceBinding{Name: WorkspaceTls, ConfigMap: &v1.ConfigMapVolumeSource{LocalObjectReference: v1.LocalObjectReference{Name: v1alpha1.TlsConfigMapName}}})
650+
//} else {
651+
// pr.Spec.Workspaces = append(pr.Spec.Workspaces, tektonpipeline.WorkspaceBinding{Name: WorkspaceTls, EmptyDir: &v1.EmptyDirVolumeSource{}})
652+
//}
652653
pr.Spec.Timeouts = &tektonpipeline.TimeoutFields{Pipeline: &v12.Duration{Duration: time.Hour * v1alpha1.DefaultTimeout}}
653654
if err := controllerutil.SetOwnerReference(db, &pr, r.scheme); err != nil {
654655
return reconcile.Result{}, err
@@ -1207,7 +1208,7 @@ func (r *ReconcileDependencyBuild) createLookupBuildInfoPipeline(ctx context.Con
12071208
envVars = append(envVars, v1.EnvVar{Name: "REGISTRY_TOKEN", ValueFrom: &v1.EnvVarSource{SecretKeyRef: &v1.SecretKeySelector{LocalObjectReference: v1.LocalObjectReference{Name: jbsConfig.ImageRegistry().SecretName}, Key: v1alpha1.ImageSecretTokenKey, Optional: &secretOptional}}})
12081209
}
12091210
buildInfoTask := tektonpipeline.TaskSpec{
1210-
Workspaces: []tektonpipeline.WorkspaceDeclaration{{Name: "tls"}},
1211+
Workspaces: []tektonpipeline.WorkspaceDeclaration{{Name: WorkspaceTls}},
12111212
Results: []tektonpipeline.TaskResult{{Name: BuildInfoPipelineResultBuildInfo}},
12121213
Steps: []tektonpipeline.Step{
12131214
{
@@ -1237,12 +1238,12 @@ func (r *ReconcileDependencyBuild) createLookupBuildInfoPipeline(ctx context.Con
12371238
}
12381239
buildInfoTask.Steps[0].Script = artifactbuild.InstallKeystoreIntoBuildRequestProcessor(args)
12391240
return &tektonpipeline.PipelineSpec{
1240-
Workspaces: []tektonpipeline.PipelineWorkspaceDeclaration{{Name: "tls"}},
1241+
Workspaces: []tektonpipeline.PipelineWorkspaceDeclaration{{Name: WorkspaceTls}},
12411242
Results: []tektonpipeline.PipelineResult{{Name: BuildInfoPipelineResultBuildInfo, Value: tektonpipeline.ResultValue{Type: tektonpipeline.ParamTypeString, StringVal: "$(tasks.task.results." + BuildInfoPipelineResultBuildInfo + ")"}}},
12421243
Tasks: []tektonpipeline.PipelineTask{
12431244
{
12441245
Name: "task",
1245-
Workspaces: []tektonpipeline.WorkspacePipelineTaskBinding{{Name: "tls", Workspace: "tls"}},
1246+
Workspaces: []tektonpipeline.WorkspacePipelineTaskBinding{{Name: WorkspaceTls, Workspace: WorkspaceTls}},
12461247
TaskSpec: &tektonpipeline.EmbeddedTask{
12471248
TaskSpec: buildInfoTask,
12481249
},
@@ -1427,9 +1428,9 @@ func (r *ReconcileDependencyBuild) handleStateDeploying(ctx context.Context, db
14271428
pr.Spec.Workspaces = []tektonpipeline.WorkspaceBinding{}
14281429

14291430
if !jbsConfig.Spec.CacheSettings.DisableTLS {
1430-
pr.Spec.Workspaces = append(pr.Spec.Workspaces, tektonpipeline.WorkspaceBinding{Name: "tls", ConfigMap: &v1.ConfigMapVolumeSource{LocalObjectReference: v1.LocalObjectReference{Name: v1alpha1.TlsConfigMapName}}})
1431+
pr.Spec.Workspaces = append(pr.Spec.Workspaces, tektonpipeline.WorkspaceBinding{Name: WorkspaceTls, ConfigMap: &v1.ConfigMapVolumeSource{LocalObjectReference: v1.LocalObjectReference{Name: v1alpha1.TlsConfigMapName}}})
14311432
} else {
1432-
pr.Spec.Workspaces = append(pr.Spec.Workspaces, tektonpipeline.WorkspaceBinding{Name: "tls", EmptyDir: &v1.EmptyDirVolumeSource{}})
1433+
pr.Spec.Workspaces = append(pr.Spec.Workspaces, tektonpipeline.WorkspaceBinding{Name: WorkspaceTls, EmptyDir: &v1.EmptyDirVolumeSource{}})
14331434
}
14341435
pr.Spec.Timeouts = &tektonpipeline.TimeoutFields{Pipeline: &v12.Duration{Duration: time.Hour * v1alpha1.DefaultTimeout}}
14351436
if jbsConfig.Annotations != nil && jbsConfig.Annotations[jbsconfig.TestRegistry] == "true" {

0 commit comments

Comments
 (0)