Skip to content
Closed
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
22c53d2
chore: bump asdf-vm/actions to 1902764435ca0dd2f3388eea723a4f92a4eb83…
May 30, 2025
e07b190
chore(pre-commit): AS-706 adding helm values schema
afoley587 Jun 12, 2025
1b87552
chore(pre-commit): AS-706 adding helm values schema
afoley587 Jun 12, 2025
7f6eb21
chore(pre-commit): AS-706 configuring pre-commit hooks
afoley587 Jun 12, 2025
a63890a
chore(pre-commit): AS-706 configuring pre-commit hooks
afoley587 Jun 12, 2025
e4eccbb
chore(pre-commit): AS-706 configuring pre-commit hooks
afoley587 Jun 12, 2025
5ab2f94
chore(pre-commit): AS-706 configuring pre-commit hooks
afoley587 Jun 12, 2025
09b652c
chore(pre-commit): AS-706 configuring pre-commit hooks
afoley587 Jun 12, 2025
5c51fcf
chore(pre-commit): AS-706 configuring pre-commit hooks
afoley587 Jun 12, 2025
86ac2c9
chore(pre-commit): AS-706 adding schema types
afoley587 Jun 12, 2025
34d8dc9
chore(make): AS-706 adding to makefile
afoley587 Jun 12, 2025
5e6d903
chore: Merge branch 'release/v2.9.0' into afoley/as-706-helm-values-s…
afoley587 Jun 12, 2025
f9d6d54
chore(merge): address merge conflicts
afoley587 Jun 12, 2025
89a5b20
chore(merge): address merge conflicts
afoley587 Jun 12, 2025
90edb56
chore(pre-commit): Use the makefile recipes
afoley587 Jun 12, 2025
9ea0f6b
chore(pre-commit): AS-706 address markdown lint errors
afoley587 Jun 13, 2025
4abc99e
chore(schema): AS-706 use new tool
afoley587 Jun 13, 2025
befa1cd
chore(schema): Updating with types
afoley587 Jun 13, 2025
79e5743
chore(schema): AS-706 adding validations
afoley587 Jun 13, 2025
8aa0a3c
chore(pre-commit): AS-706 update markdown lint findings
afoley587 Jun 16, 2025
18c01b7
chore(values): AS-706 type hint values
afoley587 Jun 16, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,7 @@ jobs:
- name: Temporary SQLite/LZMA - Install missing libraries
run: sudo apt install -y libsqlite3-dev libbz2-dev
- name: install asdf & tools
uses: asdf-vm/actions/install@1902764435ca0dd2f3388eea723a4f92a4eb8302
uses: asdf-vm/actions/install@v4.0.0
- name: Install helm plugins
run: make helm-plugins
- uses: pre-commit/action@v3.0.1
2 changes: 1 addition & 1 deletion .github/workflows/test-docker-pulls.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Temporary SQLite/LZMA - Install missing libraries
run: sudo apt install -y libsqlite3-dev libbz2-dev
- name: install asdf & tools
uses: asdf-vm/actions/install@1902764435ca0dd2f3388eea723a4f92a4eb8302
uses: asdf-vm/actions/install@v4.0.0
- name: Login to Docker Hub
uses: docker/login-action@v3
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: actions/checkout@v4.2.2
- uses: actions/setup-python@v5.6.0
- name: install asdf & tools
uses: asdf-vm/actions/install@1902764435ca0dd2f3388eea723a4f92a4eb8302
uses: asdf-vm/actions/install@v4.0.0
- name: Run unit tests
shell: bash
run: |
Expand All @@ -34,7 +34,7 @@ jobs:
- name: Temporary SQLite/LZMA - Install missing libraries
run: sudo apt install -y libsqlite3-dev libbz2-dev
- name: install asdf & tools
uses: asdf-vm/actions/install@1902764435ca0dd2f3388eea723a4f92a4eb8302
uses: asdf-vm/actions/install@v4.0.0
- name: Authenticate to Google Cloud
id: auth
uses: google-github-actions/auth@v2.1.7
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
- uses: actions/checkout@v4.2.2
- uses: actions/setup-python@v5.6.0
- name: install asdf & tools
uses: asdf-vm/actions/install@1902764435ca0dd2f3388eea723a4f92a4eb8302
uses: asdf-vm/actions/install@v4.0.0
- name: Authenticate to Google Cloud
id: auth
uses: google-github-actions/auth@v2.1.7
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-helm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Temporary SQLite/LZMA - Install missing libraries
run: sudo apt install -y libsqlite3-dev libbz2-dev
- name: install asdf & tools
uses: asdf-vm/actions/install@1902764435ca0dd2f3388eea723a4f92a4eb8302
uses: asdf-vm/actions/install@v4.0.0
- name: Run unit tests
shell: bash
run: |
Expand Down
8 changes: 8 additions & 0 deletions .markdownlint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,11 @@ default: true
MD013: # Line Length
code_blocks: false
tables: false

# MD059/descriptive-link-text Link text should be descriptive
# This rule marks things like:
# `Example nginx configurations can be found [here](../)`
# as errors.
# The context comes before the link so this seems
# like a fair rule to disable.
MD059: false
Comment thread
afoley587 marked this conversation as resolved.
Outdated
20 changes: 17 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ repos:
- id: end-of-file-fixer
- id: mixed-line-ending
- id: pretty-format-json
# Ignore generated files
exclude: ^helm/fiftyone-teams-app/values.schema.json
- id: trailing-whitespace
- repo: https://github.com/Lucas-C/pre-commit-hooks
rev: v1.5.5
Expand All @@ -30,11 +32,23 @@ repos:
args:
# Make the tool search for charts only under the `helm/fiftyone-teams-app` directory
- --chart-search-root=helm/fiftyone-teams-app

# A base filename makes it relative to each chart directory found
- --template-files=README.md.gotmpl
- repo: https://github.com/dadav/helm-schema
rev: 0.18.1
hooks:
- id: helm-schema
args:
- --chart-search-root=./helm/fiftyone-teams-app
- --no-dependencies
- --add-schema-reference
- --skip-auto-generation=additionalProperties,required
- --append-newline
# This breaks type annotations
# - --helm-docs-compatibility-mode

- repo: https://github.com/igorshubovych/markdownlint-cli
rev: v0.44.0
rev: v0.45.0
hooks:
- id: markdownlint
- id: markdownlint-fix
Expand Down Expand Up @@ -96,7 +110,7 @@ repos:
- --write
- --simplify
- repo: https://github.com/compilerla/conventional-pre-commit
rev: v4.1.0
rev: v4.2.0
hooks:
- id: conventional-pre-commit
stages: [commit-msg]
6 changes: 6 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@
make asdf
```

1. Additionally, install the `helm` plugins we use:

```shell
make helm-plugins
```

## Quickstart to Skaffold in Minikube

1. Auth with gcloud for the project `computer-vision-team`
Expand Down
28 changes: 28 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,34 @@ hooks: ## Install git hooks (pre-commit)
# Install environments for all available hooks now (rather than when they are first executed)
@pre-commit install --install-hooks

helm-plugins-diff: ## Installs the helm diff plugin
@echo "Checking if helm-diff plugin is installed..."
@if helm plugin list | grep -qE '^\s*diff\s'; then \
echo "helm-diff is already installed."; \
else \
echo "Installing helm-diff plugin..."; \
helm plugin install https://github.com/databus23/helm-diff; \
fi

helm-plugins-schema: ## Installs the helm schema plugin
@echo "Checking if helm-schema plugin is installed..."
@if helm plugin list | grep -qE '^\s*schema\s'; then \
echo "helm-schema is already installed."; \
else \
echo "Installing helm-schema plugin..."; \
helm plugin install https://github.com/dadav/helm-schema; \
fi

helm-plugins: helm-plugins-diff helm-plugins-schema ## Install the helm plugins we use

helm-schema: ## Generates the `values.schema.json` using `helm schema`
@helm schema \
--chart-search-root=./helm/fiftyone-teams-app \
--no-dependencies \
--add-schema-reference \
--skip-auto-generation=additionalProperties,required \
--append-newline

pre-commit: ## Run pre-commit against all files
@pre-commit run -a

Expand Down
Loading
Loading