From f01b4bd4a472c23eaf348c262ae74280a272d173 Mon Sep 17 00:00:00 2001
From: runzexia <runzexia@yunify.com>
Date: Mon, 1 Apr 2019 17:13:06 +0800
Subject: [PATCH] update s2i version

---
 Gopkg.toml                                    |  2 +-
 .../apis/devops/v1alpha1/s2ibuilder_types.go  | 20 +++++++++++--------
 .../pkg/apis/devops/v1alpha1/s2irun_types.go  |  4 +++-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/Gopkg.toml b/Gopkg.toml
index b9c34c429..9393486aa 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -57,7 +57,7 @@ required = [
 
 [[constraint]]
   name="github.com/kubesphere/s2ioperator"
-  version="v0.0.7"
+  version="v0.0.8"
 
 [[override]]
   name="github.com/bifurcation/mint"
diff --git a/vendor/github.com/kubesphere/s2ioperator/pkg/apis/devops/v1alpha1/s2ibuilder_types.go b/vendor/github.com/kubesphere/s2ioperator/pkg/apis/devops/v1alpha1/s2ibuilder_types.go
index 676f3a629..daced0248 100644
--- a/vendor/github.com/kubesphere/s2ioperator/pkg/apis/devops/v1alpha1/s2ibuilder_types.go
+++ b/vendor/github.com/kubesphere/s2ioperator/pkg/apis/devops/v1alpha1/s2ibuilder_types.go
@@ -36,10 +36,11 @@ const (
 	Unknown             = "Unknown"
 )
 const (
-	AutoScaleAnnotations              = "devops.kubesphere.io/autoscale"
-	WorkloadLatestS2iRunTemplateLabel = "devops.kubesphere.io/s2ir"
-	S2irCompletedScaleAnnotations     = "devops.kubesphere.io/completedscale"
-	WorkLoadCompletedInitAnnotations  = "devops.kubesphere.io/inithasbeencomplted"
+	AutoScaleAnnotations             = "devops.kubesphere.io/autoscale"
+	S2iRunLabel                      = "devops.kubesphere.io/s2ir"
+	S2irCompletedScaleAnnotations    = "devops.kubesphere.io/completedscale"
+	WorkLoadCompletedInitAnnotations = "devops.kubesphere.io/inithasbeencomplted"
+	DescriptionAnnotations           = "desc"
 )
 const (
 	KindDeployment  = "Deployment"
@@ -48,14 +49,14 @@ const (
 
 // EnvironmentSpec specifies a single environment variable.
 type EnvironmentSpec struct {
-	Name  string
-	Value string
+	Name  string `json:"name"`
+	Value string `json:"value"`
 }
 
 // ProxyConfig holds proxy configuration.
 type ProxyConfig struct {
-	HTTPProxy  string
-	HTTPSProxy string
+	HTTPProxy  string `json:"httpProxy,omitempty"`
+	HTTPSProxy string `json:"httpsProxy,omitempty"`
 }
 
 // CGroupLimits holds limits used to constrain container resources.
@@ -423,6 +424,8 @@ type S2iBuilderStatus struct {
 	LastRunState RunState `json:"lastRunState,omitempty"`
 	//LastRunState return the name of the newest run of this builder
 	LastRunName *string `json:"lastRunName,omitempty"`
+	//LastRunStartTime return the startTime of the newest run of this builder
+	LastRunStartTime *metav1.Time `json:"lastRunStartTime,omitempty"`
 }
 
 // +genclient
@@ -434,6 +437,7 @@ type S2iBuilderStatus struct {
 // +kubebuilder:printcolumn:name="RunCount",type="integer",JSONPath=".status.runCount"
 // +kubebuilder:printcolumn:name="LastRunState",type="string",JSONPath=".status.lastRunState"
 // +kubebuilder:printcolumn:name="LastRunName",type="string",JSONPath=".status.lastRunName"
+// +kubebuilder:printcolumn:name="LastRunStartTime",type="date",JSONPath=".status.lastRunStartTime"
 // +kubebuilder:resource:shortName=s2ib
 type S2iBuilder struct {
 	metav1.TypeMeta   `json:",inline"`
diff --git a/vendor/github.com/kubesphere/s2ioperator/pkg/apis/devops/v1alpha1/s2irun_types.go b/vendor/github.com/kubesphere/s2ioperator/pkg/apis/devops/v1alpha1/s2irun_types.go
index fcda717b1..0dcf71066 100644
--- a/vendor/github.com/kubesphere/s2ioperator/pkg/apis/devops/v1alpha1/s2irun_types.go
+++ b/vendor/github.com/kubesphere/s2ioperator/pkg/apis/devops/v1alpha1/s2irun_types.go
@@ -51,6 +51,8 @@ type S2iRunStatus struct {
 	LogURL string `json:"logURL,omitempty"`
 	//KubernetesJobName is the job name in k8s
 	KubernetesJobName string `json:"kubernetesJobName,omitempty"`
+	//ImageName is the name of artifact
+	ImageName string `json:"imageName,omitempty"`
 }
 
 // +genclient
@@ -64,7 +66,7 @@ type S2iRunStatus struct {
 // +kubebuilder:printcolumn:name="K8sJobName",type="string",JSONPath=".status.kubernetesJobName"
 // +kubebuilder:printcolumn:name="StartTime",type="date",JSONPath=".status.startTime"
 // +kubebuilder:printcolumn:name="CompletionTime",type="date",JSONPath=".status.completionTime"
-// +kubebuilder:printcolumn:name="LogURL",type="string",JSONPath=".status.logURL"
+// +kubebuilder:printcolumn:name="ImageName",type="string",JSONPath=".status.imageName"
 type S2iRun struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`