demeter-run · paulobressan · Dec 21, 2023 · Dec 20, 2023 · Dec 20, 2023 · Dec 20, 2023
diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml
@@ -11,7 +11,12 @@ on:
 jobs:
   lint:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./operator
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
+
       - name: Clippy check lints
         run: cargo clippy -- -D warnings
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -11,6 +11,9 @@ on:
 jobs:
   run-controller:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./operator
     steps:
       - name: Checkout
         uses: actions/checkout@v3

diff --git a/bootstrap/crds/main.tf b/bootstrap/crds/main.tf
@@ -0,0 +1,91 @@
+resource "kubernetes_manifest" "customresourcedefinition_dbsyncports_demeter_run" {
+  manifest = {
+    "apiVersion" = "apiextensions.k8s.io/v1"
+    "kind" = "CustomResourceDefinition"
+    "metadata" = {
+      "name" = "dbsyncports.demeter.run"
+    }
+    "spec" = {
+      "group" = "demeter.run"
+      "names" = {
+        "categories" = []
+        "kind" = "DbSyncPort"
+        "plural" = "dbsyncports"
+        "shortNames" = []
+        "singular" = "dbsyncport"
+      }
+      "scope" = "Namespaced"
+      "versions" = [
+        {
+          "additionalPrinterColumns" = [
+            {
+              "jsonPath" = ".spec.network"
+              "name" = "Network"
+              "type" = "string"
+            },
+            {
+              "jsonPath" = ".status.username"
+              "name" = "Username"
+              "type" = "string"
+            },
+            {
+              "jsonPath" = ".status.password"
+              "name" = "Password"
+              "type" = "string"
+            },
+          ]
+          "name" = "v1alpha1"
+          "schema" = {
+            "openAPIV3Schema" = {
+              "description" = "Auto-generated derived type for DbSyncPortSpec via `CustomResource`"
+              "properties" = {
+                "spec" = {
+                  "properties" = {
+                    "network" = {
+                      "enum" = [
+                        "mainnet",
+                        "preprod",
+                        "preview",
+                      ]
+                      "type" = "string"
+                    }
+                  }
+                  "required" = [
+                    "network",
+                  ]
+                  "type" = "object"
+                }
+                "status" = {
+                  "nullable" = true
+                  "properties" = {
+                    "password" = {
+                      "type" = "string"
+                    }
+                    "username" = {
+                      "type" = "string"
+                    }
+                  }
+                  "required" = [
+                    "password",
+                    "username",
+                  ]
+                  "type" = "object"
+                }
+              }
+              "required" = [
+                "spec",
+              ]
+              "title" = "DbSyncPort"
+              "type" = "object"
+            }
+          }
+          "served" = true
+          "storage" = true
+          "subresources" = {
+            "status" = {}
+          }
+        },
+      ]
+    }
+  }
+}
diff --git a/.gitignore → operator/.gitignore b/.gitignore → operator/.gitignore
@@ -1,2 +1,3 @@
 /target
-.env
+.env
+ci
diff --git a/Cargo.lock → operator/Cargo.lock b/Cargo.lock → operator/Cargo.lock
diff --git a/Cargo.toml → operator/Cargo.toml b/Cargo.toml → operator/Cargo.toml
diff --git a/Dockerfile → operator/Dockerfile b/Dockerfile → operator/Dockerfile
diff --git a/LICENSE → operator/LICENSE b/LICENSE → operator/LICENSE
diff --git a/README.md → operator/README.md b/README.md → operator/README.md
diff --git a/benchmark/.gitignore → operator/benchmark/.gitignore b/benchmark/.gitignore → operator/benchmark/.gitignore
diff --git a/benchmark/Dockerfile → operator/benchmark/Dockerfile b/benchmark/Dockerfile → operator/benchmark/Dockerfile
diff --git a/benchmark/README.md → operator/benchmark/README.md b/benchmark/README.md → operator/benchmark/README.md
diff --git a/benchmark/bench.sql → operator/benchmark/bench.sql b/benchmark/bench.sql → operator/benchmark/bench.sql
diff --git a/src/controller.rs → operator/src/controller.rs b/src/controller.rs → operator/src/controller.rs
@@ -16,7 +16,7 @@ use serde_json::json;
 use std::{sync::Arc, time::Duration};
 use tracing::error;
 
-use crate::{postgres::Postgres, Config, Error, Metrics, State, Network};
+use crate::{postgres::Postgres, Config, Error, Metrics, Network, State};
 
 pub static DB_SYNC_PORT_FINALIZER: &str = "dbsyncports.demeter.run";
 
@@ -36,8 +36,18 @@ impl Context {
 }
 
 #[derive(CustomResource, Deserialize, Serialize, Clone, Debug, JsonSchema)]
-#[kube(kind = "DbSyncPort", group = "demeter.run", version = "v1", namespaced)]
+#[kube(
+    kind = "DbSyncPort",
+    group = "demeter.run",
+    version = "v1alpha1",
+    namespaced
+)]
 #[kube(status = "DbSyncPortStatus")]
+#[kube(printcolumn = r#"
+        {"name": "Network", "jsonPath": ".spec.network", "type": "string"},
+        {"name": "Username", "jsonPath": ".status.username",  "type": "string"},
+        {"name": "Password", "jsonPath": ".status.password", "type": "string"}
+    "#)]
 pub struct DbSyncPortSpec {
     pub network: Network,
 }
@@ -70,7 +80,7 @@ impl DbSyncPort {
             };
 
             let new_status = Patch::Apply(json!({
-                "apiVersion": "demeter.run/v1",
+                "apiVersion": "demeter.run/v1alpha1",
                 "kind": "DbSyncPort",
                 "status": DbSyncPortStatus {
                     username: username.clone(),

diff --git a/src/crdgen.rs → operator/src/crdgen.rs b/src/crdgen.rs → operator/src/crdgen.rs
diff --git a/src/lib.rs → operator/src/lib.rs b/src/lib.rs → operator/src/lib.rs
diff --git a/src/main.rs → operator/src/main.rs b/src/main.rs → operator/src/main.rs
diff --git a/src/metrics.rs → operator/src/metrics.rs b/src/metrics.rs → operator/src/metrics.rs
diff --git a/src/postgres.rs → operator/src/postgres.rs b/src/postgres.rs → operator/src/postgres.rs
diff --git a/test/manifest.yaml → operator/test/manifest.yaml b/test/manifest.yaml → operator/test/manifest.yaml
@@ -197,7 +197,7 @@ spec:
       targetPort: 80
       protocol: TCP
 ---
-apiVersion: demeter.run/v1
+apiVersion: demeter.run/v1alpha1
 kind: DbSyncPort
 metadata:
   name: ci-user

diff --git a/test/validate-execution → operator/test/validate-execution b/test/validate-execution → operator/test/validate-execution
diff --git a/operator/yaml/dbsyncport.yaml b/operator/yaml/dbsyncport.yaml
@@ -0,0 +1,59 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: dbsyncports.demeter.run
+spec:
+  group: demeter.run
+  names:
+    categories: []
+    kind: DbSyncPort
+    plural: dbsyncports
+    shortNames: []
+    singular: dbsyncport
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.network
+      name: Network
+      type: string
+    - jsonPath: .status.username
+      name: Username
+      type: string
+    - jsonPath: .status.password
+      name: Password
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: Auto-generated derived type for DbSyncPortSpec via `CustomResource`
+        properties:
+          spec:
+            properties:
+              network:
+                enum:
+                - mainnet
+                - preprod
+                - preview
+                type: string
+            required:
+            - network
+            type: object
+          status:
+            nullable: true
+            properties:
+              password:
+                type: string
+              username:
+                type: string
+            required:
+            - password
+            - username
+            type: object
+        required:
+        - spec
+        title: DbSyncPort
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
diff --git a/yaml/user-access.yaml → operator/yaml/user-access.yaml b/yaml/user-access.yaml → operator/yaml/user-access.yaml
@@ -1,4 +1,4 @@
-apiVersion: demeter.run/v1
+apiVersion: demeter.run/v1alpha1
 kind: DbSyncPort
 metadata:
   name: mainnet-user

diff --git a/yaml/user-namespace.yaml → operator/yaml/user-namespace.yaml b/yaml/user-namespace.yaml → operator/yaml/user-namespace.yaml
diff --git a/scripts/crd.sh b/scripts/crd.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+cd ../operator
+cargo run --bin crdgen | tfk8s > ../bootstrap/crds/main.tf
+
diff --git a/yaml/dbsyncport.yaml b/yaml/dbsyncport.yaml
-Original file line number
+Diff line change
@@ -1,2 +1,3 @@
     /target
-    .env
+    .env
+    ci