Skip to content

Commit

Permalink
Merge pull request #235 from mmalina/revert-subpath
Browse files Browse the repository at this point in the history
fix(RHTAPBUGS-691): revert subPath creation in PRs
  • Loading branch information
mmalina authored Aug 16, 2023
2 parents f916c17 + c0e9477 commit 52e55e3
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 16 deletions.
5 changes: 2 additions & 3 deletions controllers/release/adapter.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@ package release
import (
"context"
"fmt"
"strings"

"github.com/redhat-appstudio/operator-toolkit/controller"
"strings"

"github.com/go-logr/logr"
"github.com/redhat-appstudio/release-service/api/v1alpha1"
Expand Down Expand Up @@ -307,7 +306,7 @@ func (a *adapter) createReleasePipelineRun(resources *loader.ProcessingResources
resources.ReleasePlanAdmission, resources.ReleaseStrategy, resources.Snapshot).
WithOwner(a.release).
WithReleaseAndApplicationMetadata(a.release, resources.Snapshot.Spec.Application).
WithReleaseStrategy(resources.ReleaseStrategy, a.release).
WithReleaseStrategy(resources.ReleaseStrategy).
WithEnterpriseContractConfigMap(resources.EnterpriseContractConfigMap).
WithEnterpriseContractPolicy(resources.EnterpriseContractPolicy).
AsPipelineRun()
Expand Down
12 changes: 5 additions & 7 deletions tekton/pipeline_run.go
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ func (r *ReleasePipelineRun) WithReleaseAndApplicationMetadata(release *v1alpha1
}

// WithReleaseStrategy adds Pipeline reference and parameters to the release PipelineRun.
func (r *ReleasePipelineRun) WithReleaseStrategy(strategy *v1alpha1.ReleaseStrategy, release *v1alpha1.Release) *ReleasePipelineRun {
func (r *ReleasePipelineRun) WithReleaseStrategy(strategy *v1alpha1.ReleaseStrategy) *ReleasePipelineRun {
r.Spec.PipelineRef = getPipelineRef(strategy)

valueType := tektonv1beta1.ParamTypeString
Expand All @@ -163,9 +163,9 @@ func (r *ReleasePipelineRun) WithReleaseStrategy(strategy *v1alpha1.ReleaseStrat
}

if strategy.Spec.PersistentVolumeClaim == "" {
r.WithWorkspace(os.Getenv("DEFAULT_RELEASE_WORKSPACE_NAME"), os.Getenv("DEFAULT_RELEASE_PVC"), release.Name)
r.WithWorkspace(os.Getenv("DEFAULT_RELEASE_WORKSPACE_NAME"), os.Getenv("DEFAULT_RELEASE_PVC"))
} else {
r.WithWorkspace(os.Getenv("DEFAULT_RELEASE_WORKSPACE_NAME"), strategy.Spec.PersistentVolumeClaim, release.Name)
r.WithWorkspace(os.Getenv("DEFAULT_RELEASE_WORKSPACE_NAME"), strategy.Spec.PersistentVolumeClaim)
}

r.WithServiceAccount(strategy.Spec.ServiceAccount)
Expand All @@ -182,10 +182,9 @@ func (r *ReleasePipelineRun) WithServiceAccount(serviceAccount string) *ReleaseP
}

// WithWorkspace adds a workspace to the PipelineRun using the given name and PersistentVolumeClaim.
// A subdir consisting of the provided Release name and the PipelineRun uid context variable.
// If any of those values is empty, no workspace will be added.
func (r *ReleasePipelineRun) WithWorkspace(name, persistentVolumeClaim string, releaseName string) *ReleasePipelineRun {
if name == "" || persistentVolumeClaim == "" || releaseName == "" {
func (r *ReleasePipelineRun) WithWorkspace(name, persistentVolumeClaim string) *ReleasePipelineRun {
if name == "" || persistentVolumeClaim == "" {
return r
}

Expand All @@ -194,7 +193,6 @@ func (r *ReleasePipelineRun) WithWorkspace(name, persistentVolumeClaim string, r
PersistentVolumeClaim: &corev1.PersistentVolumeClaimVolumeSource{
ClaimName: persistentVolumeClaim,
},
SubPath: releaseName + "-$(context.pipelineRun.uid)",
})

return r
Expand Down
11 changes: 5 additions & 6 deletions tekton/pipeline_run_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ var _ = Describe("PipelineRun", func() {
})

It("can add the ReleaseStrategy information and bundle resolver if present to a PipelineRun object ", func() {
releasePipelineRun.WithReleaseStrategy(strategy, release)
releasePipelineRun.WithReleaseStrategy(strategy)
Expect(releasePipelineRun.Spec.PipelineRef.ResolverRef).NotTo(Equal(tektonv1beta1.ResolverRef{}))
Expect(releasePipelineRun.Spec.PipelineRef.ResolverRef.Resolver).To(Equal(tektonv1beta1.ResolverName("bundles")))
Expect(releasePipelineRun.Spec.PipelineRef.ResolverRef.Params).To(HaveLen(3))
Expand All @@ -208,10 +208,9 @@ var _ = Describe("PipelineRun", func() {
})

It("can add a workspace to the PipelineRun using the given name and PVC", func() {
releasePipelineRun.WithWorkspace(workspace, persistentVolumeClaim, release.Name)
releasePipelineRun.WithWorkspace(workspace, persistentVolumeClaim)
Expect(releasePipelineRun.Spec.Workspaces).Should(ContainElement(HaveField("Name", Equal(workspace))))
Expect(releasePipelineRun.Spec.Workspaces).Should(ContainElement(HaveField("PersistentVolumeClaim.ClaimName", Equal(persistentVolumeClaim))))
Expect(releasePipelineRun.Spec.Workspaces).Should(ContainElement(HaveField("SubPath", Equal(release.Name+"-$(context.pipelineRun.uid)"))))
})

It("can add the EC task bundle parameter to the PipelineRun", func() {
Expand Down Expand Up @@ -249,7 +248,7 @@ var _ = Describe("PipelineRun", func() {
os.Setenv("DEFAULT_RELEASE_WORKSPACE_NAME", "")
os.Setenv("DEFAULT_RELEASE_PVC", "bar")
strategy.Spec.PersistentVolumeClaim = ""
releasePipelineRun.WithReleaseStrategy(strategy, release)
releasePipelineRun.WithReleaseStrategy(strategy)
Expect(releasePipelineRun.Spec.Workspaces).To(BeNil())
})
})
Expand All @@ -258,7 +257,7 @@ var _ = Describe("PipelineRun", func() {
os.Setenv("DEFAULT_RELEASE_WORKSPACE_NAME", "foo")
os.Setenv("DEFAULT_RELEASE_PVC", "")
strategy.Spec.PersistentVolumeClaim = ""
releasePipelineRun.WithReleaseStrategy(strategy, release)
releasePipelineRun.WithReleaseStrategy(strategy)
Expect(releasePipelineRun.Spec.Workspaces).To(BeNil())
})
})
Expand All @@ -267,7 +266,7 @@ var _ = Describe("PipelineRun", func() {
os.Setenv("DEFAULT_RELEASE_WORKSPACE_NAME", "foo")
os.Setenv("DEFAULT_RELEASE_PVC", "bar")
strategy.Spec.PersistentVolumeClaim = ""
releasePipelineRun.WithReleaseStrategy(strategy, release)
releasePipelineRun.WithReleaseStrategy(strategy)
Expect(releasePipelineRun.Spec.Workspaces).Should(ContainElement(HaveField("Name", Equal("foo"))))
Expect(releasePipelineRun.Spec.Workspaces).Should(ContainElement(HaveField("PersistentVolumeClaim.ClaimName", Equal("bar"))))
})
Expand Down

0 comments on commit 52e55e3

Please sign in to comment.