From 2f2712bfce3ac2c1e43c64d862a42258760f98f0 Mon Sep 17 00:00:00 2001 From: Jason Hall Date: Thu, 18 Mar 2021 15:41:31 -0400 Subject: [PATCH 1/2] Remove GitSource. HTTPProxy, HTTPSProxy, NoProxy, Flavor as unused --- pkg/apis/build/v1alpha1/gitsource.go | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkg/apis/build/v1alpha1/gitsource.go b/pkg/apis/build/v1alpha1/gitsource.go index 5800b85ad1..56b251066f 100644 --- a/pkg/apis/build/v1alpha1/gitsource.go +++ b/pkg/apis/build/v1alpha1/gitsource.go @@ -22,18 +22,6 @@ type GitSource struct { // +optional ContextDir *string `json:"contextDir,omitempty"` - // HTTPProxy is optional. - HTTPProxy string `json:"httpProxy,omitempty"` - - // HTTPSProxy is optional. - HTTPSProxy string `json:"httpsProxy,omitempty"` - - // NoProxy can be used to specify domains for which no proxying should be performed. Optional. - NoProxy string `json:"noProxy,omitempty"` - // SecretRef refers to the secret that contains credentials to access the git repo. Optional. SecretRef *corev1.LocalObjectReference `json:"credentials,omitempty"` - - // Flavor of the git provider like github, gitlab, bitbucket, generic, etc. Optional. - Flavor string `json:"flavor,omitempty"` } From 72e733a5b6d47653f24b6b191b5ea701eae47cf7 Mon Sep 17 00:00:00 2001 From: Jason Hall Date: Thu, 18 Mar 2021 15:41:49 -0400 Subject: [PATCH 2/2] Regenerate CRDs --- deploy/crds/shipwright.io_buildruns.yaml | 14 -------------- deploy/crds/shipwright.io_builds.yaml | 14 -------------- 2 files changed, 28 deletions(-) diff --git a/deploy/crds/shipwright.io_buildruns.yaml b/deploy/crds/shipwright.io_buildruns.yaml index 0e3cb6f029..01be3be48e 100644 --- a/deploy/crds/shipwright.io_buildruns.yaml +++ b/deploy/crds/shipwright.io_buildruns.yaml @@ -261,20 +261,6 @@ spec: TODO: Add other useful fields. apiVersion, kind, uid?' type: string type: object - flavor: - description: Flavor of the git provider like github, gitlab, - bitbucket, generic, etc. Optional. - type: string - httpProxy: - description: HTTPProxy is optional. - type: string - httpsProxy: - description: HTTPSProxy is optional. - type: string - noProxy: - description: NoProxy can be used to specify domains for which - no proxying should be performed. Optional. - type: string revision: description: Ref is a git reference. Optional. If not defined, it will fallback to the git repository default branch. diff --git a/deploy/crds/shipwright.io_builds.yaml b/deploy/crds/shipwright.io_builds.yaml index 5df9053003..c1df11ddd3 100644 --- a/deploy/crds/shipwright.io_builds.yaml +++ b/deploy/crds/shipwright.io_builds.yaml @@ -202,20 +202,6 @@ spec: TODO: Add other useful fields. apiVersion, kind, uid?' type: string type: object - flavor: - description: Flavor of the git provider like github, gitlab, bitbucket, - generic, etc. Optional. - type: string - httpProxy: - description: HTTPProxy is optional. - type: string - httpsProxy: - description: HTTPSProxy is optional. - type: string - noProxy: - description: NoProxy can be used to specify domains for which - no proxying should be performed. Optional. - type: string revision: description: Ref is a git reference. Optional. If not defined, it will fallback to the git repository default branch.