Merge branch 'main' into cli-apply-resource-level

tembo-io · Dec 5, 2023 · 87ffd20 · 87ffd20
2 parents 73cfca9 + f9abff1
commit 87ffd20
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 13 deletions.
diff --git a/.github/workflows/cargo-test.yaml b/.github/workflows/cargo-test.yaml
@@ -20,7 +20,7 @@ jobs:
         uses: ./.github/actions/find-changed-directories
         with:
           contains_the_file: Cargo.toml
-          changed_relative_to_branch: ${{ github.base_ref || 'not-a-branch' }}
+          changed_relative_to_ref: origin/${{ github.base_ref || 'not-a-branch' }}
           ignore_dirs: ".coredb examples"
 
   lint:

diff --git a/.github/workflows/cargo_publish.yml b/.github/workflows/cargo_publish.yml
@@ -61,7 +61,7 @@ jobs:
             echo "fail_if_version_published=false" >> $GITHUB_OUTPUT
           else
             echo "dry_run=true" >> $GITHUB_OUTPUT
-            echo "fail_if_version_published=true" >> $GITHUB_OUTPUT
+            echo "fail_if_version_published=false" >> $GITHUB_OUTPUT
           fi
       - uses: Swatinem/rust-cache@v2
         with:

diff --git a/.github/workflows/helm-lint.yaml b/.github/workflows/helm-lint.yaml
@@ -19,19 +19,13 @@ jobs:
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3
-      - name: Check out the coredb repo to reuse some actions
-        uses: actions/checkout@v3
-        with:
-          repository: coredb-io/coredb
-          path: ./.coredb
-          ref: 84664df742ce9774a3029e08111940f9f1fb345e
       - name: Find directories with Dockerfiles that changed
         id: find_directories
-        uses: ./.coredb/.github/actions/find-changed-directories
+        uses: ./.github/actions/find-changed-directories
         with:
           contains_the_file: Chart.yaml
-          changed_relative_to_branch: ${{ github.base_ref || 'not-a-branch' }}
-          ignore_dirs: ".coredb"
+          changed_relative_to_ref: origin/${{ github.base_ref || 'not-a-branch' }}
+          ignore_dirs: "examples"
 
   lint:
     name: Build and push images

diff --git a/charts/tembo-operator/values.yaml b/charts/tembo-operator/values.yaml
@@ -10,7 +10,6 @@ podMonitor:
 
 env: []
 
-## Configure resource requests and limits
 resources:
   limits:
     cpu: 1000m

diff --git a/tembo-operator/README.md b/tembo-operator/README.md
@@ -1,6 +1,5 @@
 # Tembo Operator
 
-
 ## Requirements
 
 - A Kubernetes cluster: [kind](https://github.com/kubernetes-sigs/kind)