From 204ea3f6b248301af876523050c356dba1bb6f1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20S=C4=99k?= Date: Tue, 3 Sep 2019 14:13:45 +0200 Subject: [PATCH] Remove unused job package - cleanup Jenkins API --- pkg/apis/jenkins/v1alpha2/jenkins_types.go | 48 ------------------- .../jenkins/v1alpha2/zz_generated.deepcopy.go | 31 ------------ 2 files changed, 79 deletions(-) diff --git a/pkg/apis/jenkins/v1alpha2/jenkins_types.go b/pkg/apis/jenkins/v1alpha2/jenkins_types.go index a2725950..f6af368c 100644 --- a/pkg/apis/jenkins/v1alpha2/jenkins_types.go +++ b/pkg/apis/jenkins/v1alpha2/jenkins_types.go @@ -381,10 +381,6 @@ type JenkinsStatus struct { // +optional UserConfigurationCompletedTime *metav1.Time `json:"userConfigurationCompletedTime,omitempty"` - // Builds contains Jenkins job builds statues - // +optional - Builds []Build `json:"builds,omitempty"` - // RestoredBackup is the restored backup number after Jenkins master pod restart // +optional RestoredBackup uint64 `json:"restoredBackup,omitempty"` @@ -414,50 +410,6 @@ type JenkinsStatus struct { AppliedGroovyScripts []AppliedGroovyScript `json:"appliedGroovyScripts,omitempty"` } -// BuildStatus defines type of Jenkins build job status -type BuildStatus string - -const ( - // BuildSuccessStatus - the build had no errors - BuildSuccessStatus BuildStatus = "success" - // BuildUnstableStatus - the build had some errors but they were not fatal. For example, some tests failed - BuildUnstableStatus BuildStatus = "unstable" - // BuildNotBuildStatus - this status code is used in a multi-stage build (like maven2) where a problem in earlier stage prevented later stages from building - BuildNotBuildStatus BuildStatus = "not_build" - // BuildFailureStatus - the build had a fatal error - BuildFailureStatus BuildStatus = "failure" - // BuildAbortedStatus - the build was manually aborted - BuildAbortedStatus BuildStatus = "aborted" - // BuildRunningStatus - this is custom build status for running build, not present in jenkins build result - BuildRunningStatus BuildStatus = "running" - // BuildExpiredStatus - this is custom build status for expired build, not present in jenkins build result - BuildExpiredStatus BuildStatus = "expired" -) - -// Build defines Jenkins job build status with corresponding metadata -type Build struct { - // JobName is the Jenkins job name - JobName string `json:"jobName,omitempty"` - - // Hash is the unique data identifier used in build - Hash string `json:"hash,omitempty"` - - // Number is the Jenkins build number - Number int64 `json:"number,omitempty"` - - // Status is the status of Jenkins build - Status BuildStatus `json:"status,omitempty"` - - // Retires is the amount of Jenkins job build retries - Retires int `json:"retries,omitempty"` - - // CreateTime is the time when the first build has been created - CreateTime *metav1.Time `json:"createTime,omitempty"` - - // LastUpdateTime is the last update status time - LastUpdateTime *metav1.Time `json:"lastUpdateTime,omitempty"` -} - // +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object diff --git a/pkg/apis/jenkins/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/jenkins/v1alpha2/zz_generated.deepcopy.go index c99efd11..76ae6c19 100644 --- a/pkg/apis/jenkins/v1alpha2/zz_generated.deepcopy.go +++ b/pkg/apis/jenkins/v1alpha2/zz_generated.deepcopy.go @@ -42,30 +42,6 @@ func (in *Backup) DeepCopy() *Backup { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Build) DeepCopyInto(out *Build) { - *out = *in - if in.CreateTime != nil { - in, out := &in.CreateTime, &out.CreateTime - *out = (*in).DeepCopy() - } - if in.LastUpdateTime != nil { - in, out := &in.LastUpdateTime, &out.LastUpdateTime - *out = (*in).DeepCopy() - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Build. -func (in *Build) DeepCopy() *Build { - if in == nil { - return nil - } - out := new(Build) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ConfigMapRef) DeepCopyInto(out *ConfigMapRef) { *out = *in @@ -407,13 +383,6 @@ func (in *JenkinsStatus) DeepCopyInto(out *JenkinsStatus) { in, out := &in.UserConfigurationCompletedTime, &out.UserConfigurationCompletedTime *out = (*in).DeepCopy() } - if in.Builds != nil { - in, out := &in.Builds, &out.Builds - *out = make([]Build, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } if in.CreatedSeedJobs != nil { in, out := &in.CreatedSeedJobs, &out.CreatedSeedJobs *out = make([]string, len(*in))