Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: 1.25.x
go-version: 1.26.x
cache: true
check-latest: true
- name: Build
Expand All @@ -37,7 +37,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: 1.25.x
go-version: 1.26.x
cache: true
check-latest: true
- name: Verify fmt
Expand All @@ -61,7 +61,7 @@ jobs:
# Kubernetes version must match a built KinD node image.
# See release notes in https://github.com/kubernetes-sigs/kind/releases for supported
# node image versions.
- v1.33.1
- v1.36.1
max-parallel: 2
runs-on: ubuntu-latest
steps:
Expand All @@ -70,7 +70,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: 1.25.x
go-version: 1.26.x
cache: true
check-latest: true
- name: Install kubectl
Expand All @@ -82,7 +82,7 @@ jobs:
- name: Create KinD cluster
uses: helm/kind-action@v1
with:
version: v0.31.0
version: v0.32.0
node_image: kindest/node:${{ matrix.kubernetes }}
cluster_name: kind
config: test/kind/config.yaml
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# To re-generate a bundle for another specific version without changing the standard setup, you can:
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
VERSION ?= 0.19.1
VERSION ?= 0.20.0

# CHANNELS define the bundle channels used in the bundle.
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
Expand Down Expand Up @@ -70,7 +70,7 @@ endif
# Image URL to use all building/pushing image targets
IMG ?= $(IMAGE_TAG_BASE):$(TAG)
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
ENVTEST_K8S_VERSION = 1.34
ENVTEST_K8S_VERSION = 1.36

# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
ifeq (,$(shell go env GOBIN))
Expand Down
14 changes: 12 additions & 2 deletions api/v1alpha1/groupversion_info.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,27 @@
package v1alpha1

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"sigs.k8s.io/controller-runtime/pkg/scheme"
)

var (
// GroupVersion is group version used to register these objects
GroupVersion = schema.GroupVersion{Group: "operator.shipwright.io", Version: "v1alpha1"}

// SchemeBuilder is used to add go types to the GroupVersionKind scheme
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)

// AddToScheme adds the types in this group-version to the given scheme.
AddToScheme = SchemeBuilder.AddToScheme
)

func addKnownTypes(s *runtime.Scheme) error {
s.AddKnownTypes(GroupVersion,
&ShipwrightBuild{},
&ShipwrightBuildList{},
)
metav1.AddToGroupVersion(s, GroupVersion)
return nil
}
5 changes: 0 additions & 5 deletions api/v1alpha1/shipwrightbuild_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,6 @@ type ShipwrightBuildList struct {
Items []ShipwrightBuild `json:"items"`
}

// init registers the current Schema on the Scheme Builder during initialization.
func init() {
SchemeBuilder.Register(&ShipwrightBuild{}, &ShipwrightBuildList{})
}

// IsReady returns true the Ready condition status is True
func (status ShipwrightBuildStatus) IsReady() bool {
for _, condition := range status.Conditions {
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ metadata:
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
repository: https://github.com/shipwright-io/operator
support: The Shipwright Contributors
name: shipwright-operator.v0.19.1
name: shipwright-operator.v0.20.0
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -767,8 +767,8 @@ spec:
- email: shipwright-dev@lists.shipwright.io
name: The Shipwright Contributors
maturity: alpha
minKubeVersion: 1.32.0
minKubeVersion: 1.34.0
provider:
name: The Shipwright Contributors
url: https://shipwright.io
version: 0.19.1
version: 0.20.0
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ spec:
- email: shipwright-dev@lists.shipwright.io
name: The Shipwright Contributors
maturity: alpha
minKubeVersion: 1.32.0
minKubeVersion: 1.34.0
provider:
name: The Shipwright Contributors
url: https://shipwright.io
Expand Down
110 changes: 60 additions & 50 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,39 +1,38 @@
module github.com/shipwright-io/operator

go 1.25.6
go 1.26.3

require (
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
github.com/go-logr/logr v1.4.3
github.com/manifestival/controller-runtime-client v0.4.0
github.com/manifestival/manifestival v0.7.2
github.com/onsi/ginkgo/v2 v2.28.1
github.com/onsi/gomega v1.39.1
github.com/shipwright-io/build v0.19.0
github.com/onsi/ginkgo/v2 v2.31.0
github.com/onsi/gomega v1.42.0
github.com/shipwright-io/build v0.20.0
github.com/tektoncd/operator v0.77.0
go.yaml.in/yaml/v3 v3.0.4
k8s.io/api v0.35.1
k8s.io/apiextensions-apiserver v0.34.4
k8s.io/apimachinery v0.35.1
k8s.io/api v0.36.1
k8s.io/apiextensions-apiserver v0.36.1
k8s.io/apimachinery v0.36.1
// go mod tidy forces this to v1.5.2
k8s.io/client-go v1.5.2
knative.dev/pkg v0.0.0-20250424013628-d5e74d29daa3
sigs.k8s.io/controller-runtime v0.22.5
knative.dev/pkg v0.0.0-20260318013857-98d5a706d4fd
sigs.k8s.io/controller-runtime v0.24.1
)

require (
contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20230502190836-7399e0f8ee5e // indirect
contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
github.com/Masterminds/semver/v3 v3.4.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blendle/zapdriver v1.3.1 // indirect
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
github.com/fsnotify/fsnotify v1.9.0 // indirect
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.22.4 // indirect
github.com/go-openapi/jsonreference v0.21.4 // indirect
Expand All @@ -50,15 +49,11 @@ require (
github.com/go-openapi/swag/typeutils v0.25.4 // indirect
github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/gnostic-models v0.7.0 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect
github.com/google/pprof v0.0.0-20260402051712-545e8a4df936 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
github.com/hashicorp/golang-lru v1.0.2 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kelseyhightower/envconfig v1.4.0 // indirect
Expand All @@ -73,41 +68,52 @@ require (
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.23.2 // indirect
github.com/prometheus/client_model v0.6.2 // indirect
github.com/prometheus/common v0.66.1 // indirect
github.com/prometheus/procfs v0.16.1 // indirect
github.com/prometheus/statsd_exporter v0.28.0 // indirect
github.com/prometheus/common v0.67.5 // indirect
github.com/prometheus/otlptranslator v1.0.0 // indirect
github.com/prometheus/procfs v0.20.1 // indirect
github.com/spf13/pflag v1.0.10 // indirect
github.com/tektoncd/pipeline v1.9.1 // indirect
github.com/tektoncd/pipeline v1.12.0 // indirect
github.com/tektoncd/triggers v0.32.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/otel v1.43.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.43.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.43.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.43.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.65.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.43.0 // indirect
go.opentelemetry.io/otel/metric v1.43.0 // indirect
go.opentelemetry.io/otel/sdk v1.43.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.43.0 // indirect
go.opentelemetry.io/otel/trace v1.43.0 // indirect
go.opentelemetry.io/proto/otlp v1.10.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.1 // indirect
go.yaml.in/yaml/v2 v2.4.3 // indirect
golang.org/x/mod v0.33.0 // indirect
golang.org/x/net v0.51.0 // indirect
golang.org/x/oauth2 v0.35.0 // indirect
golang.org/x/sync v0.19.0 // indirect
golang.org/x/sys v0.41.0 // indirect
golang.org/x/term v0.40.0 // indirect
golang.org/x/text v0.34.0 // indirect
go.uber.org/zap v1.28.0 // indirect
go.yaml.in/yaml/v2 v2.4.4 // indirect
golang.org/x/mod v0.35.0 // indirect
golang.org/x/net v0.55.0 // indirect
golang.org/x/oauth2 v0.36.0 // indirect
golang.org/x/sync v0.20.0 // indirect
golang.org/x/sys v0.45.0 // indirect
golang.org/x/term v0.43.0 // indirect
golang.org/x/text v0.37.0 // indirect
golang.org/x/time v0.14.0 // indirect
golang.org/x/tools v0.42.0 // indirect
golang.org/x/tools v0.44.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
google.golang.org/api v0.237.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8 // indirect
google.golang.org/grpc v1.77.0 // indirect
google.golang.org/protobuf v1.36.11 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 // indirect
google.golang.org/grpc v1.80.0 // indirect
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af // indirect
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
k8s.io/klog/v2 v2.140.0 // indirect
k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a // indirect
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 // indirect
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.2 // indirect
sigs.k8s.io/yaml v1.6.0 // indirect
)

Expand All @@ -122,17 +128,21 @@ require (
// go module version standardization (v0.y.z, with y and z representing the k8s 1.y.z minor/patch
// versions). `go mod tidy` will often overwrite the desired client-go version to v1.5.2, so we
// pin the version here.
replace k8s.io/client-go => k8s.io/client-go v0.34.4
replace k8s.io/client-go => k8s.io/client-go v0.36.1

// openshift packages pulled in by tektoncd/operator use structured-merge-diff/v4, which is
// incompatible with k8s 1.34+ (structured-merge-diff/v6). Pin to newer versions that use v6.
// The openshift @latest targets k8s 1.35, so we also pin k8s.io/api and k8s.io/apimachinery
// to prevent MVS from upgrading them beyond 1.34.
// The openshift @latest targets k8s 1.36, so we also pin k8s.io/api and k8s.io/apimachinery
// to prevent MVS from upgrading them beyond 1.36.
//
// knative.dev/pkg @latest removed metrics and tracing/config packages that tektoncd/triggers
// still imports transitively. Pin to the version compatible with our dependency set.
replace (
github.com/openshift/api => github.com/openshift/api v0.0.0-20260302174620-dcac36b908db
github.com/openshift/apiserver-library-go => github.com/openshift/apiserver-library-go v0.0.0-20260123124658-a67c1b7813a4
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20260302182750-20813ce71ca6
k8s.io/api => k8s.io/api v0.34.4
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.34.4
k8s.io/apimachinery => k8s.io/apimachinery v0.34.4
k8s.io/api => k8s.io/api v0.36.1
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.36.1
k8s.io/apimachinery => k8s.io/apimachinery v0.36.1
knative.dev/pkg => knative.dev/pkg v0.0.0-20251224022817-f2b9f9c3f2ca
)
Loading
Loading