chore: konflux and k8s packages' versions bump (#1220)

konflux-ci · Jun 12, 2024 · 1df9455 · 1df9455
1 parent b886f12
commit 1df9455
Show file tree

Hide file tree

Showing 23 changed files with 567 additions and 861 deletions.
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/pkg/clients/kubernetes/client.go b/pkg/clients/kubernetes/client.go
@@ -19,11 +19,10 @@ import (
 	routev1 "github.com/openshift/api/route/v1"
 	userv1 "github.com/openshift/api/user/v1"
 	routeclientset "github.com/openshift/client-go/route/clientset/versioned"
-	buildservice "github.com/redhat-appstudio/build-service/api/v1alpha1"
 	jvmbuildservice "github.com/redhat-appstudio/jvm-build-service/pkg/apis/jvmbuildservice/v1alpha1"
 	jvmbuildserviceclientset "github.com/redhat-appstudio/jvm-build-service/pkg/client/clientset/versioned"
 
-	release "github.com/redhat-appstudio/release-service/api/v1alpha1"
+	release "github.com/konflux-ci/release-service/api/v1alpha1"
 	rs "github.com/redhat-appstudio/remote-secret/api/v1beta1"
 	spi "github.com/redhat-appstudio/service-provider-integration-operator/api/v1beta1"
 	tekton "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
@@ -79,7 +78,6 @@ func init() {
 	utilruntime.Must(integrationservicev1beta1.AddToScheme(scheme))
 	utilruntime.Must(jvmbuildservice.AddToScheme(scheme))
 	utilruntime.Must(ecp.AddToScheme(scheme))
-	utilruntime.Must(buildservice.AddToScheme(scheme))
 	utilruntime.Must(userv1.AddToScheme(scheme))
 	utilruntime.Must(rs.AddToScheme(scheme))
 	utilruntime.Must(imagecontroller.AddToScheme(scheme))

diff --git a/pkg/clients/release/plans.go b/pkg/clients/release/plans.go
@@ -4,11 +4,11 @@ import (
 	"context"
 	"strconv"
 
-	"github.com/redhat-appstudio/release-service/tekton/utils"
+	"github.com/konflux-ci/release-service/tekton/utils"
 	"k8s.io/apimachinery/pkg/runtime"
 
-	releaseApi "github.com/redhat-appstudio/release-service/api/v1alpha1"
-	releaseMetadata "github.com/redhat-appstudio/release-service/metadata"
+	releaseApi "github.com/konflux-ci/release-service/api/v1alpha1"
+	releaseMetadata "github.com/konflux-ci/release-service/metadata"
 	k8sErrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"

diff --git a/pkg/clients/release/releases.go b/pkg/clients/release/releases.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/konflux-ci/e2e-tests/pkg/constants"
 	"github.com/konflux-ci/e2e-tests/pkg/utils/tekton"
+	releaseApi "github.com/konflux-ci/release-service/api/v1alpha1"
 	. "github.com/onsi/ginkgo/v2"
-	releaseApi "github.com/redhat-appstudio/release-service/api/v1alpha1"
 	pipeline "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
 	corev1 "k8s.io/api/core/v1"
 	rbac "k8s.io/api/rbac/v1"

diff --git a/pkg/clients/release/sbom.go b/pkg/clients/release/sbom.go
@@ -4,7 +4,7 @@ When SBOM components are uploaded to Pyxis, key names have to be modified
 to conform to GraphQL naming conventions.
 1. Use _ instead of camel case, e.g. camelCase -> camel_case
 2. Use _ instead of -, e.g. key-with-dash -> key_with_dash
-See https://github.com/redhat-appstudio/release-service-utils/blob/main/pyxis/upload_sbom.py
+See https://github.com/konflux-ci/release-service-utils/blob/main/pyxis/upload_sbom.py
 
 */
 

diff --git a/pkg/clients/tekton/persistent_volume_claims.go b/pkg/clients/tekton/persistent_volume_claims.go
@@ -19,7 +19,7 @@ func (t *TektonController) CreatePVCInAccessMode(name, namespace string, accessM
 			AccessModes: []corev1.PersistentVolumeAccessMode{
 				accessMode,
 			},
-			Resources: corev1.ResourceRequirements{
+			Resources: corev1.VolumeResourceRequirements{
 				Requests: corev1.ResourceList{
 					corev1.ResourceStorage: resource.MustParse("1Gi"),
 				},

diff --git a/pkg/utils/tekton/bundle.go b/pkg/utils/tekton/bundle.go
@@ -6,6 +6,7 @@ import (
 	"io"
 	"net/http"
 	"os"
+	"time"
 
 	"github.com/google/go-containerregistry/pkg/authn"
 	"github.com/google/go-containerregistry/pkg/name"
@@ -43,7 +44,7 @@ func ExtractTektonObjectFromBundle(bundleRef, kind, name string) (runtime.Object
 
 // BuildAndPushTektonBundle builds a Tekton bundle from YAML and pushes to remote container registry
 func BuildAndPushTektonBundle(YamlContent []byte, ref name.Reference, remoteOption remoteimg.Option) error {
-	img, err := bundle.BuildTektonBundle([]string{string(YamlContent)}, os.Stdout)
+	img, err := bundle.BuildTektonBundle([]string{string(YamlContent)}, map[string]string{}, time.Now(), os.Stdout)
 	if err != nil {
 		return fmt.Errorf("error when building a bundle %s: %v", ref.String(), err)
 	}

diff --git a/pkg/utils/tekton/persistent_volume_claims.go b/pkg/utils/tekton/persistent_volume_claims.go
@@ -19,7 +19,7 @@ func CreatePVC(pvcs v1.PersistentVolumeClaimInterface, pvcName string) error {
 			AccessModes: []corev1.PersistentVolumeAccessMode{
 				corev1.ReadWriteOnce,
 			},
-			Resources: corev1.ResourceRequirements{
+			Resources: corev1.VolumeResourceRequirements{
 				Requests: corev1.ResourceList{
 					corev1.ResourceStorage: resource.MustParse("1Gi"),
 				},

diff --git a/tests/README.md b/tests/README.md
@@ -4,11 +4,11 @@ Tests folder contains E2E related to several components divided in folders:
 
 | Folder | Component repository | README | Note |
 |---|---|---|---|
-| `build` | [build-service](https://github.com/redhat-appstudio/build-service), [jvm-build-service](https://github.com/redhat-appstudio/jvm-build-service) | [README.md](/tests/build/README.md) | |
+| `build` | [build-service](https://github.com/konflux-ci/build-service), [jvm-build-service](https://github.com/redhat-appstudio/jvm-build-service) | [README.md](/tests/build/README.md) | |
 | `enterprise-contract` | N/A | [README.md](/tests/enterprise-contract/README.md) | |
 | `integration-service` | [integration-service](https://github.com/konflux-ci/integration-service) | [README.md](/tests/integration-service/README.md) |  |
 | `load-tests` | N/A | [LoadTests.md](/docs/LoadTests.md) |  |
-| `release` | [release-service](https://github.com/redhat-appstudio/release-service) | [README.md](/tests/release/README.md) |  |
+| `release` | [release-service](https://github.com/konflux-ci/release-service) | [README.md](/tests/release/README.md) |  |
 | `remote-secret` | [remote-secret](https://github.com/redhat-appstudio/remote-secret) | [README.md](/tests/remote-secret/README.md) | |
 | `rhtap-demo` | N/A | [README.md](/tests/rhtap-demo/README.md) | |
 | `spi` | [service-provider-integration-operator](https://github.com/redhat-appstudio/service-provider-integration-operator) | [README.md](/tests/spi/README.md) | |

diff --git a/tests/build/build.go b/tests/build/build.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	tektonutils "github.com/redhat-appstudio/release-service/tekton/utils"
+	tektonutils "github.com/konflux-ci/release-service/tekton/utils"
 	"k8s.io/apimachinery/pkg/runtime"
 
 	"github.com/google/go-github/v44/github"
@@ -23,12 +23,12 @@ import (
 	k8sErrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
+	"github.com/konflux-ci/build-service/controllers"
 	"github.com/konflux-ci/e2e-tests/pkg/framework"
 	releasecommon "github.com/konflux-ci/e2e-tests/tests/release"
 	imagecontollers "github.com/konflux-ci/image-controller/controllers"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"github.com/redhat-appstudio/build-service/controllers"
 	v1 "k8s.io/api/core/v1"
 )
 

diff --git a/tests/release/pipelines/fbc_release.go b/tests/release/pipelines/fbc_release.go
@@ -13,10 +13,10 @@ import (
 	"github.com/konflux-ci/e2e-tests/pkg/utils"
 	"github.com/konflux-ci/e2e-tests/pkg/utils/tekton"
 	releasecommon "github.com/konflux-ci/e2e-tests/tests/release"
+	releaseapi "github.com/konflux-ci/release-service/api/v1alpha1"
+	tektonutils "github.com/konflux-ci/release-service/tekton/utils"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	releaseapi "github.com/redhat-appstudio/release-service/api/v1alpha1"
-	tektonutils "github.com/redhat-appstudio/release-service/tekton/utils"
 	tektonv1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"knative.dev/pkg/apis"

diff --git a/tests/release/pipelines/push_to_external_registry.go b/tests/release/pipelines/push_to_external_registry.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	tektonutils "github.com/redhat-appstudio/release-service/tekton/utils"
+	tektonutils "github.com/konflux-ci/release-service/tekton/utils"
 	"k8s.io/apimachinery/pkg/runtime"
 
 	ecp "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1"
@@ -16,9 +16,9 @@ import (
 	"github.com/konflux-ci/e2e-tests/pkg/utils"
 	"github.com/konflux-ci/e2e-tests/pkg/utils/contract"
 	releasecommon "github.com/konflux-ci/e2e-tests/tests/release"
+	releaseApi "github.com/konflux-ci/release-service/api/v1alpha1"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	releaseApi "github.com/redhat-appstudio/release-service/api/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
 )
 

diff --git a/tests/release/pipelines/release_to_github.go b/tests/release/pipelines/release_to_github.go
@@ -15,10 +15,10 @@ import (
 	"github.com/konflux-ci/e2e-tests/pkg/utils"
 	"github.com/konflux-ci/e2e-tests/pkg/utils/tekton"
 	releasecommon "github.com/konflux-ci/e2e-tests/tests/release"
+	releaseapi "github.com/konflux-ci/release-service/api/v1alpha1"
+	tektonutils "github.com/konflux-ci/release-service/tekton/utils"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	releaseapi "github.com/redhat-appstudio/release-service/api/v1alpha1"
-	tektonutils "github.com/redhat-appstudio/release-service/tekton/utils"
 	tektonv1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"

diff --git a/tests/release/pipelines/rh_advisories.go b/tests/release/pipelines/rh_advisories.go
@@ -16,10 +16,10 @@ import (
 	"github.com/konflux-ci/e2e-tests/pkg/utils"
 	"github.com/konflux-ci/e2e-tests/pkg/utils/tekton"
 	releasecommon "github.com/konflux-ci/e2e-tests/tests/release"
+	releaseapi "github.com/konflux-ci/release-service/api/v1alpha1"
+	tektonutils "github.com/konflux-ci/release-service/tekton/utils"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	releaseapi "github.com/redhat-appstudio/release-service/api/v1alpha1"
-	tektonutils "github.com/redhat-appstudio/release-service/tekton/utils"
 	tektonv1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/tests/release/pipelines/rh_push_to_external_registry.go b/tests/release/pipelines/rh_push_to_external_registry.go
@@ -16,10 +16,10 @@ import (
 	"github.com/konflux-ci/e2e-tests/pkg/utils"
 	"github.com/konflux-ci/e2e-tests/pkg/utils/contract"
 	releasecommon "github.com/konflux-ci/e2e-tests/tests/release"
+	releaseApi "github.com/konflux-ci/release-service/api/v1alpha1"
+	tektonutils "github.com/konflux-ci/release-service/tekton/utils"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	releaseApi "github.com/redhat-appstudio/release-service/api/v1alpha1"
-	tektonutils "github.com/redhat-appstudio/release-service/tekton/utils"
 	pipeline "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 

diff --git a/tests/release/pipelines/rh_push_to_redhat_io.go b/tests/release/pipelines/rh_push_to_redhat_io.go
@@ -16,10 +16,10 @@ import (
 	"github.com/konflux-ci/e2e-tests/pkg/utils"
 	"github.com/konflux-ci/e2e-tests/pkg/utils/tekton"
 	releasecommon "github.com/konflux-ci/e2e-tests/tests/release"
+	releaseapi "github.com/konflux-ci/release-service/api/v1alpha1"
+	tektonutils "github.com/konflux-ci/release-service/tekton/utils"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	releaseapi "github.com/redhat-appstudio/release-service/api/v1alpha1"
-	tektonutils "github.com/redhat-appstudio/release-service/tekton/utils"
 	tektonv1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"

diff --git a/tests/release/service/README.md b/tests/release/service/README.md
@@ -1,6 +1,6 @@
 # Release Service e2e tests suite
 
-Contains E2E tests related to [Release Service](https://github.com/redhat-appstudio/release-service).
+Contains E2E tests related to [Release Service](https://github.com/konflux-ci/release-service).
 
 The test cases in this suite are to test release-service functionalities.
 All tests must have the label `release-service`. 

diff --git a/tests/release/service/happy_path.go b/tests/release/service/happy_path.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	tektonutils "github.com/redhat-appstudio/release-service/tekton/utils"
+	tektonutils "github.com/konflux-ci/release-service/tekton/utils"
 	"k8s.io/apimachinery/pkg/runtime"
 
 	ecp "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1"
@@ -16,9 +16,9 @@ import (
 	"github.com/konflux-ci/e2e-tests/pkg/utils/contract"
 	"github.com/konflux-ci/e2e-tests/pkg/utils/tekton"
 	releasecommon "github.com/konflux-ci/e2e-tests/tests/release"
+	releaseApi "github.com/konflux-ci/release-service/api/v1alpha1"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	releaseApi "github.com/redhat-appstudio/release-service/api/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
 )
 

diff --git a/tests/release/service/missing_release_plan_and_admission.go b/tests/release/service/missing_release_plan_and_admission.go
@@ -4,16 +4,16 @@ import (
 	"strings"
 
 	"github.com/konflux-ci/application-api/api/v1alpha1"
-	tektonutils "github.com/redhat-appstudio/release-service/tekton/utils"
+	tektonutils "github.com/konflux-ci/release-service/tekton/utils"
 
 	releasecommon "github.com/konflux-ci/e2e-tests/tests/release"
 
 	"github.com/konflux-ci/e2e-tests/pkg/constants"
 	"github.com/konflux-ci/e2e-tests/pkg/framework"
 	"github.com/konflux-ci/e2e-tests/pkg/utils"
+	releaseApi "github.com/konflux-ci/release-service/api/v1alpha1"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	releaseApi "github.com/redhat-appstudio/release-service/api/v1alpha1"
 )
 
 var _ = framework.ReleaseServiceSuiteDescribe("[HACBS-2360] Release CR fails when missing ReleasePlan and ReleasePlanAdmission.", Label("release-service", "release-neg", "negMissingReleasePlan", "HACBS"), func() {

diff --git a/tests/release/service/release_plan_and_admission_matched.go b/tests/release/service/release_plan_and_admission_matched.go
@@ -3,15 +3,15 @@ package service
 import (
 	"fmt"
 
-	tektonutils "github.com/redhat-appstudio/release-service/tekton/utils"
+	tektonutils "github.com/konflux-ci/release-service/tekton/utils"
 	"k8s.io/apimachinery/pkg/api/meta"
 
 	"github.com/konflux-ci/e2e-tests/pkg/framework"
 	"github.com/konflux-ci/e2e-tests/pkg/utils"
 	releasecommon "github.com/konflux-ci/e2e-tests/tests/release"
+	releaseApi "github.com/konflux-ci/release-service/api/v1alpha1"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	releaseApi "github.com/redhat-appstudio/release-service/api/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 

diff --git a/tests/release/service/release_plan_owner_ref.go b/tests/release/service/release_plan_owner_ref.go
@@ -11,7 +11,7 @@ import (
 	"github.com/konflux-ci/e2e-tests/pkg/framework"
 	"github.com/konflux-ci/e2e-tests/pkg/utils"
 	releasecommon "github.com/konflux-ci/e2e-tests/tests/release"
-	releaseApi "github.com/redhat-appstudio/release-service/api/v1alpha1"
+	releaseApi "github.com/konflux-ci/release-service/api/v1alpha1"
 )
 
 var _ = framework.ReleaseServiceSuiteDescribe("[HACBS-2469]test-releaseplan-owner-ref-added", Label("release-service", "releaseplan-ownerref", "HACBS"), func() {

diff --git a/tests/rhtap-demo/rhtap-demo.go b/tests/rhtap-demo/rhtap-demo.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"time"
 
-	buildcontrollers "github.com/redhat-appstudio/build-service/controllers"
-	tektonutils "github.com/redhat-appstudio/release-service/tekton/utils"
+	buildcontrollers "github.com/konflux-ci/build-service/controllers"
+	tektonutils "github.com/konflux-ci/release-service/tekton/utils"
 
 	"github.com/redhat-appstudio/jvm-build-service/openshift-with-appstudio-test/e2e"
 	jvmclientSet "github.com/redhat-appstudio/jvm-build-service/pkg/client/clientset/versioned"
@@ -34,7 +34,7 @@ import (
 
 	releasecommon "github.com/konflux-ci/e2e-tests/tests/release"
 	integrationv1beta1 "github.com/konflux-ci/integration-service/api/v1beta1"
-	releaseApi "github.com/redhat-appstudio/release-service/api/v1alpha1"
+	releaseApi "github.com/konflux-ci/release-service/api/v1alpha1"
 	tektonapi "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
 
 	e2eConfig "github.com/konflux-ci/e2e-tests/tests/rhtap-demo/config"