diff --git a/Makefile b/Makefile index 694771dc..82dac2d0 100644 --- a/Makefile +++ b/Makefile @@ -30,16 +30,16 @@ run: generate fmt vet # Install CRDs into a cluster install: manifests - kubectl apply -f config/crd + kubectl apply -f config/crds # Deploy controller in the configured Kubernetes cluster in ~/.kube/config deploy: manifests - kubectl apply -f config/crd + kubectl apply -f config/crds kustomize build config/default | kubectl apply -f - # Generate manifests e.g. CRD, RBAC etc. manifests: - controller-gen paths=./pkg/apis/... + controller-gen paths=./pkg/apis/... output:dir=./config/crds .PHONY: fmt fmt: diff --git a/config/crd/troubleshoot.replicated.com_collectorjobs.yaml b/config/crd/troubleshoot.replicated.com_collectorjobs.yaml index d4441f62..877a87b7 100644 --- a/config/crd/troubleshoot.replicated.com_collectorjobs.yaml +++ b/config/crd/troubleshoot.replicated.com_collectorjobs.yaml @@ -390,18 +390,6 @@ spec: type: string type: object spec: - properties: - collector: - properties: - name: - type: string - namespace: - type: string - required: - - name - type: object - required: - - collector type: object status: type: object diff --git a/config/crds/manifests.yaml b/config/crds/manifests.yaml new file mode 100644 index 00000000..e69de29b diff --git a/config/crd/troubleshoot.replicated.com_analyzerjobs.yaml b/config/crds/troubleshoot.replicated.com_analyzerjobs.yaml similarity index 100% rename from config/crd/troubleshoot.replicated.com_analyzerjobs.yaml rename to config/crds/troubleshoot.replicated.com_analyzerjobs.yaml diff --git a/config/crd/troubleshoot.replicated.com_analyzers.yaml b/config/crds/troubleshoot.replicated.com_analyzers.yaml similarity index 100% rename from config/crd/troubleshoot.replicated.com_analyzers.yaml rename to config/crds/troubleshoot.replicated.com_analyzers.yaml diff --git a/config/crds/troubleshoot.replicated.com_collectorjobs.yaml b/config/crds/troubleshoot.replicated.com_collectorjobs.yaml new file mode 100644 index 00000000..2ca422d0 --- /dev/null +++ b/config/crds/troubleshoot.replicated.com_collectorjobs.yaml @@ -0,0 +1,433 @@ + +--- +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + creationTimestamp: null + name: collectorjobs.troubleshoot.replicated.com +spec: + group: troubleshoot.replicated.com + names: + kind: CollectorJob + plural: collectorjobs + scope: "" + versions: + - name: v1beta1 + schema: + openAPIV3Schema: + description: CollectorJob is the Schema for the collectorjobs API + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation + of an object. Servers should convert recognized schemas to the latest + internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this + object represents. Servers may infer this from the endpoint the client + submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' + type: string + metadata: + properties: + annotations: + additionalProperties: + type: string + description: 'Annotations is an unstructured key value map stored + with a resource that may be set by external tools to store and retrieve + arbitrary metadata. They are not queryable and should be preserved + when modifying objects. More info: http://kubernetes.io/docs/user-guide/annotations' + type: object + clusterName: + description: The name of the cluster which the object belongs to. + This is used to distinguish resources with same name and namespace + in different clusters. This field is not set anywhere right now + and apiserver is going to ignore it if set in create or update request. + type: string + creationTimestamp: + description: "CreationTimestamp is a timestamp representing the server + time when this object was created. It is not guaranteed to be set + in happens-before order across separate operations. Clients may + not set this value. It is represented in RFC3339 form and is in + UTC. \n Populated by the system. Read-only. Null for lists. More + info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata" + format: date-time + type: string + deletionGracePeriodSeconds: + description: Number of seconds allowed for this object to gracefully + terminate before it will be removed from the system. Only set when + deletionTimestamp is also set. May only be shortened. Read-only. + format: int64 + type: integer + deletionTimestamp: + description: "DeletionTimestamp is RFC 3339 date and time at which + this resource will be deleted. This field is set by the server when + a graceful deletion is requested by the user, and is not directly + settable by a client. The resource is expected to be deleted (no + longer visible from resource lists, and not reachable by name) after + the time in this field, once the finalizers list is empty. As long + as the finalizers list contains items, deletion is blocked. Once + the deletionTimestamp is set, this value may not be unset or be + set further into the future, although it may be shortened or the + resource may be deleted prior to this time. For example, a user + may request that a pod is deleted in 30 seconds. The Kubelet will + react by sending a graceful termination signal to the containers + in the pod. After that 30 seconds, the Kubelet will send a hard + termination signal (SIGKILL) to the container and after cleanup, + remove the pod from the API. In the presence of network partitions, + this object may still exist after this timestamp, until an administrator + or automated process can determine the resource is fully terminated. + If not set, graceful deletion of the object has not been requested. + \n Populated by the system when a graceful deletion is requested. + Read-only. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata" + format: date-time + type: string + finalizers: + description: Must be empty before the object is deleted from the registry. + Each entry is an identifier for the responsible component that will + remove the entry from the list. If the deletionTimestamp of the + object is non-nil, entries in this list can only be removed. + items: + type: string + type: array + generateName: + description: "GenerateName is an optional prefix, used by the server, + to generate a unique name ONLY IF the Name field has not been provided. + If this field is used, the name returned to the client will be different + than the name passed. This value will also be combined with a unique + suffix. The provided value has the same validation rules as the + Name field, and may be truncated by the length of the suffix required + to make the value unique on the server. \n If this field is specified + and the generated name exists, the server will NOT return a 409 + - instead, it will either return 201 Created or 500 with Reason + ServerTimeout indicating a unique name could not be found in the + time allotted, and the client should retry (optionally after the + time indicated in the Retry-After header). \n Applied only if Name + is not specified. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#idempotency" + type: string + generation: + description: A sequence number representing a specific generation + of the desired state. Populated by the system. Read-only. + format: int64 + type: integer + initializers: + description: "An initializer is a controller which enforces some system + invariant at object creation time. This field is a list of initializers + that have not yet acted on this object. If nil or empty, this object + has been completely initialized. Otherwise, the object is considered + uninitialized and is hidden (in list/watch and get calls) from clients + that haven't explicitly asked to observe uninitialized objects. + \n When an object is created, the system will populate this list + with the current set of initializers. Only privileged users may + set or modify this list. Once it is empty, it may not be modified + further by any user. \n DEPRECATED - initializers are an alpha field + and will be removed in v1.15." + properties: + pending: + description: Pending is a list of initializers that must execute + in order before this object is visible. When the last pending + initializer is removed, and no failing result is set, the initializers + struct will be set to nil and the object is considered as initialized + and visible to all clients. + items: + properties: + name: + description: name of the process that is responsible for + initializing this object. + type: string + required: + - name + type: object + type: array + result: + description: If result is set with the Failure field, the object + will be persisted to storage and then deleted, ensuring that + other clients can observe the deletion. + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this + representation of an object. Servers should convert recognized + schemas to the latest internal value, and may reject unrecognized + values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources' + type: string + code: + description: Suggested HTTP return code for this status, 0 + if not set. + format: int32 + type: integer + details: + description: Extended data associated with the reason. Each + reason may define its own extended details. This field is + optional and the data returned is not guaranteed to conform + to any schema except that defined by the reason type. + properties: + causes: + description: The Causes array includes more details associated + with the StatusReason failure. Not all StatusReasons + may provide detailed causes. + items: + properties: + field: + description: "The field of the resource that has + caused this error, as named by its JSON serialization. + May include dot and postfix notation for nested + attributes. Arrays are zero-indexed. Fields may + appear more than once in an array of causes due + to fields having multiple errors. Optional. \n + Examples: \"name\" - the field \"name\" on the + current resource \"items[0].name\" - the field + \"name\" on the first array entry in \"items\"" + type: string + message: + description: A human-readable description of the + cause of the error. This field may be presented + as-is to a reader. + type: string + reason: + description: A machine-readable description of the + cause of the error. If this value is empty there + is no information available. + type: string + type: object + type: array + group: + description: The group attribute of the resource associated + with the status StatusReason. + type: string + kind: + description: 'The kind attribute of the resource associated + with the status StatusReason. On some operations may + differ from the requested resource Kind. More info: + https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' + type: string + name: + description: The name attribute of the resource associated + with the status StatusReason (when there is a single + name which can be described). + type: string + retryAfterSeconds: + description: If specified, the time in seconds before + the operation should be retried. Some errors may indicate + the client must take an alternate action - for those + errors this field may indicate how long to wait before + taking the alternate action. + format: int32 + type: integer + uid: + description: 'UID of the resource. (when there is a single + resource which can be described). More info: http://kubernetes.io/docs/user-guide/identifiers#uids' + type: string + type: object + kind: + description: 'Kind is a string value representing the REST + resource this object represents. Servers may infer this + from the endpoint the client submits requests to. Cannot + be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' + type: string + message: + description: A human-readable description of the status of + this operation. + type: string + metadata: + description: 'Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' + properties: + continue: + description: continue may be set if the user set a limit + on the number of items returned, and indicates that + the server has more data available. The value is opaque + and may be used to issue another request to the endpoint + that served this list to retrieve the next set of available + objects. Continuing a consistent list may not be possible + if the server configuration has changed or more than + a few minutes have passed. The resourceVersion field + returned when using this continue value will be identical + to the value in the first response, unless you have + received this token from an error message. + type: string + resourceVersion: + description: 'String that identifies the server''s internal + version of this object that can be used by clients to + determine when objects have changed. Value must be treated + as opaque by clients and passed unmodified back to the + server. Populated by the system. Read-only. More info: + https://git.k8s.io/community/contributors/devel/api-conventions.md#concurrency-control-and-consistency' + type: string + selfLink: + description: selfLink is a URL representing this object. + Populated by the system. Read-only. + type: string + type: object + reason: + description: A machine-readable description of why this operation + is in the "Failure" status. If this value is empty there + is no information available. A Reason clarifies an HTTP + status code but does not override it. + type: string + status: + description: 'Status of the operation. One of: "Success" or + "Failure". More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status' + type: string + type: object + required: + - pending + type: object + labels: + additionalProperties: + type: string + description: 'Map of string keys and values that can be used to organize + and categorize (scope and select) objects. May match selectors of + replication controllers and services. More info: http://kubernetes.io/docs/user-guide/labels' + type: object + managedFields: + description: "ManagedFields maps workflow-id and version to the set + of fields that are managed by that workflow. This is mostly for + internal housekeeping, and users typically shouldn't need to set + or understand this field. A workflow can be the user's name, a controller's + name, or the name of a specific apply path like \"ci-cd\". The set + of fields is always in the version that the workflow used when modifying + the object. \n This field is alpha and can be changed or removed + without notice." + items: + properties: + apiVersion: + description: APIVersion defines the version of this resource + that this field set applies to. The format is "group/version" + just like the top-level APIVersion field. It is necessary + to track the version of a field set because it cannot be automatically + converted. + type: string + fields: + additionalProperties: true + description: Fields identifies a set of fields. + type: object + manager: + description: Manager is an identifier of the workflow managing + these fields. + type: string + operation: + description: Operation is the type of operation which lead to + this ManagedFieldsEntry being created. The only valid values + for this field are 'Apply' and 'Update'. + type: string + time: + description: Time is timestamp of when these fields were set. + It should always be empty if Operation is 'Apply' + format: date-time + type: string + type: object + type: array + name: + description: 'Name must be unique within a namespace. Is required + when creating resources, although some resources may allow a client + to request the generation of an appropriate name automatically. + Name is primarily intended for creation idempotence and configuration + definition. Cannot be updated. More info: http://kubernetes.io/docs/user-guide/identifiers#names' + type: string + namespace: + description: "Namespace defines the space within each name must be + unique. An empty namespace is equivalent to the \"default\" namespace, + but \"default\" is the canonical representation. Not all objects + are required to be scoped to a namespace - the value of this field + for those objects will be empty. \n Must be a DNS_LABEL. Cannot + be updated. More info: http://kubernetes.io/docs/user-guide/namespaces" + type: string + ownerReferences: + description: List of objects depended by this object. If ALL objects + in the list have been deleted, this object will be garbage collected. + If this object is managed by a controller, then an entry in this + list will point to this controller, with the controller field set + to true. There cannot be more than one managing controller. + items: + properties: + apiVersion: + description: API version of the referent. + type: string + blockOwnerDeletion: + description: If true, AND if the owner has the "foregroundDeletion" + finalizer, then the owner cannot be deleted from the key-value + store until this reference is removed. Defaults to false. + To set this field, a user needs "delete" permission of the + owner, otherwise 422 (Unprocessable Entity) will be returned. + type: boolean + controller: + description: If true, this reference points to the managing + controller. + type: boolean + kind: + description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' + type: string + name: + description: 'Name of the referent. More info: http://kubernetes.io/docs/user-guide/identifiers#names' + type: string + uid: + description: 'UID of the referent. More info: http://kubernetes.io/docs/user-guide/identifiers#uids' + type: string + required: + - apiVersion + - kind + - name + - uid + type: object + type: array + resourceVersion: + description: "An opaque value that represents the internal version + of this object that can be used by clients to determine when objects + have changed. May be used for optimistic concurrency, change detection, + and the watch operation on a resource or set of resources. Clients + must treat these values as opaque and passed unmodified back to + the server. They may only be valid for a particular resource or + set of resources. \n Populated by the system. Read-only. Value must + be treated as opaque by clients and . More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#concurrency-control-and-consistency" + type: string + selfLink: + description: SelfLink is a URL representing this object. Populated + by the system. Read-only. + type: string + uid: + description: "UID is the unique in time and space value for this object. + It is typically generated by the server on successful creation of + a resource and is not allowed to change on PUT operations. \n Populated + by the system. Read-only. More info: http://kubernetes.io/docs/user-guide/identifiers#uids" + type: string + type: object + spec: + properties: + collector: + properties: + name: + type: string + namespace: + type: string + required: + - name + type: object + required: + - collector + type: object + status: + properties: + failed: + items: + type: string + type: array + running: + items: + type: string + type: array + successful: + items: + type: string + type: array + required: + - running + - successful + - failed + type: object + type: object + served: true + storage: true +status: + acceptedNames: + kind: "" + plural: "" + conditions: [] + storedVersions: [] diff --git a/config/crd/troubleshoot.replicated.com_collectors.yaml b/config/crds/troubleshoot.replicated.com_collectors.yaml similarity index 100% rename from config/crd/troubleshoot.replicated.com_collectors.yaml rename to config/crds/troubleshoot.replicated.com_collectors.yaml diff --git a/config/crd/troubleshoot.replicated.com_preflightjobs.yaml b/config/crds/troubleshoot.replicated.com_preflightjobs.yaml similarity index 100% rename from config/crd/troubleshoot.replicated.com_preflightjobs.yaml rename to config/crds/troubleshoot.replicated.com_preflightjobs.yaml diff --git a/config/crd/troubleshoot.replicated.com_preflights.yaml b/config/crds/troubleshoot.replicated.com_preflights.yaml similarity index 100% rename from config/crd/troubleshoot.replicated.com_preflights.yaml rename to config/crds/troubleshoot.replicated.com_preflights.yaml diff --git a/config/crds/zz_generated.deepcopy.go b/config/crds/zz_generated.deepcopy.go new file mode 100644 index 00000000..469b435a --- /dev/null +++ b/config/crds/zz_generated.deepcopy.go @@ -0,0 +1,604 @@ +// +build !ignore_autogenerated + +// autogenerated by controller-gen object, do not modify manually + +package v1beta1 + +import ( + runtime "k8s.io/apimachinery/pkg/runtime" +) + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *Analyzer) DeepCopyInto(out *Analyzer) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + out.Spec = in.Spec + out.Status = in.Status +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Analyzer. +func (in *Analyzer) DeepCopy() *Analyzer { + if in == nil { + return nil + } + out := new(Analyzer) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *Analyzer) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *AnalyzerJob) DeepCopyInto(out *AnalyzerJob) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + out.Spec = in.Spec + out.Status = in.Status +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AnalyzerJob. +func (in *AnalyzerJob) DeepCopy() *AnalyzerJob { + if in == nil { + return nil + } + out := new(AnalyzerJob) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *AnalyzerJob) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *AnalyzerJobList) DeepCopyInto(out *AnalyzerJobList) { + *out = *in + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]AnalyzerJob, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AnalyzerJobList. +func (in *AnalyzerJobList) DeepCopy() *AnalyzerJobList { + if in == nil { + return nil + } + out := new(AnalyzerJobList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *AnalyzerJobList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *AnalyzerJobSpec) DeepCopyInto(out *AnalyzerJobSpec) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AnalyzerJobSpec. +func (in *AnalyzerJobSpec) DeepCopy() *AnalyzerJobSpec { + if in == nil { + return nil + } + out := new(AnalyzerJobSpec) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *AnalyzerJobStatus) DeepCopyInto(out *AnalyzerJobStatus) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AnalyzerJobStatus. +func (in *AnalyzerJobStatus) DeepCopy() *AnalyzerJobStatus { + if in == nil { + return nil + } + out := new(AnalyzerJobStatus) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *AnalyzerList) DeepCopyInto(out *AnalyzerList) { + *out = *in + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Analyzer, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AnalyzerList. +func (in *AnalyzerList) DeepCopy() *AnalyzerList { + if in == nil { + return nil + } + out := new(AnalyzerList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *AnalyzerList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *AnalyzerSpec) DeepCopyInto(out *AnalyzerSpec) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AnalyzerSpec. +func (in *AnalyzerSpec) DeepCopy() *AnalyzerSpec { + if in == nil { + return nil + } + out := new(AnalyzerSpec) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *AnalyzerStatus) DeepCopyInto(out *AnalyzerStatus) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AnalyzerStatus. +func (in *AnalyzerStatus) DeepCopy() *AnalyzerStatus { + if in == nil { + return nil + } + out := new(AnalyzerStatus) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ClusterInfo) DeepCopyInto(out *ClusterInfo) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterInfo. +func (in *ClusterInfo) DeepCopy() *ClusterInfo { + if in == nil { + return nil + } + out := new(ClusterInfo) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *Collect) DeepCopyInto(out *Collect) { + *out = *in + if in.ClusterInfo != nil { + in, out := &in.ClusterInfo, &out.ClusterInfo + *out = new(ClusterInfo) + **out = **in + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Collect. +func (in *Collect) DeepCopy() *Collect { + if in == nil { + return nil + } + out := new(Collect) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *Collector) DeepCopyInto(out *Collector) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + if in.Spec != nil { + in, out := &in.Spec, &out.Spec + *out = make([]*Collect, len(*in)) + for i := range *in { + if (*in)[i] != nil { + in, out := &(*in)[i], &(*out)[i] + *out = new(Collect) + (*in).DeepCopyInto(*out) + } + } + } + out.Status = in.Status +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Collector. +func (in *Collector) DeepCopy() *Collector { + if in == nil { + return nil + } + out := new(Collector) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *Collector) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *CollectorJob) DeepCopyInto(out *CollectorJob) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + out.Spec = in.Spec + in.Status.DeepCopyInto(&out.Status) +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CollectorJob. +func (in *CollectorJob) DeepCopy() *CollectorJob { + if in == nil { + return nil + } + out := new(CollectorJob) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *CollectorJob) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *CollectorJobList) DeepCopyInto(out *CollectorJobList) { + *out = *in + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]CollectorJob, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CollectorJobList. +func (in *CollectorJobList) DeepCopy() *CollectorJobList { + if in == nil { + return nil + } + out := new(CollectorJobList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *CollectorJobList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *CollectorJobSpec) DeepCopyInto(out *CollectorJobSpec) { + *out = *in + out.Collector = in.Collector +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CollectorJobSpec. +func (in *CollectorJobSpec) DeepCopy() *CollectorJobSpec { + if in == nil { + return nil + } + out := new(CollectorJobSpec) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *CollectorJobStatus) DeepCopyInto(out *CollectorJobStatus) { + *out = *in + if in.Running != nil { + in, out := &in.Running, &out.Running + *out = make([]string, len(*in)) + copy(*out, *in) + } + if in.Successful != nil { + in, out := &in.Successful, &out.Successful + *out = make([]string, len(*in)) + copy(*out, *in) + } + if in.Failed != nil { + in, out := &in.Failed, &out.Failed + *out = make([]string, len(*in)) + copy(*out, *in) + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CollectorJobStatus. +func (in *CollectorJobStatus) DeepCopy() *CollectorJobStatus { + if in == nil { + return nil + } + out := new(CollectorJobStatus) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *CollectorList) DeepCopyInto(out *CollectorList) { + *out = *in + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Collector, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CollectorList. +func (in *CollectorList) DeepCopy() *CollectorList { + if in == nil { + return nil + } + out := new(CollectorList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *CollectorList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *CollectorRef) DeepCopyInto(out *CollectorRef) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CollectorRef. +func (in *CollectorRef) DeepCopy() *CollectorRef { + if in == nil { + return nil + } + out := new(CollectorRef) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *CollectorStatus) DeepCopyInto(out *CollectorStatus) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CollectorStatus. +func (in *CollectorStatus) DeepCopy() *CollectorStatus { + if in == nil { + return nil + } + out := new(CollectorStatus) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *Preflight) DeepCopyInto(out *Preflight) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + out.Spec = in.Spec + out.Status = in.Status +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Preflight. +func (in *Preflight) DeepCopy() *Preflight { + if in == nil { + return nil + } + out := new(Preflight) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *Preflight) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *PreflightJob) DeepCopyInto(out *PreflightJob) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + out.Spec = in.Spec + out.Status = in.Status +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PreflightJob. +func (in *PreflightJob) DeepCopy() *PreflightJob { + if in == nil { + return nil + } + out := new(PreflightJob) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *PreflightJob) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *PreflightJobList) DeepCopyInto(out *PreflightJobList) { + *out = *in + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]PreflightJob, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PreflightJobList. +func (in *PreflightJobList) DeepCopy() *PreflightJobList { + if in == nil { + return nil + } + out := new(PreflightJobList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *PreflightJobList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *PreflightJobSpec) DeepCopyInto(out *PreflightJobSpec) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PreflightJobSpec. +func (in *PreflightJobSpec) DeepCopy() *PreflightJobSpec { + if in == nil { + return nil + } + out := new(PreflightJobSpec) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *PreflightJobStatus) DeepCopyInto(out *PreflightJobStatus) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PreflightJobStatus. +func (in *PreflightJobStatus) DeepCopy() *PreflightJobStatus { + if in == nil { + return nil + } + out := new(PreflightJobStatus) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *PreflightList) DeepCopyInto(out *PreflightList) { + *out = *in + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Preflight, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PreflightList. +func (in *PreflightList) DeepCopy() *PreflightList { + if in == nil { + return nil + } + out := new(PreflightList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *PreflightList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *PreflightSpec) DeepCopyInto(out *PreflightSpec) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PreflightSpec. +func (in *PreflightSpec) DeepCopy() *PreflightSpec { + if in == nil { + return nil + } + out := new(PreflightSpec) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *PreflightStatus) DeepCopyInto(out *PreflightStatus) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PreflightStatus. +func (in *PreflightStatus) DeepCopy() *PreflightStatus { + if in == nil { + return nil + } + out := new(PreflightStatus) + in.DeepCopyInto(out) + return out +} diff --git a/pkg/apis/troubleshoot/v1beta1/collectorjob_types.go b/pkg/apis/troubleshoot/v1beta1/collectorjob_types.go index 6c999f29..d485a24f 100644 --- a/pkg/apis/troubleshoot/v1beta1/collectorjob_types.go +++ b/pkg/apis/troubleshoot/v1beta1/collectorjob_types.go @@ -32,9 +32,9 @@ type CollectorJobSpec struct { // CollectorJobStatus defines the observed state of CollectorJob type CollectorJobStatus struct { - // Running []string `json:"running"` - // Successful []string `json:"successful"` - // Failed []string `json:"failed"` + Running []string `json:"running"` + Successful []string `json:"successful"` + Failed []string `json:"failed"` } // +genclient diff --git a/pkg/apis/troubleshoot/v1beta1/zz_generated.deepcopy.go b/pkg/apis/troubleshoot/v1beta1/zz_generated.deepcopy.go index 32d432bf..f4323855 100644 --- a/pkg/apis/troubleshoot/v1beta1/zz_generated.deepcopy.go +++ b/pkg/apis/troubleshoot/v1beta1/zz_generated.deepcopy.go @@ -1,5 +1,21 @@ // +build !ignore_autogenerated +/* +Copyright 2019 Replicated, Inc.. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + // autogenerated by controller-gen object, do not modify manually package v1beta1 @@ -264,7 +280,7 @@ func (in *CollectorJob) DeepCopyInto(out *CollectorJob) { out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) out.Spec = in.Spec - out.Status = in.Status + in.Status.DeepCopyInto(&out.Status) } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CollectorJob. @@ -336,6 +352,21 @@ func (in *CollectorJobSpec) DeepCopy() *CollectorJobSpec { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CollectorJobStatus) DeepCopyInto(out *CollectorJobStatus) { *out = *in + if in.Running != nil { + in, out := &in.Running, &out.Running + *out = make([]string, len(*in)) + copy(*out, *in) + } + if in.Successful != nil { + in, out := &in.Successful, &out.Successful + *out = make([]string, len(*in)) + copy(*out, *in) + } + if in.Failed != nil { + in, out := &in.Failed, &out.Failed + *out = make([]string, len(*in)) + copy(*out, *in) + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CollectorJobStatus. diff --git a/pkg/controller/collectorjob/collectorjob_controller.go b/pkg/controller/collectorjob/collectorjob_controller.go index 4b4371fe..9a980765 100644 --- a/pkg/controller/collectorjob/collectorjob_controller.go +++ b/pkg/controller/collectorjob/collectorjob_controller.go @@ -20,13 +20,13 @@ import ( "context" troubleshootv1beta1 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta1" - // troubleshootclientv1beta1 "github.com/replicatedhq/troubleshoot/pkg/client/troubleshootclientset/typed/troubleshoot/v1beta1" + troubleshootclientv1beta1 "github.com/replicatedhq/troubleshoot/pkg/client/troubleshootclientset/typed/troubleshoot/v1beta1" // corev1 "k8s.io/api/core/v1" kuberneteserrors "k8s.io/apimachinery/pkg/api/errors" - // metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/client" - // "sigs.k8s.io/controller-runtime/pkg/client/config" + "sigs.k8s.io/controller-runtime/pkg/client/config" "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/handler" "sigs.k8s.io/controller-runtime/pkg/manager" @@ -104,77 +104,77 @@ func (r *ReconcileCollectorJob) Reconcile(request reconcile.Request) (reconcile. return reconcile.Result{}, err } - // namespace := instance.Namespace - // if instance.Spec.Collector.Namespace != "" { - // namespace = instance.Spec.Collector.Namespace - // } + namespace := instance.Namespace + if instance.Spec.Collector.Namespace != "" { + namespace = instance.Spec.Collector.Namespace + } - // collectorSpec, err := r.getCollectorSpec(namespace, instance.Spec.Collector.Name) - // if err != nil { - // return reconcile.Result{}, err - // } + collectorSpec, err := r.getCollectorSpec(namespace, instance.Spec.Collector.Name) + if err != nil { + return reconcile.Result{}, err + } - // for _, collector := range collectorSpec.Spec { - // if err := r.reconileOneCollectorJob(instance, collector); err != nil { - // return reconcile.Result{}, nil - // } - // } + for _, collector := range collectorSpec.Spec { + if err := r.reconileOneCollectorJob(instance, collector); err != nil { + return reconcile.Result{}, nil + } + } return reconcile.Result{}, nil } -// func (r *ReconcileCollectorJob) getCollectorSpec(namespace string, name string) (*troubleshootv1beta1.Collector, error) { -// cfg, err := config.GetConfig() -// if err != nil { -// return nil, err -// } +func (r *ReconcileCollectorJob) getCollectorSpec(namespace string, name string) (*troubleshootv1beta1.Collector, error) { + cfg, err := config.GetConfig() + if err != nil { + return nil, err + } -// troubleshootClient, err := troubleshootclientv1beta1.NewForConfig(cfg) -// if err != nil { -// return nil, err -// } + troubleshootClient, err := troubleshootclientv1beta1.NewForConfig(cfg) + if err != nil { + return nil, err + } -// collector, err := troubleshootClient.Collectors(namespace).Get(name, metav1.GetOptions{}) -// if err != nil { -// if kuberneteserrors.IsNotFound(err) { -// return nil, nil -// } + collector, err := troubleshootClient.Collectors(namespace).Get(name, metav1.GetOptions{}) + if err != nil { + if kuberneteserrors.IsNotFound(err) { + return nil, nil + } -// return nil, err -// } + return nil, err + } -// return collector, nil -// } + return collector, nil +} -// func (r *ReconcileCollectorJob) reconileOneCollectorJob(instance *troubleshootv1beta1.CollectorJob, collect *troubleshootv1beta1.Collect) error { -// // if contains(instance.Status.Successful, idForCollector(collect)) { -// // return nil -// // } -// // if contains(instance.Status.Failed, idForCollector(collect)) { -// // return nil -// // } +func (r *ReconcileCollectorJob) reconileOneCollectorJob(instance *troubleshootv1beta1.CollectorJob, collect *troubleshootv1beta1.Collect) error { + if contains(instance.Status.Successful, idForCollector(collect)) { + return nil + } + if contains(instance.Status.Failed, idForCollector(collect)) { + return nil + } -// // // if it's running already... -// // if contains(instance.Status.Running, idForCollector(collect)) { -// // return nil -// // } + // if it's running already... + if contains(instance.Status.Running, idForCollector(collect)) { + return nil + } -// return nil -// } + return nil +} -// func idForCollector(collector *troubleshootv1beta1.Collect) string { -// if collector.ClusterInfo != nil { -// return "cluster-info" -// } +func idForCollector(collector *troubleshootv1beta1.Collect) string { + if collector.ClusterInfo != nil { + return "cluster-info" + } -// return "" -// } + return "" +} -// func contains(s []string, e string) bool { -// for _, a := range s { -// if a == e { -// return true -// } -// } -// return false -// } +func contains(s []string, e string) bool { + for _, a := range s { + if a == e { + return true + } + } + return false +}