regenerated

replicatedhq · Jul 22, 2019 · d83e11a · d83e11a
1 parent ed0ad7e
commit d83e11a
Show file tree

Hide file tree

Showing 3 changed files with 95 additions and 18 deletions.
diff --git a/config/crds/troubleshoot.replicated.com_preflights.yaml b/config/crds/troubleshoot.replicated.com_preflights.yaml
@@ -475,6 +475,48 @@ spec:
                       - outcomes
                       - customResourceDefinitionName
                       type: object
+                    imagePullSecret:
+                      properties:
+                        checkName:
+                          type: string
+                        outcomes:
+                          items:
+                            properties:
+                              fail:
+                                properties:
+                                  message:
+                                    type: string
+                                  uri:
+                                    type: string
+                                  when:
+                                    type: string
+                                type: object
+                              pass:
+                                properties:
+                                  message:
+                                    type: string
+                                  uri:
+                                    type: string
+                                  when:
+                                    type: string
+                                type: object
+                              warn:
+                                properties:
+                                  message:
+                                    type: string
+                                  uri:
+                                    type: string
+                                  when:
+                                    type: string
+                                type: object
+                            type: object
+                          type: array
+                        registryName:
+                          type: string
+                      required:
+                      - outcomes
+                      - registryName
+                      type: object
                     ingress:
                       properties:
                         checkName:

diff --git a/config/crds/zz_generated.deepcopy.go b/config/crds/zz_generated.deepcopy.go
@@ -36,6 +36,11 @@ func (in *Analyze) DeepCopyInto(out *Analyze) {
 		*out = new(AnalyzeSecret)
 		(*in).DeepCopyInto(*out)
 	}
+	if in.ImagePullSecret != nil {
+		in, out := &in.ImagePullSecret, &out.ImagePullSecret
+		*out = new(ImagePullSecret)
+		(*in).DeepCopyInto(*out)
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Analyze.
@@ -713,6 +718,33 @@ func (in *HTTP) DeepCopy() *HTTP {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ImagePullSecret) DeepCopyInto(out *ImagePullSecret) {
+	*out = *in
+	out.AnalyzeMeta = in.AnalyzeMeta
+	if in.Outcomes != nil {
+		in, out := &in.Outcomes, &out.Outcomes
+		*out = make([]*Outcome, len(*in))
+		for i := range *in {
+			if (*in)[i] != nil {
+				in, out := &(*in)[i], &(*out)[i]
+				*out = new(Outcome)
+				(*in).DeepCopyInto(*out)
+			}
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ImagePullSecret.
+func (in *ImagePullSecret) DeepCopy() *ImagePullSecret {
+	if in == nil {
+		return nil
+	}
+	out := new(ImagePullSecret)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Ingress) DeepCopyInto(out *Ingress) {
 	*out = *in

diff --git a/pkg/apis/troubleshoot/v1beta1/zz_generated.deepcopy.go b/pkg/apis/troubleshoot/v1beta1/zz_generated.deepcopy.go
@@ -653,7 +653,6 @@ func (in *CustomResourceDefinition) DeepCopy() *CustomResourceDefinition {
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-<<<<<<< HEAD
 func (in *Exec) DeepCopyInto(out *Exec) {
 	*out = *in
 	if in.Selector != nil {
@@ -691,25 +690,10 @@ func (in *Get) DeepCopyInto(out *Get) {
 		*out = make(map[string]string, len(*in))
 		for key, val := range *in {
 			(*out)[key] = val
-=======
-func (in *ImagePullSecret) DeepCopyInto(out *ImagePullSecret) {
-	*out = *in
-	out.AnalyzeMeta = in.AnalyzeMeta
-	if in.Outcomes != nil {
-		in, out := &in.Outcomes, &out.Outcomes
-		*out = make([]*Outcome, len(*in))
-		for i := range *in {
-			if (*in)[i] != nil {
-				in, out := &(*in)[i], &(*out)[i]
-				*out = new(Outcome)
-				(*in).DeepCopyInto(*out)
-			}
->>>>>>> Image pull secrets
 		}
 	}
 }
 
-<<<<<<< HEAD
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Get.
 func (in *Get) DeepCopy() *Get {
 	if in == nil {
@@ -746,14 +730,33 @@ func (in *HTTP) DeepCopy() *HTTP {
 		return nil
 	}
 	out := new(HTTP)
-=======
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ImagePullSecret) DeepCopyInto(out *ImagePullSecret) {
+	*out = *in
+	out.AnalyzeMeta = in.AnalyzeMeta
+	if in.Outcomes != nil {
+		in, out := &in.Outcomes, &out.Outcomes
+		*out = make([]*Outcome, len(*in))
+		for i := range *in {
+			if (*in)[i] != nil {
+				in, out := &(*in)[i], &(*out)[i]
+				*out = new(Outcome)
+				(*in).DeepCopyInto(*out)
+			}
+		}
+	}
+}
+
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ImagePullSecret.
 func (in *ImagePullSecret) DeepCopy() *ImagePullSecret {
 	if in == nil {
 		return nil
 	}
 	out := new(ImagePullSecret)
->>>>>>> Image pull secrets
 	in.DeepCopyInto(out)
 	return out
 }