-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Completed a working alpha for the operator (#11)
* Made the operator parse messages and create config map from it * Created Logic top copying reference pod * Deploy the log-output with flowtest * Refactor the CRDs and the controller * Implemented cleanUpResources * Added coded to slice the flow * added error status * Fixed Flow deployment * created the index checker * Fixed few typos * Flow send logs data to log-output pod * controller update passed matches and clean up passing flows * Fixed the issue with filter test * Updated demo flow * Fixed issues mentioned in the review
- Loading branch information
Showing
17 changed files
with
1,653 additions
and
971 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
1,866 changes: 943 additions & 923 deletions
1,866
operator/config/crd/bases/loggingplumber.isala.me_flowtests.yaml
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| apiVersion: v1 | ||
| kind: Pod | ||
| metadata: | ||
| name: busybox-echo | ||
| labels: | ||
| loggingplumber.isala.me/test: simulations | ||
| spec: | ||
| containers: | ||
| - name: busybox | ||
| image: busybox | ||
| command: ["sh", "-c", "x=1; while [ $x -gt -1 ]; do echo \"{'count': '$(( x++ ))', 'date': '$(date)'}\" && sleep 5; done"] | ||
| --- | ||
| apiVersion: logging.banzaicloud.io/v1beta1 | ||
| kind: Flow | ||
| metadata: | ||
| name: busybox-echo | ||
| labels: | ||
| loggingplumber.isala.me/test: simulations | ||
| spec: | ||
| localOutputRefs: | ||
| - busybox-echo | ||
| match: | ||
| - select: | ||
| labels: | ||
| loggingplumber.isala.me/test: invalid | ||
| - select: | ||
| labels: | ||
| loggingplumber.isala.me/test: simulations | ||
| filters: | ||
| - record_modifier: | ||
| records: | ||
| - foo: "bar" | ||
| - grep: | ||
| regexp: | ||
| - key: first | ||
| pattern: /^5\d\d$/ | ||
| --- | ||
| apiVersion: logging.banzaicloud.io/v1beta1 | ||
| kind: Output | ||
| metadata: | ||
| name: busybox-echo | ||
| labels: | ||
| loggingplumber.isala.me/test: simulations | ||
| spec: | ||
| http: | ||
| endpoint: "http://logging-plumber-log-aggregator.default.svc/busybox-echo/" | ||
| buffer: | ||
| flush_interval: 10s | ||
| flush_mode: interval | ||
| --- | ||
| apiVersion: v1 | ||
| kind: Service | ||
| metadata: | ||
| name: logging-plumber-log-aggregator | ||
| labels: | ||
| loggingplumber.isala.me/test: simulations | ||
| spec: | ||
| type: ClusterIP | ||
| ports: | ||
| - port: 80 | ||
| targetPort: http | ||
| protocol: TCP | ||
| name: http | ||
| selector: | ||
| app.kubernetes.io/name: logging-plumber-log-aggregator | ||
| app.kubernetes.io/managed-by: rancher-logging-explorer | ||
| app.kubernetes.io/created-by: logging-plumber | ||
| loggingplumber.isala.me/component: log-aggregator |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| package controllers | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| flowv1beta1 "github.com/banzaicloud/logging-operator/pkg/sdk/api/v1beta1" | ||
| v1 "k8s.io/api/core/v1" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
| "sigs.k8s.io/controller-runtime/pkg/log" | ||
| ) | ||
|
|
||
| func (r *FlowTestReconciler) cleanUpResources(ctx context.Context, flowTestName string) error { | ||
| logger := log.FromContext(ctx) | ||
|
|
||
| matchingLabels := &client.MatchingLabels{"loggingplumber.isala.me/flowtest": flowTestName} | ||
|
|
||
| var podList v1.PodList | ||
| if err := r.List(ctx, &podList, matchingLabels); client.IgnoreNotFound(err) != nil { | ||
| logger.Error(err, fmt.Sprintf("failed to get provisioned %s", podList.Kind)) | ||
| return err | ||
| } | ||
|
|
||
| for _, resource := range podList.Items { | ||
| if err := r.Delete(ctx, &resource); client.IgnoreNotFound(err) != nil { | ||
| logger.Error(err, fmt.Sprintf("failed to delete a provisioned %s", resource.Kind), "uuid", resource.GetUID(), "name", resource.GetName()) | ||
| return err | ||
| } | ||
| logger.V(1).Info(fmt.Sprintf("%s deleted", resource.Kind), "uuid", resource.GetUID(), "name", resource.GetName()) | ||
| } | ||
|
|
||
| var configMapList v1.ConfigMapList | ||
| if err := r.List(ctx, &configMapList, matchingLabels); client.IgnoreNotFound(err) != nil { | ||
| logger.Error(err, fmt.Sprintf("failed to get provisioned %s", configMapList.Kind)) | ||
| return err | ||
| } | ||
|
|
||
| for _, resource := range configMapList.Items { | ||
| if err := r.Delete(ctx, &resource); client.IgnoreNotFound(err) != nil { | ||
| logger.Error(err, fmt.Sprintf("failed to delete a provisioned %s", resource.Kind), "uuid", resource.GetUID(), "name", resource.GetName()) | ||
| return err | ||
| } | ||
| logger.V(1).Info(fmt.Sprintf("%s deleted", resource.Kind), "uuid", resource.GetUID(), "name", resource.GetName()) | ||
| } | ||
|
|
||
| var flows flowv1beta1.FlowList | ||
| if err := r.List(ctx, &flows, &client.MatchingLabels{"loggingplumber.isala.me/flowtest": flowTestName}); client.IgnoreNotFound(err) != nil { | ||
| logger.Error(err, fmt.Sprintf("failed to get provisioned %s", flows.Kind)) | ||
| //return err | ||
| } | ||
|
|
||
| for _, resource := range flows.Items { | ||
| if err := r.Delete(ctx, &resource); client.IgnoreNotFound(err) != nil { | ||
| logger.Error(err, fmt.Sprintf("failed to delete a provisioned %s", resource.Kind), "uuid", resource.GetUID(), "name", resource.GetName()) | ||
| return err | ||
| } | ||
| logger.V(1).Info(fmt.Sprintf("%s deleted", resource.Kind), "uuid", resource.GetUID(), "name", resource.GetName()) | ||
| } | ||
|
|
||
| var outputs flowv1beta1.OutputList | ||
| if err := r.List(ctx, &outputs, &client.MatchingLabels{"loggingplumber.isala.me/flowtest": flowTestName}); client.IgnoreNotFound(err) != nil { | ||
| logger.Error(err, fmt.Sprintf("failed to get provisioned %s", outputs.Kind)) | ||
| //return err | ||
| } | ||
|
|
||
| for _, resource := range outputs.Items { | ||
| if err := r.Delete(ctx, &resource); client.IgnoreNotFound(err) != nil { | ||
| logger.Error(err, fmt.Sprintf("failed to delete a provisioned %s", resource.Kind), "uuid", resource.GetUID(), "name", resource.GetName()) | ||
| return err | ||
| } | ||
| logger.V(1).Info(fmt.Sprintf("%s deleted", resource.Kind), "uuid", resource.GetUID(), "name", resource.GetName()) | ||
| } | ||
|
|
||
| return nil | ||
| } |
Oops, something went wrong.