Skip to content

Commit e2abb8d

Browse files
authored
Merge pull request #313 from 3scale-sre/lib-upgrades
Lib upgrades
2 parents 56c7dac + 0d36845 commit e2abb8d

153 files changed

Lines changed: 7521 additions & 6903 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
build:
10-
runs-on: ubuntu-22.04
10+
runs-on: ubuntu-latest
1111
steps:
1212
- uses: actions/checkout@v4
1313

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.21 as builder
2+
FROM golang:1.24 as builder
33

44
WORKDIR /workspace
55
# Copy the Go Modules manifests

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,10 @@ test/assets/external-apis/crds.yaml: kustomize
116116
echo "---" >> $@ && $(KUSTOMIZE) build config/dependencies/tekton-crds >> $@
117117

118118
test: manifests generate fmt vet envtest assets ginkgo test/assets/external-apis/crds.yaml ## Run tests.
119-
KUBEBUILDER_ASSETS=$(KUBEBUILDER_ASSETS) $(GINKGO) -p -r $(TEST_PKG) -coverprofile cover.out
119+
KUBEBUILDER_ASSETS=$(KUBEBUILDER_ASSETS) $(GINKGO) -p -r -coverprofile cover.out $(TEST_PKG)
120120

121121
test-debug: manifests generate fmt vet envtest assets ginkgo test/assets/external-apis/crds.yaml ## Run tests.
122-
KUBEBUILDER_ASSETS=$(KUBEBUILDER_ASSETS) $(GINKGO) -v -r $(TEST_PKG) -coverprofile cover.out
122+
KUBEBUILDER_ASSETS=$(KUBEBUILDER_ASSETS) $(GINKGO) -v -r -coverprofile cover.out $(TEST_PKG)
123123

124124
TEST_E2E_DEPLOY = marin3r-crds prometheus-crds tekton-crds grafana-crds external-secrets-crds minio
125125
test-e2e: export KUBECONFIG = $(PWD)/kubeconfig
@@ -350,8 +350,8 @@ HELM ?= $(LOCALBIN)/helm
350350

351351
## Tool Versions
352352
KUSTOMIZE_VERSION ?= v5.1.1
353-
CONTROLLER_TOOLS_VERSION ?= v0.11.0
354-
GINKGO_VERSION ?= v2.17.0
353+
CONTROLLER_TOOLS_VERSION ?= v0.17.1
354+
GINKGO_VERSION ?= v2.23.4
355355
CRD_REFDOCS_VERSION ?= v0.0.8
356356
KIND_VERSION ?= v0.16.0
357357
ENVTEST_VERSION ?= release-0.17

api/v1alpha1/apicast_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package v1alpha1
1818

1919
import (
20-
"github.com/3scale-ops/basereconciler/util"
20+
"github.com/3scale-sre/basereconciler/util"
2121
corev1 "k8s.io/api/core/v1"
2222
"k8s.io/apimachinery/pkg/api/resource"
2323
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

api/v1alpha1/autossl_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package v1alpha1
1818

1919
import (
20-
"github.com/3scale-ops/basereconciler/util"
20+
"github.com/3scale-sre/basereconciler/util"
2121
corev1 "k8s.io/api/core/v1"
2222
"k8s.io/apimachinery/pkg/api/resource"
2323
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

api/v1alpha1/backend_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package v1alpha1
1818

1919
import (
20-
"github.com/3scale-ops/basereconciler/util"
20+
"github.com/3scale-sre/basereconciler/util"
2121
corev1 "k8s.io/api/core/v1"
2222
"k8s.io/apimachinery/pkg/api/resource"
2323
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

api/v1alpha1/common_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"reflect"
2323
"time"
2424

25-
"github.com/3scale-ops/basereconciler/util"
25+
"github.com/3scale-sre/basereconciler/util"
2626
jsonpatch "github.com/evanphx/json-patch"
2727
appsv1 "k8s.io/api/apps/v1"
2828
autoscalingv2 "k8s.io/api/autoscaling/v2"

api/v1alpha1/common_types_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"reflect"
2121
"testing"
2222

23-
"github.com/3scale-ops/basereconciler/util"
23+
"github.com/3scale-sre/basereconciler/util"
2424
"github.com/go-test/deep"
2525
corev1 "k8s.io/api/core/v1"
2626
"k8s.io/apimachinery/pkg/api/resource"

api/v1alpha1/corsproxy_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package v1alpha1
1818

1919
import (
20-
"github.com/3scale-ops/basereconciler/util"
20+
"github.com/3scale-sre/basereconciler/util"
2121
corev1 "k8s.io/api/core/v1"
2222
"k8s.io/apimachinery/pkg/api/resource"
2323
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

api/v1alpha1/echoapi_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package v1alpha1
1818

1919
import (
20-
"github.com/3scale-ops/basereconciler/util"
20+
"github.com/3scale-sre/basereconciler/util"
2121
corev1 "k8s.io/api/core/v1"
2222
"k8s.io/apimachinery/pkg/api/resource"
2323
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

0 commit comments

Comments
 (0)