Skip to content

Commit 84283c1

Browse files
committed
Remove more S3 code
1 parent 3d8b1b7 commit 84283c1

File tree

8 files changed

+3
-41
lines changed

8 files changed

+3
-41
lines changed

deploy/crds/base/jvmbuildservice.io_rebuiltartifacts.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
schema:
2323
openAPIV3Schema:
2424
description: RebuiltArtifact An artifact that has been rebuilt and deployed
25-
to S3 or a Container registry
25+
to a Container registry
2626
properties:
2727
apiVersion:
2828
description: |-

java-components/management-console/src/main/java/com/redhat/hacbs/management/dto/BuildAttemptDTO.java

-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ public record BuildAttemptDTO(
3939
int additionalMemory,
4040
String repositories,
4141
String allowedDifferences,
42-
String buildLogsUrl,
4342
String buildPipelineUrl,
4443
String mavenRepository,
4544
boolean successful,
@@ -94,7 +93,6 @@ public static BuildAttemptDTO of(BuildAttempt i) {
9493
i.additionalMemory,
9594
i.repositories,
9695
i.allowedDifferences,
97-
i.buildLogsUrl,
9896
i.buildPipelineUrl,
9997
i.mavenRepository,
10098
i.successful,

java-components/management-console/src/main/java/com/redhat/hacbs/management/model/BuildAttempt.java

-3
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,6 @@ public class BuildAttempt extends PanacheEntity {
6565
@JoinColumn(nullable = false)
6666
public StoredDependencyBuild dependencyBuild;
6767

68-
@OneToMany(cascade = CascadeType.ALL, mappedBy = "build")
69-
public List<BuildFile> storedBuildResults;
70-
7168
@Column(length = -1)
7269
public String upstreamDifferences;
7370

java-components/management-console/src/main/java/com/redhat/hacbs/management/model/BuildFile.java

-24
This file was deleted.

java-components/management-console/src/main/java/com/redhat/hacbs/management/model/S3FileType.java

-8
This file was deleted.

java-components/resource-model/src/main/resources/crds/jvmbuildservice.io_rebuiltartifacts.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
schema:
2323
openAPIV3Schema:
2424
description: RebuiltArtifact An artifact that has been rebuilt and deployed
25-
to S3 or a Container registry
25+
to a Container registry
2626
properties:
2727
apiVersion:
2828
description: |-

pkg/apis/jvmbuildservice/v1alpha1/rebuiltartifact_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ type RebuiltArtifactStatus struct {
1818
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
1919
// +kubebuilder:resource:path=rebuiltartifacts,scope=Namespaced
2020
// +kubebuilder:printcolumn:name="GAV",type=string,JSONPath=`.spec.gav`
21-
// RebuiltArtifact An artifact that has been rebuilt and deployed to S3 or a Container registry
21+
// RebuiltArtifact An artifact that has been rebuilt and deployed to a Container registry
2222
type RebuiltArtifact struct {
2323
metav1.TypeMeta `json:",inline"`
2424
metav1.ObjectMeta `json:"metadata,omitempty"`

pkg/reconciler/util/util.go

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ var (
3434

3535
ImageTag string
3636
ImageRepo string
37-
S3Enabled bool
3837
)
3938

4039
func GetImageName(ctx context.Context, client client.Client, substr, envvar string) (string, error) {

0 commit comments

Comments
 (0)