Use pkg/version to parse versions
Fixes #38 Signed-off-by: Aurel Canciu <aurelcanciu@gmail.com>
This commit is contained in:
		
							parent
							
								
									dc06fe7192
								
							
						
					
					
						commit
						096e51986c
					
				|  | @ -36,6 +36,7 @@ import ( | ||||||
| 
 | 
 | ||||||
| 	"github.com/fluxcd/pkg/runtime/events" | 	"github.com/fluxcd/pkg/runtime/events" | ||||||
| 	"github.com/fluxcd/pkg/runtime/metrics" | 	"github.com/fluxcd/pkg/runtime/metrics" | ||||||
|  | 	"github.com/fluxcd/pkg/version" | ||||||
| 
 | 
 | ||||||
| 	imagev1alpha1 "github.com/fluxcd/image-reflector-controller/api/v1alpha1" | 	imagev1alpha1 "github.com/fluxcd/image-reflector-controller/api/v1alpha1" | ||||||
| ) | ) | ||||||
|  | @ -157,7 +158,7 @@ func (r *ImagePolicyReconciler) calculateLatestImageSemver(pol *imagev1alpha1.Im | ||||||
| 	} | 	} | ||||||
| 	var latestVersion *semver.Version | 	var latestVersion *semver.Version | ||||||
| 	for _, tag := range tags { | 	for _, tag := range tags { | ||||||
| 		if v, err := semver.NewVersion(tag); err == nil { | 		if v, err := version.ParseVersion(tag); err == nil { | ||||||
| 			if constraint.Check(v) && (latestVersion == nil || v.GreaterThan(latestVersion)) { | 			if constraint.Check(v) && (latestVersion == nil || v.GreaterThan(latestVersion)) { | ||||||
| 				latestVersion = v | 				latestVersion = v | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
							
								
								
									
										3
									
								
								go.mod
								
								
								
								
							
							
						
						
									
										3
									
								
								go.mod
								
								
								
								
							|  | @ -8,13 +8,12 @@ require ( | ||||||
| 	github.com/Masterminds/semver/v3 v3.1.0 | 	github.com/Masterminds/semver/v3 v3.1.0 | ||||||
| 	github.com/fluxcd/image-reflector-controller/api v0.0.0-00010101000000-000000000000 | 	github.com/fluxcd/image-reflector-controller/api v0.0.0-00010101000000-000000000000 | ||||||
| 	github.com/fluxcd/pkg/apis/meta v0.4.0 | 	github.com/fluxcd/pkg/apis/meta v0.4.0 | ||||||
| 	github.com/fluxcd/pkg/recorder v0.0.5 // indirect |  | ||||||
| 	github.com/fluxcd/pkg/runtime v0.3.0 | 	github.com/fluxcd/pkg/runtime v0.3.0 | ||||||
|  | 	github.com/fluxcd/pkg/version v0.0.1 | ||||||
| 	github.com/go-logr/logr v0.2.1 | 	github.com/go-logr/logr v0.2.1 | ||||||
| 	github.com/google/go-containerregistry v0.1.1 | 	github.com/google/go-containerregistry v0.1.1 | ||||||
| 	github.com/onsi/ginkgo v1.12.1 | 	github.com/onsi/ginkgo v1.12.1 | ||||||
| 	github.com/onsi/gomega v1.10.1 | 	github.com/onsi/gomega v1.10.1 | ||||||
| 	go.uber.org/zap v1.10.0 // indirect |  | ||||||
| 	k8s.io/api v0.19.3 | 	k8s.io/api v0.19.3 | ||||||
| 	k8s.io/apimachinery v0.19.3 | 	k8s.io/apimachinery v0.19.3 | ||||||
| 	k8s.io/client-go v0.19.3 | 	k8s.io/client-go v0.19.3 | ||||||
|  |  | ||||||
							
								
								
									
										6
									
								
								go.sum
								
								
								
								
							
							
						
						
									
										6
									
								
								go.sum
								
								
								
								
							|  | @ -205,10 +205,10 @@ github.com/fluxcd/pkg/apis/meta v0.3.0 h1:o2YkfGgf0j8sKeZs8cBmmmMKLA7kEoS1qYViOi | ||||||
| github.com/fluxcd/pkg/apis/meta v0.3.0/go.mod h1:wOzQQx8CdtUQCGaLzqGu4QgnNxYkI6/wvdvlovxWhF0= | github.com/fluxcd/pkg/apis/meta v0.3.0/go.mod h1:wOzQQx8CdtUQCGaLzqGu4QgnNxYkI6/wvdvlovxWhF0= | ||||||
| github.com/fluxcd/pkg/apis/meta v0.4.0 h1:JChqB9GGgorW9HWKxirTVV0rzrcLyzBaVjinmqZ0iHA= | github.com/fluxcd/pkg/apis/meta v0.4.0 h1:JChqB9GGgorW9HWKxirTVV0rzrcLyzBaVjinmqZ0iHA= | ||||||
| github.com/fluxcd/pkg/apis/meta v0.4.0/go.mod h1:wOzQQx8CdtUQCGaLzqGu4QgnNxYkI6/wvdvlovxWhF0= | github.com/fluxcd/pkg/apis/meta v0.4.0/go.mod h1:wOzQQx8CdtUQCGaLzqGu4QgnNxYkI6/wvdvlovxWhF0= | ||||||
| github.com/fluxcd/pkg/recorder v0.0.5 h1:D8qfupahIvh6ncCMn2yTHsrzG91S05sp4zdpsbKWeaU= |  | ||||||
| github.com/fluxcd/pkg/recorder v0.0.5/go.mod h1:2UG6EroZ6ZbqmqoL8k/cQMe09e6A36WyH4t4UDUGyuU= |  | ||||||
| github.com/fluxcd/pkg/runtime v0.3.0 h1:WpeTmDT2meIe4NsU081I8zmUGgTYs3bIMRgs9F3Lj90= | github.com/fluxcd/pkg/runtime v0.3.0 h1:WpeTmDT2meIe4NsU081I8zmUGgTYs3bIMRgs9F3Lj90= | ||||||
| github.com/fluxcd/pkg/runtime v0.3.0/go.mod h1:gPe6JgfPB4EDh5gaVkuI0SPuATk3PmclbFa1kPcZrKE= | github.com/fluxcd/pkg/runtime v0.3.0/go.mod h1:gPe6JgfPB4EDh5gaVkuI0SPuATk3PmclbFa1kPcZrKE= | ||||||
|  | github.com/fluxcd/pkg/version v0.0.1 h1:/8asQoDXSThz3csiwi4Qo8Zb6blAxLXbtxNgeMJ9bCg= | ||||||
|  | github.com/fluxcd/pkg/version v0.0.1/go.mod h1:WAF4FEEA9xyhngF8TDxg3UPu5fA1qhEYV8Pmi2Il01Q= | ||||||
| github.com/fortytw2/leaktest v1.2.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= | github.com/fortytw2/leaktest v1.2.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= | ||||||
| github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= | github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= | ||||||
| github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= | github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= | ||||||
|  | @ -1109,7 +1109,6 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt | ||||||
| honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= | honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= | ||||||
| honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= | honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= | ||||||
| k8s.io/api v0.17.4/go.mod h1:5qxx6vjmwUVG2nHQTKGlLts8Tbok8PzHl4vHtVFuZCA= | k8s.io/api v0.17.4/go.mod h1:5qxx6vjmwUVG2nHQTKGlLts8Tbok8PzHl4vHtVFuZCA= | ||||||
| k8s.io/api v0.18.4/go.mod h1:lOIQAKYgai1+vz9J7YcDZwC26Z0zQewYOGWdyIPUUQ4= |  | ||||||
| k8s.io/api v0.18.6 h1:osqrAXbOQjkKIWDTjrqxWQ3w0GkKb1KA1XkUGHHYpeE= | k8s.io/api v0.18.6 h1:osqrAXbOQjkKIWDTjrqxWQ3w0GkKb1KA1XkUGHHYpeE= | ||||||
| k8s.io/api v0.18.6/go.mod h1:eeyxr+cwCjMdLAmr2W3RyDI0VvTawSg/3RFFBEnmZGI= | k8s.io/api v0.18.6/go.mod h1:eeyxr+cwCjMdLAmr2W3RyDI0VvTawSg/3RFFBEnmZGI= | ||||||
| k8s.io/api v0.19.3 h1:GN6ntFnv44Vptj/b+OnMW7FmzkpDoIDLZRvKX3XH9aU= | k8s.io/api v0.19.3 h1:GN6ntFnv44Vptj/b+OnMW7FmzkpDoIDLZRvKX3XH9aU= | ||||||
|  | @ -1117,7 +1116,6 @@ k8s.io/api v0.19.3/go.mod h1:VF+5FT1B74Pw3KxMdKyinLo+zynBaMBiAfGMuldcNDs= | ||||||
| k8s.io/apiextensions-apiserver v0.18.6 h1:vDlk7cyFsDyfwn2rNAO2DbmUbvXy5yT5GE3rrqOzaMo= | k8s.io/apiextensions-apiserver v0.18.6 h1:vDlk7cyFsDyfwn2rNAO2DbmUbvXy5yT5GE3rrqOzaMo= | ||||||
| k8s.io/apiextensions-apiserver v0.18.6/go.mod h1:lv89S7fUysXjLZO7ke783xOwVTm6lKizADfvUM/SS/M= | k8s.io/apiextensions-apiserver v0.18.6/go.mod h1:lv89S7fUysXjLZO7ke783xOwVTm6lKizADfvUM/SS/M= | ||||||
| k8s.io/apimachinery v0.17.4/go.mod h1:gxLnyZcGNdZTCLnq3fgzyg2A5BVCHTNDFrw8AmuJ+0g= | k8s.io/apimachinery v0.17.4/go.mod h1:gxLnyZcGNdZTCLnq3fgzyg2A5BVCHTNDFrw8AmuJ+0g= | ||||||
| k8s.io/apimachinery v0.18.4/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko= |  | ||||||
| k8s.io/apimachinery v0.18.6 h1:RtFHnfGNfd1N0LeSrKCUznz5xtUP1elRGvHJbL3Ntag= | k8s.io/apimachinery v0.18.6 h1:RtFHnfGNfd1N0LeSrKCUznz5xtUP1elRGvHJbL3Ntag= | ||||||
| k8s.io/apimachinery v0.18.6/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko= | k8s.io/apimachinery v0.18.6/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko= | ||||||
| k8s.io/apimachinery v0.19.3 h1:bpIQXlKjB4cB/oNpnNnV+BybGPR7iP5oYpsOTEJ4hgc= | k8s.io/apimachinery v0.19.3 h1:bpIQXlKjB4cB/oNpnNnV+BybGPR7iP5oYpsOTEJ4hgc= | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue