diff --git a/go.mod b/go.mod index fd15696..6df402c 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/opencontainers/go-digest v1.0.0 github.com/opencontainers/image-spec v1.1.1 github.com/operator-framework/api v0.46.0 - github.com/operator-framework/operator-controller v1.12.1-0.20261111152305-9dd683afa190 + github.com/operator-framework/operator-controller v1.12.1-0.20261113164318-dae9b613163a github.com/spf13/cobra v1.10.2 github.com/stretchr/testify v1.12.1 go.podman.io/image/v5 v5.42.0 @@ -77,7 +77,6 @@ require ( github.com/google/go-containerregistry v0.22.1 // indirect github.com/google/uuid v1.6.0 // indirect github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect - github.com/hashicorp/go-uuid v1.0.3 // indirect github.com/ianlancetaylor/demangle v0.0.0-20240805132620-81f5be970eca // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -97,14 +96,14 @@ require ( github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/opencontainers/runtime-spec v1.3.0 // indirect - github.com/pandatix/go-abnf v0.5.1 // indirect + github.com/pandatix/go-abnf v0.5.3 // indirect github.com/peterbourgon/diskv v2.0.1+incompatible // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/proglottis/gpgme v0.1.6 // indirect github.com/prometheus/client_golang v1.25.0 // indirect github.com/prometheus/client_model v0.6.3 // indirect - github.com/prometheus/common v0.73.0 // indirect + github.com/prometheus/common v0.73.1 // indirect github.com/prometheus/procfs v0.22.0 // indirect github.com/santhosh-tekuri/jsonschema/v6 v6.0.3 // indirect github.com/secure-systems-lab/go-securesystemslib v0.11.1 // indirect @@ -112,7 +111,7 @@ require ( github.com/sigstore/protobuf-specs v0.5.2 // indirect github.com/sigstore/sigstore v1.10.11 // indirect github.com/sirupsen/logrus v1.10.2 // indirect - github.com/spf13/pflag v1.0.10 // indirect + github.com/spf13/pflag v1.1.0 // indirect github.com/tetratelabs/wabin v0.0.0-20230304001439-f6f874872834 // indirect github.com/tetratelabs/wazero v1.12.0 // indirect github.com/ulikunitz/xz v0.5.17 // indirect diff --git a/go.sum b/go.sum index 293c5a8..618bddf 100644 --- a/go.sum +++ b/go.sum @@ -206,8 +206,6 @@ github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5T github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA= github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 h1:5VipnvEpbqr2gA2VbM+nYVbkIF28c5ZQfqCBQ5g2xfk= github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0/go.mod h1:Hyl3n6Twe1hvtd9XUXDec4pTvgMSEixRuQKPTMH2bNs= -github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= -github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c= github.com/hashicorp/golang-lru/arc/v2 v2.0.5 h1:l2zaLDubNhW4XO3LnliVj0GXO3+/CGNJAg1dcN2Fpfw= github.com/hashicorp/golang-lru/arc/v2 v2.0.5/go.mod h1:ny6zBSQZi2JxIeYcv7kt2sH2PXJtirBN7RDhRpxPkxU= @@ -265,10 +263,10 @@ github.com/opencontainers/runtime-spec v1.3.0 h1:YZupQUdctfhpZy3TM39nN9Ika5CBWT5 github.com/opencontainers/runtime-spec v1.3.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/operator-framework/api v0.46.0 h1:EitSlfRJZKYDewTK+ntH9L/p+NIKv/L1PgRoaIWH+to= github.com/operator-framework/api v0.46.0/go.mod h1:oFXzh7rHCnMwC6N0B92NEsfQyLGJ7FrceAYemjwoKPI= -github.com/operator-framework/operator-controller v1.12.1-0.20261111152305-9dd683afa190 h1:Ei8X96MuWB44u6rQLTD3hEjrglf0XLBHh+S58gfrv5U= -github.com/operator-framework/operator-controller v1.12.1-0.20261111152305-9dd683afa190/go.mod h1:v1y3MkrEMhVlaqqlixF0jwIseBxQvOc06hAreXMWLmQ= -github.com/pandatix/go-abnf v0.5.1 h1:iyLvSu2Aq12iE0r4n948Qw21BHDuckLq/8WIXAAF+HI= -github.com/pandatix/go-abnf v0.5.1/go.mod h1:VBmbtpFgQNEaQpyAvmi+Ecd9wAYJKzA3TmiB3L93sVg= +github.com/operator-framework/operator-controller v1.12.1-0.20261113164318-dae9b613163a h1:G1uj0WY/3SeDSDCrfs37stH1G6RxirGGrVHClWdIuM8= +github.com/operator-framework/operator-controller v1.12.1-0.20261113164318-dae9b613163a/go.mod h1:Y7iM6G/9YpU67cGtvYYbYi1kht6A1FGts9kiGApModM= +github.com/pandatix/go-abnf v0.5.3 h1:LA9AaxAqwzdxfDe7+HIGUB6tzx2N6wYVEAChmfsoPgo= +github.com/pandatix/go-abnf v0.5.3/go.mod h1:AE0KD3/VNoCjGzc1gqetRKshbI4SYErXQ/8kPenR5mc= github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -283,8 +281,8 @@ github.com/prometheus/client_golang v1.25.0/go.mod h1:j2X/4/kaQHLPnmyEU8zjmkndo1 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.6.3 h1:O0jaTVAYNxTHYInEPFJt5I3+sN8zqBtVMPTB1qyxiEo= github.com/prometheus/client_model v0.6.3/go.mod h1:gpN5P9S7Rr6Yr92PiQ+Ixvhf6JZEkF1dnxsYL2aPBEM= -github.com/prometheus/common v0.73.0 h1:NGIOmVi8jrgiiPQgXxD6rP0FfxFsuZxnMQkel0qBy/g= -github.com/prometheus/common v0.73.0/go.mod h1:Nt+CsVkf/mj4wDAmtSwq1HTPohHSX6fMr6+/f9B5UqM= +github.com/prometheus/common v0.73.1 h1:SZWh/j4AvhCdhX8jvYSnxvPxhWlC9QZkjJ+tOrEr7kU= +github.com/prometheus/common v0.73.1/go.mod h1:I9aA/Ukz9s1olOobh8KtCkU7B1mQPQsB9UvQPsUQ1Dk= github.com/prometheus/otlptranslator v1.0.0 h1:s0LJW/iN9dkIH+EnhiD3BlkkP5QVIUVEoIwkU+A6qos= github.com/prometheus/otlptranslator v1.0.0/go.mod h1:vRYWnXvI6aWGpsdY/mOT/cbeVRBlPWtBNDb7kGR3uKM= github.com/prometheus/procfs v0.22.0 h1:6q9+/JL9IKAPbCmBrv9n5O5Ty3NKnciV5X7YGw0oics= @@ -313,8 +311,8 @@ github.com/sirupsen/logrus v1.10.2/go.mod h1:SLEg8TqYulVKKfIGHldVp2K2aYz2DKSVBq4 github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU= github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4= github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= -github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/pflag v1.1.0 h1:6W6MbVUrnMb8PEhjkqwsVLY7ryuzRfFHF4mQd7L94ag= +github.com/spf13/pflag v1.1.0/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= diff --git a/migration.mk b/migration.mk index 2c4bf94..9d565b3 100644 --- a/migration.mk +++ b/migration.mk @@ -20,7 +20,7 @@ E2E_FIXTURE_KUBECONFIG ?= $(ROOT_DIR)/.kubeconfig/library-olm-fixture-e2e # Pin controllers used by the E2E cluster. Override only to test a # compatibility candidate; do not use "latest" in CI. OLM_V0_VERSION ?= v0.46.0 -OLM_V1_COMMIT ?= 9dd683afa190a67bc6c719abbafa97faa2d68b96 +OLM_V1_COMMIT ?= dae9b613163a8fc5df36e3b9ad5a770a64c0048c OLM_V0_CRDS ?= https://github.com/operator-framework/operator-lifecycle-manager/releases/download/$(OLM_V0_VERSION)/crds.yaml OLM_V0_MANIFEST ?= https://github.com/operator-framework/operator-lifecycle-manager/releases/download/$(OLM_V0_VERSION)/olm.yaml E2E_REAL_OPERATOR_MANIFEST ?= $(ROOT_DIR)/test/e2e/migration/real-operator.yaml diff --git a/migration/pkg/migration/rollback_recovery_test.go b/migration/pkg/migration/rollback_recovery_test.go index 69954e6..60a0b94 100644 --- a/migration/pkg/migration/rollback_recovery_test.go +++ b/migration/pkg/migration/rollback_recovery_test.go @@ -519,7 +519,7 @@ func TestRollbackSnapshotAllowsVerifiedSiblingHandoff(t *testing.T) { t.Run(scenario.name, func(t *testing.T) { ctx := context.Background() manifest := unstructured.Unstructured{Object: map[string]interface{}{"apiVersion": "v1", "kind": "ConfigMap", "metadata": map[string]interface{}{"name": "config", "namespace": "source"}}} - first := ocv1.ClusterObjectSet{ObjectMeta: metav1.ObjectMeta{Name: "example-2", UID: "revision-2"}, Spec: ocv1.ClusterObjectSetSpec{Group: "example", Revision: 2, Phases: []ocv1.ClusterObjectSetPhase{{Name: "deploy", Objects: []ocv1.ClusterObjectSetObject{{Type: ocv1.ObjectTypeInlineManifest, InlineManifest: manifest}}}}}} + first := ocv1.ClusterObjectSet{ObjectMeta: metav1.ObjectMeta{Name: "example-2", UID: "revision-2"}, Spec: ocv1.ClusterObjectSetSpec{Group: "example", Revision: 2, ClusterObjectSetContent: ocv1.ClusterObjectSetContent{Phases: []ocv1.ClusterObjectSetPhase{{Name: "deploy", Objects: []ocv1.ClusterObjectSetObject{{Type: ocv1.ObjectTypeInlineManifest, InlineManifest: manifest}}}}}}} second := *first.DeepCopy() second.Name = "example-3" second.UID = "revision-3" @@ -592,7 +592,7 @@ func TestRollbackSnapshotOrdering(t *testing.T) { first := ocv1.ClusterObjectSet{ ObjectMeta: metav1.ObjectMeta{Name: "example-1", UID: "revision-1"}, Spec: ocv1.ClusterObjectSetSpec{Group: "example", Revision: 1, - Phases: []ocv1.ClusterObjectSetPhase{{Name: "deploy", Objects: objects}}}, + ClusterObjectSetContent: ocv1.ClusterObjectSetContent{Phases: []ocv1.ClusterObjectSetPhase{{Name: "deploy", Objects: objects}}}}, } second, tenth := *first.DeepCopy(), *first.DeepCopy() second.Name, second.UID, second.Spec.Revision = "example-2", "revision-2", 2 diff --git a/specs/20260821-migration-v0-to-v1/e2e.md b/specs/20260821-migration-v0-to-v1/e2e.md index b3a4633..3fdb630 100644 --- a/specs/20260821-migration-v0-to-v1/e2e.md +++ b/specs/20260821-migration-v0-to-v1/e2e.md @@ -14,7 +14,7 @@ refusals, not features this library is expected to implement. ### COD transition -The library API dependency and COD CI controller both use commit `9dd683afa190`. +The library API dependency and COD CI controller both use commit `dae9b613163a`. The handoff test checks that the ownerless migration COD has `apps.kubernetes.io/managed-by: operator-controller` before CE creation and retains the label and COD UID after adoption. @@ -39,7 +39,7 @@ conversion and acknowledged rollback preserved the operator Deployment UID and i available replica, restored the Subscription, and removed the COD and both COS revisions. The `migration/test-e2e-cod-rollback` target now automates those rollback assertions and collects CLI coverage. A separate CI job builds and installs operator-controller from -pinned commit `9dd683afa190a67bc6c719abbafa97faa2d68b96`, then runs the handoff and +pinned commit `dae9b613163a8fc5df36e3b9ad5a770a64c0048c`, then runs the handoff and rollback targets. Default suites also build this pinned controller from source, using upstream build targets and the experimental installer. Docker, Git, Python 3, and `envsubst` must be available locally. Setup loads the built images into the @@ -73,7 +73,7 @@ to match generated manifests, regardless of caller image overrides. Pin controller versions and installers in CI; the public live catalog above is an explicit exception. The fixture registry's `latest` tag is private to the disposable cluster and rebuilt from committed inputs on -every setup. The default bootstrap pins OLMv0 to `v0.46.0`, OLMv1 to commit `9dd683afa190`, and kind to +every setup. The default bootstrap pins OLMv0 to `v0.46.0`, OLMv1 to commit `dae9b613163a`, and kind to `v0.33.0` with the digest-pinned Kubernetes `v1.37.0` node image; CI should mirror those release artifacts and override the URLs when it cannot access GitHub. The job inputs are the kind node image, OLMv0 manifest URL and digest, operator-controller source commit, and (only for the smoke suite) the catalog image/package/channel/CSV diff --git a/specs/20260821-migration-v0-to-v1/plan.md b/specs/20260821-migration-v0-to-v1/plan.md index 004bdba..f6df942 100644 --- a/specs/20260821-migration-v0-to-v1/plan.md +++ b/specs/20260821-migration-v0-to-v1/plan.md @@ -44,7 +44,7 @@ Verified during Phase 8 E2E. **COD transition (R2.7), in progress:** the library selects COD creation when its CRD exists, current-generation rollout checks, and COD-aware rollback. API types are pinned to -operator-controller commit `9dd683afa190`, matching the COD CI controller and including +operator-controller commit `dae9b613163a`, matching the COD CI controller and including the adoption label requirement. Migration stamps `apps.kubernetes.io/managed-by: operator-controller` on the ownerless COD before handoff; unit and E2E assertions check this label and preservation of the original COD identity. Directly created @@ -59,7 +59,7 @@ and its revisions 1 and 2 used `None` and `Prevent` collision protection. A sepa full CLI fixture conversion and acknowledged rollback restored the Subscription, removed COD/COS resources, and preserved the operator Deployment UID and availability. The default E2E setup builds the pinned current experimental controller. A separate CI job -builds pinned COD-capable commit `9dd683afa190a67bc6c719abbafa97faa2d68b96` and +builds pinned COD-capable commit `dae9b613163a8fc5df36e3b9ad5a770a64c0048c` and runs covered handoff and workload-preserving rollback E2E targets. The rollback target passed locally on 2026-10-29. Both covered targets passed again on 2026-11-05 against `bbe43971eadd` on kind