Skip to content
This repository has been archived by the owner on Apr 11, 2024. It is now read-only.

refactor: standardize the code for getting Helm values #50

Closed
wants to merge 95 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
6c53bb1
build: Remove unused example kustomizations
jimmidyson Mar 21, 2024
ae3e809
Merge pull request #1 from d2iq-labs/jimmi/remove-unused-kustomizations
jimmidyson Mar 21, 2024
9f56b56
feat: Add user configuration for all providers
dlipovetsky Mar 18, 2024
08457eb
[WIP] added nutanix support
deepakm-ntnx Feb 20, 2024
e00083a
added nutanix examples for clusterclass and cluster
deepakm-ntnx Mar 21, 2024
1d13297
removed extra $ sign from all the variables
deepakm-ntnx Mar 21, 2024
e20cf32
Update hack/examples/sync.sh
deepakm-ntnx Mar 21, 2024
601c6a8
added new line to fix precommit lint
deepakm-ntnx Mar 22, 2024
db87f18
fix: removed trailing whitespaces
deepakm-ntnx Mar 22, 2024
7e2b6e6
reverted devbox.lock changes
deepakm-ntnx Mar 26, 2024
c1695ce
fix: updated patches to use existing variable
deepakm-ntnx Mar 26, 2024
d6f54fb
test(e2e): Rename config for CAREN rather than CRE
jimmidyson Mar 27, 2024
0cd416f
Merge pull request #8 from d2iq-labs/jimmi/more-caren-renames
jimmidyson Mar 27, 2024
650c3cf
fixup! feat: Add user configuration for all providers
dlipovetsky Mar 27, 2024
27072c6
fixup! feat: Add user configuration for all providers
dlipovetsky Mar 27, 2024
5656042
test: Ensure defaults from JSON schema are respected
jimmidyson Mar 28, 2024
b17718a
Merge pull request #9 from d2iq-labs/jimmi/variable-defaulting-in-tests
jimmidyson Mar 28, 2024
9748994
fixup! feat: Add user configuration for all providers
dlipovetsky Mar 28, 2024
554dacd
Merge pull request #5 from d2iq-labs/nutanix-examples
faiq Mar 28, 2024
1205a59
fixup! feat: Add user configuration for all providers
dlipovetsky Mar 28, 2024
a0cdd4b
fixup! feat: Add user configuration for all providers
dlipovetsky Mar 28, 2024
64b7afc
fixup! feat: Add user configuration for all providers
dlipovetsky Mar 28, 2024
37ec7c9
fixup! feat: Add user configuration for all providers
dlipovetsky Mar 28, 2024
0968ea6
fixup! feat: Add user configuration for all providers
dlipovetsky Mar 28, 2024
f09a28f
fixup! feat: Add user configuration for all providers
dlipovetsky Mar 28, 2024
5a73b71
fixup! feat: Add user configuration for all providers
dlipovetsky Mar 28, 2024
b8bcb0e
fixup! feat: Add user configuration for all providers
dlipovetsky Mar 28, 2024
dfd5cbe
fixup! fixup! feat: Add user configuration for all providers
dlipovetsky Mar 29, 2024
b0761a7
build: add Nutanix infra provider (#12)
dkoshkin Mar 29, 2024
47e578a
fix: rename cpi to ccm (#11)
dkoshkin Mar 29, 2024
83dbb72
test: Check for data races in go tests
dlipovetsky Mar 30, 2024
5dba101
test: Fix data race
dlipovetsky Mar 29, 2024
5081f42
Merge pull request #15 from dlipovetsky/test-data-race
dkoshkin Apr 1, 2024
63bca57
test: Fix false negative in httpproxy test (#17)
dlipovetsky Apr 1, 2024
cffe77c
test: Fix false negative in auditpolicy test (#16)
dlipovetsky Apr 1, 2024
7092a4c
fix: set a new name for the tigera cm for that cluster (#14)
faiq Apr 1, 2024
7662213
feat: adds nutanix csi to api
faiq Mar 18, 2024
e32da13
feat: minor API tweaks and adds tooling for chart
faiq Mar 19, 2024
d9f9e3e
feat: more api changes
faiq Mar 20, 2024
39cf44f
fix: adds proper permissions and api fixes
faiq Mar 21, 2024
c6733ba
fix: adds configuration for new storage to examples/
faiq Mar 21, 2024
d5c5ec2
fix: don't use deepcopy
faiq Mar 21, 2024
80a80db
fix: rename files to put the configmaps in the right place
faiq Mar 21, 2024
2280da1
refactor: apply suggestion from review
faiq Mar 26, 2024
efdeab1
fix: linting errors
faiq Mar 26, 2024
e4c3aa5
feat: adds nutanix driver create storage class
faiq Mar 26, 2024
e58e2f8
fix: pre-commit errors
faiq Mar 26, 2024
79defde
fix: pass in provisioner name
faiq Mar 27, 2024
7d0c094
refactor: deploy storage class as a cluster resource set
faiq Mar 27, 2024
a54e97c
refactor: change name of example sc
faiq Mar 28, 2024
dda31d8
fix: typo for default storage class key
faiq Mar 28, 2024
832cc64
fix: addon defaults for csi
faiq Mar 28, 2024
868022f
fix: sets the Items correctly
faiq Mar 28, 2024
25b05fc
fix: examples
faiq Mar 28, 2024
59bf818
fix: actually apply cm
faiq Mar 28, 2024
3eee6ce
fix: storage class crs
faiq Mar 28, 2024
f0397e5
fix: use a unique storage class cm per cluster
faiq Mar 28, 2024
c57e709
refactor: rename CSIProviders to CSI
faiq Mar 28, 2024
8ceebef
fix: more unit tests
faiq Mar 28, 2024
3269c5b
fix: gomod
faiq Mar 29, 2024
f963e97
test: adds a unit test for no params
faiq Mar 29, 2024
9ec05d1
feat: create crs from provider credentials
faiq Mar 29, 2024
13aa430
feat: set a default storage class if 1 provider and 1 storage class c…
faiq Mar 29, 2024
6845f96
refactor: use default storage config obj
faiq Mar 29, 2024
5ab09f8
feat: allow volume expansion
faiq Mar 29, 2024
05faebb
feat: deploy snapshot chart with nutanix
faiq Mar 29, 2024
92b06d4
fix: Nutanix examples (#19)
dkoshkin Apr 1, 2024
9cad889
Merge pull request #4 from dlipovetsky/users
faiq Apr 1, 2024
7665a94
fix: apply suggestions from reviews
faiq Apr 1, 2024
2ec54be
Merge pull request #7 from d2iq-labs/faiq/add-nutanix-csi
faiq Apr 1, 2024
ced51e3
docs: use a KUBERNETES_VERSION env variable (#22)
dkoshkin Apr 2, 2024
aa6feca
feat: Add support for CAPX (#6)
deepakm-ntnx Apr 3, 2024
d4768a4
refactor: CCM code to support both CRS and CAAPH provider (#25)
dkoshkin Apr 4, 2024
583014f
refactor: use a string type for Nutanix's AdditionalTrustBundle (#28)
dkoshkin Apr 4, 2024
c4bed7a
build: update devbox.lock (#29)
faiq Apr 4, 2024
f8c47e2
test: unit test for individual patch generator (#21)
supershal Apr 5, 2024
184e7d6
test: move all patch generator unit tests to their own packages (#23)
supershal Apr 5, 2024
8141a4c
feat: Make containerd restart its own patch (#18)
dlipovetsky Apr 5, 2024
2b1e7ec
build(deps): Bump golang.org/x/net to v0.24.0 (#42)
jimmidyson Apr 9, 2024
e78e6f9
build: add CSI configuration to Nutanix examples (#33)
dkoshkin Apr 9, 2024
cb8fadb
fix: use a LocalObjectReference for credentials Secret (#37)
dkoshkin Apr 9, 2024
0e91d4d
fix: the handlers should be changing user provided input (#35)
dkoshkin Apr 9, 2024
f819811
refactor: combine PC host and port into a single url var (#36)
dkoshkin Apr 9, 2024
92184b0
ci: Always use latest go for govulncheck (#41)
jimmidyson Apr 9, 2024
5a384e3
ci: Disable fail-fast for matrix jobs (#43)
jimmidyson Apr 9, 2024
21f4055
fix: Nutanix CSI credentials Secret creation (#34)
dkoshkin Apr 9, 2024
9b92854
feat: get helm config from a well known configmap (#27)
faiq Apr 9, 2024
c59f46a
feat: Add patch to configure containerd metrics (#44)
dlipovetsky Apr 9, 2024
a137bb5
fix: Nutanix CSI HelmChartProxy name and namespace (#45)
dkoshkin Apr 9, 2024
bf3a644
build: Specify CAPI provider versions from go module versions (#47)
jimmidyson Apr 10, 2024
3a83bd3
ci: Switch to jetify-com/devbox-install-action (#48)
jimmidyson Apr 10, 2024
1137f86
ci: Update govulncheck task to use same version of go as project (#49)
jimmidyson Apr 10, 2024
05b8c1a
feat: deploy Nutanix CCM as an Addon (#38)
dkoshkin Apr 10, 2024
1fe7fc0
refactor: template NFD image with .Chart.Version
dkoshkin Apr 10, 2024
af8488c
refactor: standardize the code for getting Helm values
dkoshkin Apr 10, 2024
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
25 changes: 16 additions & 9 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
uses: actions/checkout@v4

- name: Install devbox
uses: jetpack-io/devbox-install-action@v0.8.0
uses: jetify-com/devbox-install-action@v0.9.0
with:
enable-cache: true

Expand Down Expand Up @@ -59,6 +59,7 @@ jobs:
matrix:
provider:
- Docker
fail-fast: false
uses: ./.github/workflows/e2e.yml
with:
provider: ${{ matrix.provider }}
Expand All @@ -72,12 +73,13 @@ jobs:
strategy:
matrix:
module: [api, common, .]
fail-fast: false
steps:
- name: Check out code
uses: actions/checkout@v4

- name: Install devbox
uses: jetpack-io/devbox-install-action@v0.8.0
uses: jetify-com/devbox-install-action@v0.9.0
with:
enable-cache: true

Expand Down Expand Up @@ -118,7 +120,7 @@ jobs:
ref: ${{ github.event.pull_request.head.sha }}

- name: Install devbox
uses: jetpack-io/devbox-install-action@v0.8.0
uses: jetify-com/devbox-install-action@v0.9.0
with:
enable-cache: true

Expand Down Expand Up @@ -152,7 +154,7 @@ jobs:
fetch-depth: 0

- name: Install devbox
uses: jetpack-io/devbox-install-action@v0.8.0
uses: jetify-com/devbox-install-action@v0.9.0
with:
enable-cache: true

Expand Down Expand Up @@ -225,12 +227,17 @@ jobs:
strategy:
matrix:
module: [api, common, .]
fail-fast: false
steps:
- name: Check out code
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0

- id: govulncheck
uses: golang/govulncheck-action@v1
- name: Install devbox
uses: jetify-com/devbox-install-action@v0.9.0
with:
work-dir: ${{ matrix.module }}
go-version-file: go.mod
enable-cache: true

- id: govulncheck
run: devbox run -- make govulncheck.${{ matrix.module }}
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
languages: ${{ matrix.language }}

- name: Install devbox
uses: jetpack-io/devbox-install-action@v0.8.0
uses: jetify-com/devbox-install-action@v0.9.0
with:
enable-cache: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/devbox-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: actions/checkout@v4

- name: Install devbox
uses: jetpack-io/devbox-install-action@v0.8.0
uses: jetify-com/devbox-install-action@v0.9.0
with:
enable-cache: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
fetch-depth: 0

- name: Install devbox
uses: jetpack-io/devbox-install-action@v0.8.0
uses: jetify-com/devbox-install-action@v0.9.0
with:
enable-cache: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/github-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
uses: actions/checkout@v4

- name: Install devbox
uses: jetpack-io/devbox-install-action@v0.8.0
uses: jetify-com/devbox-install-action@v0.9.0
with:
enable-cache: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
fetch-depth: 0

- name: Install devbox
uses: jetpack-io/devbox-install-action@v0.8.0
uses: jetify-com/devbox-install-action@v0.9.0
with:
enable-cache: true

Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ node_modules/
/cluster.yaml
/runtime-extension-components.yaml
/_artifacts/
test/e2e/config/cre-envsubst.yaml
test/e2e/config/caren-envsubst.yaml
8 changes: 7 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ repos:
language: system
files: "^(hack/addons/|charts/cluster-api-runtime-extensions-nutanix/templates/.+/manifests/|make/addons.mk$)"
pass_filenames: false
- id: addons-configmap
name: addons-configmap
entry: make generate-helm-configmap
language: system
files: "^(hack/addons/|charts/cluster-api-runtime-extensions-nutanix/templates/.+|make/addons.mk$)"
pass_filenames: false
- repo: https://github.com/tekwizely/pre-commit-golang
rev: v1.0.0-rc.1
hooks:
Expand Down Expand Up @@ -117,7 +123,7 @@ repos:
name: License headers - YAML and Makefiles
stages: [commit]
files: (^Makefile|\.(ya?ml|mk))$
exclude: ^(pkg/handlers/.+/embedded|examples|charts/cluster-api-runtime-extensions-nutanix/defaultclusterclasses)/.+\.ya?ml|docs/static/helm/index\.yaml$
exclude: ^(pkg/handlers/.+/embedded|examples|charts/cluster-api-runtime-extensions-nutanix/defaultclusterclasses)/.+\.ya?ml|docs/static/helm/index\.yaml|charts/cluster-api-runtime-extensions-nutanix/templates/helm-config.yaml$
args:
- --license-filepath
- hack/license-header.txt
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,13 @@ For example, the following command will create a Docker cluster with Cilium CNI
```shell
export CLUSTER_NAME=docker-cluster-cilium-helm-addon
export CLUSTER_FILE=examples/capi-quick-start/docker-cluster-cilium-helm-addon.yaml
export KUBERNETES_VERSION=v1.28.7
```

```shell
clusterctl generate cluster ${CLUSTER_NAME} \
--from ${CLUSTER_FILE} \
--kubernetes-version v1.29.1 \
--kubernetes-version ${KUBERNETES_VERSION} \
--worker-machine-count 1 | \
kubectl apply --server-side -f -
```
Expand Down
2 changes: 1 addition & 1 deletion api/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
Expand Down
8 changes: 4 additions & 4 deletions api/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -501,8 +501,8 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx
golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
Expand Down Expand Up @@ -583,8 +583,8 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
Expand Down
4 changes: 4 additions & 0 deletions api/openapi/patterns/anchored.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,7 @@ package patterns
func Anchored(pattern string) string {
return "^" + pattern + "$"
}

func HTTPSURL() string {
return `^https://`
}
Loading
Loading