update harbor version to 2.1.2

Signed-off-by: Ziming Zhang <zziming@vmware.com>
goharbor · Dec 14, 2020 · 6bce5c3 · 6bce5c3
1 parent a252c9a
commit 6bce5c3
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 9 deletions.
diff --git a/controllers/goharbor/chartmuseum/chartmuseum.go b/controllers/goharbor/chartmuseum/chartmuseum.go
@@ -23,7 +23,7 @@ const (
 	DefaultConfigTemplatePath = "/etc/harbor-operator/chartmuseum-config.yaml.tmpl"
 	ConfigTemplateKey         = "template-content"
 	ConfigImageKey            = "docker-image"
-	DefaultImage              = config.DefaultRegistry + "goharbor/chartmuseum-photon:v2.0.0"
+	DefaultImage              = config.DefaultRegistry + "goharbor/chartmuseum-photon:" + config.DefaultHarborVersion
 )
 
 // Reconciler reconciles a Chartmuseum object.

diff --git a/controllers/goharbor/core/core.go b/controllers/goharbor/core/core.go
@@ -26,7 +26,7 @@ const (
 	DefaultConfigTemplatePath = "/etc/harbor-operator/core-config.conf.tmpl"
 	ConfigTemplateKey         = "template-content"
 	ConfigImageKey            = "docker-image"
-	DefaultImage              = config.DefaultRegistry + "goharbor/harbor-core:v2.0.0"
+	DefaultImage              = config.DefaultRegistry + "goharbor/harbor-core:" + config.DefaultHarborVersion
 )
 
 // Reconciler reconciles a Core object.

diff --git a/controllers/goharbor/jobservice/jobservice.go b/controllers/goharbor/jobservice/jobservice.go
@@ -26,7 +26,7 @@ const (
 	DefaultConfigTemplatePath = "/etc/harbor-operator/jobservice-config.yaml.tmpl"
 	ConfigTemplateKey         = "template-content"
 	ConfigImageKey            = "docker-image"
-	DefaultImage              = config.DefaultRegistry + "goharbor/harbor-jobservice:v2.0.0"
+	DefaultImage              = config.DefaultRegistry + "goharbor/harbor-jobservice:" + config.DefaultHarborVersion
 )
 
 // Reconciler reconciles a JobService object.

diff --git a/controllers/goharbor/notaryserver/notaryserver.go b/controllers/goharbor/notaryserver/notaryserver.go
@@ -26,7 +26,7 @@ const (
 	DefaultConfigTemplatePath = "/etc/harbor-operator/notaryserver-config.json.tmpl"
 	ConfigTemplateKey         = "template-content"
 	ConfigImageKey            = "docker-image"
-	DefaultImage              = config.DefaultRegistry + "goharbor/notary-server-photon:v2.0.0"
+	DefaultImage              = config.DefaultRegistry + "goharbor/notary-server-photon:" + config.DefaultHarborVersion
 )
 
 // Reconciler reconciles a NotaryServer object.

diff --git a/controllers/goharbor/notarysigner/notarysigner.go b/controllers/goharbor/notarysigner/notarysigner.go
@@ -23,7 +23,7 @@ const (
 	DefaultConfigTemplatePath = "/etc/harbor-operator/notarysigner-config.json.tmpl"
 	ConfigTemplateKey         = "template-content"
 	ConfigImageKey            = "docker-image"
-	DefaultImage              = config.DefaultRegistry + "goharbor/notary-signer-photon:v2.0.0"
+	DefaultImage              = config.DefaultRegistry + "goharbor/notary-signer-photon:" + config.DefaultHarborVersion
 )
 
 // Reconciler reconciles a NotarySigner object.

diff --git a/controllers/goharbor/portal/portal.go b/controllers/goharbor/portal/portal.go
@@ -21,7 +21,7 @@ const (
 	DefaultConfigTemplatePath = "/etc/harbor-operator/portal-config.conf.tmpl"
 	ConfigTemplateKey         = "template-content"
 	ConfigImageKey            = "docker-image"
-	DefaultImage              = config.DefaultRegistry + "goharbor/harbor-portal:v2.0.0"
+	DefaultImage              = config.DefaultRegistry + "goharbor/harbor-portal:" + config.DefaultHarborVersion
 )
 
 // Reconciler reconciles a Portal object.

diff --git a/controllers/goharbor/registry/registry.go b/controllers/goharbor/registry/registry.go
@@ -26,7 +26,7 @@ const (
 	DefaultConfigTemplatePath = "/etc/harbor-operator/registry-config.yaml.tmpl"
 	ConfigTemplateKey         = "template-content"
 	ConfigImageKey            = "docker-image"
-	DefaultImage              = config.DefaultRegistry + "goharbor/registry-photon:v2.0.0"
+	DefaultImage              = config.DefaultRegistry + "goharbor/registry-photon:" + config.DefaultHarborVersion
 )
 
 // Reconciler reconciles a Registry object.

diff --git a/controllers/goharbor/registryctl/registryctl.go b/controllers/goharbor/registryctl/registryctl.go
@@ -26,7 +26,7 @@ const (
 	DefaultConfigTemplatePath = "/etc/harbor-operator/registryctl-config.yaml.tmpl"
 	ConfigTemplateKey         = "template-content"
 	ConfigImageKey            = "docker-image"
-	DefaultImage              = config.DefaultRegistry + "goharbor/harbor-registryctl:v2.0.0"
+	DefaultImage              = config.DefaultRegistry + "goharbor/harbor-registryctl:" + config.DefaultHarborVersion
 )
 
 // Reconciler reconciles a RegistryController object.

diff --git a/controllers/goharbor/trivy/trivy.go b/controllers/goharbor/trivy/trivy.go
@@ -19,7 +19,7 @@ import (
 const (
 	DefaultRequeueWait = 2 * time.Second
 	ConfigImageKey     = "docker-image"
-	DefaultImage       = config.DefaultRegistry + "goharbor/trivy-adapter-photon:v2.0.1"
+	DefaultImage       = config.DefaultRegistry + "goharbor/trivy-adapter-photon:" + config.DefaultHarborVersion
 )
 
 // Reconciler reconciles a Trivy object.

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -18,6 +18,7 @@ const (
 	DefaultConcurrentReconcile = 1
 	DefaultHarborClass         = ""
 	DefaultRegistry            = ""
+	DefaultHarborVersion       = "v2.1.2"
 )
 
 var ErrNotReady = errors.New("configuration not ready")