Skip to content

Commit

Permalink
Specify ingress controller type (#43)
Browse files Browse the repository at this point in the history 
* Specify ingress controller type

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>

* Fix indenting, docs

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>

* Fix spacing

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>

* Fix missing brackets

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>

* Fix missing brackets

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>

* Add ingress-nginx support

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>

* Use the right example values for test version to upgrade from.

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>

* Fix var in wrong location

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>

* Fix missing arg

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>

* Try this to checkout the right version

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>

* Switch to upgrading from 0.14.0

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>

* Install crds

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>

* Incorperate feedback

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>

* Apply suggestions from code review

Co-authored-by: Faisal Memon <fymemon@yahoo.com>
Signed-off-by: kfox1111 <Kevin.Fox@pnnl.gov>

* Fix docs

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>

* Enable unset ingress controller type to use with openshift later

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>

* Fix docs after merge issue

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>

---------

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
Signed-off-by: kfox1111 <Kevin.Fox@pnnl.gov>
Co-authored-by: Faisal Memon <fymemon@yahoo.com>
  • Loading branch information
@kfox1111 @faisal-memon
kfox1111 and faisal-memon authored Oct 24, 2023
1 parent 0b17434 commit 7924323
Show file tree
Hide file tree
Showing 19 changed files with 270 additions and 224 deletions.
25 changes: 13 additions & 12 deletions charts/spire/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,18 +123,19 @@ helm install -n spire-server spire-crds charts/spire-crds

### Global parameters

| Name | Description | Value |
| --------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------- |
| `global.k8s.clusterDomain` | Cluster domain name configured for Spire install | `cluster.local` |
| `global.spire.bundleConfigMap` | A configmap containing the Spire bundle | `""` |
| `global.spire.clusterName` | The name of the k8s cluster for Spire install | `example-cluster` |
| `global.spire.jwtIssuer` | The issuer for Spire JWT tokens | `oidc-discovery.example.org` |
| `global.spire.trustDomain` | The trust domain for Spire install | `example.org` |
| `global.spire.upstreamServerAddress` | Set what address to use for the upstream server when using nested spire | `""` |
| `global.spire.image.registry` | Override all Spire image registries at once | `""` |
| `global.spire.strictMode` | Check values, such as trustDomain, are overridden with a suitable value for production. | `false` |
| `global.installAndUpgradeHooks.enabled` | Enable Helm hooks to autofix common install/upgrade issues (should be disabled when using `helm template`) | `true` |
| `global.deleteHooks.enabled` | Enable Helm hooks to autofix common delete issues (should be disabled when using `helm template`) | `true` |
| Name | Description | Value |
| --------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------- |
| `global.k8s.clusterDomain` | Cluster domain name configured for Spire install | `cluster.local` |
| `global.spire.bundleConfigMap` | A configmap containing the Spire bundle | `""` |
| `global.spire.clusterName` | The name of the k8s cluster for Spire install | `example-cluster` |
| `global.spire.jwtIssuer` | The issuer for Spire JWT tokens | `oidc-discovery.example.org` |
| `global.spire.trustDomain` | The trust domain for Spire install | `example.org` |
| `global.spire.upstreamServerAddress` | Set what address to use for the upstream server when using nested spire | `""` |
| `global.spire.image.registry` | Override all Spire image registries at once | `""` |
| `global.spire.strictMode` | Check values, such as trustDomain, are overridden with a suitable value for production. | `false` |
| `global.spire.ingressControllerType` | Specify what type of ingress controller you're using to add the necessary annotations accordingly. If blank, other is assumed. If other, no annotations will be added. Must be one of [ingress-nginx, other, ""]. | `""` |
| `global.installAndUpgradeHooks.enabled` | Enable Helm hooks to autofix common install/upgrade issues (should be disabled when using `helm template`) | `true` |
| `global.deleteHooks.enabled` | Enable Helm hooks to autofix common delete issues (should be disabled when using `helm template`) | `true` |

### Spire server parameters

Expand Down
Loading

0 comments on commit 7924323

Please sign in to comment.