diff --git a/pkg/sync/sync.go b/pkg/sync/sync.go index 8390cbda..3c88c193 100644 --- a/pkg/sync/sync.go +++ b/pkg/sync/sync.go @@ -225,11 +225,6 @@ func (w *worker) syncTo(l *zap.SugaredLogger, o *origin, replica types.AdGuardIn return } - if versions.IsSame(rs.Version, versions.IncompatibleAPI) { - rl.With("error", err, "version", rs.Version).Errorf("Replica AdGuard Home runs with an incompatible API - Please ugrade to version %s or newer", versions.FixedIncompatibleAPI) - return - } - if o.status.Version != rs.Version { rl.With("originVersion", o.status.Version, "replicaVersion", rs.Version).Warn("Versions do not match") } diff --git a/pkg/sync/sync_test.go b/pkg/sync/sync_test.go index 904e48a8..61d3dc84 100644 --- a/pkg/sync/sync_test.go +++ b/pkg/sync/sync_test.go @@ -658,29 +658,6 @@ var _ = Describe("Sync", func() { cl.EXPECT().Status().Return(&model.ServerStatus{Version: "v0.106.9"}, nil) w.sync() }) - It("replica version is with incompatible API", func() { - // origin - cl.EXPECT().Host() - cl.EXPECT().Status().Return(&model.ServerStatus{Version: versions.MinAgh}, nil) - cl.EXPECT().ProfileInfo().Return(&model.ProfileInfo{}, nil) - cl.EXPECT().Parental() - cl.EXPECT().SafeSearchConfig().Return(&model.SafeSearchConfig{}, nil) - cl.EXPECT().SafeBrowsing() - cl.EXPECT().RewriteList().Return(&model.RewriteEntries{}, nil) - cl.EXPECT().Services() - cl.EXPECT().Filtering().Return(&model.FilterStatus{}, nil) - cl.EXPECT().Clients().Return(&model.Clients{}, nil) - cl.EXPECT().QueryLogConfig().Return(&model.QueryLogConfig{}, nil) - cl.EXPECT().StatsConfig().Return(&model.StatsConfig{}, nil) - cl.EXPECT().AccessList().Return(&model.AccessList{}, nil) - cl.EXPECT().DNSConfig().Return(&model.DNSConfig{}, nil) - cl.EXPECT().DhcpConfig().Return(&model.DhcpStatus{}, nil) - - // replica - cl.EXPECT().Host() - cl.EXPECT().Status().Return(&model.ServerStatus{Version: versions.IncompatibleAPI}, nil) - w.sync() - }) }) }) }) diff --git a/pkg/versions/versions.go b/pkg/versions/versions.go index 71988f5d..d7978b69 100644 --- a/pkg/versions/versions.go +++ b/pkg/versions/versions.go @@ -4,13 +4,7 @@ import "golang.org/x/mod/semver" const ( // MinAgh minimal adguardhome version - MinAgh = "v0.107.0" - // IncompatibleAPI adguardhome version with incompatible API - // https://github.com/bakito/adguardhome-sync/issues/99 - IncompatibleAPI = "v0.107.14" - // FixedIncompatibleAPI adguardhome version with fixed API - // https://github.com/bakito/adguardhome-sync/issues/99 - FixedIncompatibleAPI = "v0.107.15" + MinAgh = "v0.107.40" ) func IsNewerThan(v1 string, v2 string) bool { diff --git a/testdata/e2e/values.yaml b/testdata/e2e/values.yaml index 867be52d..4192a1eb 100644 --- a/testdata/e2e/values.yaml +++ b/testdata/e2e/values.yaml @@ -1,5 +1,3 @@ replica: versions: - latest - - v0.107.13 - - v0.107.15