Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ make undeploy # Remove from cluster
## Configuration

- **Credentials**: `helm install` requires `credentials.apiKey` and `credentials.authtoken`
- **Feature Flags**: `useExperimentalGatewayApi=true` enables Gateway API support
- **Feature Flags**: `gateway.enabled=true` enables Gateway API support

## Rules

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<img src="https://img.shields.io/badge/Status-Beta-orange.svg" alt="Status"/>
</a>
<a href="#gateway-api-status">
<img src="https://img.shields.io/badge/Gateway_API-preview-rgba(159%2C122%2C234)" alt="Gateway API Preivew"/>
<img src="https://img.shields.io/badge/Gateway_API-supported-rgba(159%2C122%2C234)" alt="Gateway API Supported"/>
</a>
<a href="https://ngrok.com/slack">
<img src="https://img.shields.io/badge/Join%20Our%20Community-Slack-blue" alt="Slack"/>
Expand Down
1 change: 0 additions & 1 deletion helm/ngrok-operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,6 @@ To run multiple ngrok-operator instances in the same cluster (e.g., in different

| Name | Description | Value |
| -------------------------------- | ------------------------------------------------------------------------------------------------------------------------------ | ------- |
| `useExperimentalGatewayApi` | DEPRECATED: Use gateway.enabled instead | |
| `gateway.enabled` | When true, Gateway API support will be enabled if the CRDs are detected. When false, Gateway API support will never be enabled | `true` |
| `gateway.disableReferenceGrants` | When true, disables required ReferenceGrants for cross-namespace references. Does nothing when gateway.enabled is false | `false` |

Expand Down
2 changes: 1 addition & 1 deletion helm/ngrok-operator/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ Ngrok Operator manager cli feature flags
{{- if .Values.ingress.enabled -}}
- --enable-feature-ingress={{ .Values.ingress.enabled }}
{{- end }}
{{- if .Values.useExperimentalGatewayApi | default .Values.gateway.enabled }}
{{- if .Values.gateway.enabled }}
- --enable-feature-gateway=true
{{- else }}
- --enable-feature-gateway=false
Expand Down
23 changes: 1 addition & 22 deletions helm/ngrok-operator/tests/controller-deployment_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,36 +51,15 @@ tests:
- contains:
path: spec.template.spec.containers[0].args
content: --disable-reference-grants=true
- it: Uses the new gateway.enabled value when the old one is disabled
- it: Disables the gateway feature when gateway.enabled is false
set:
useExperimentalGatewayApi: false
gateway.enabled: true
template: controller-deployment.yaml
documentIndex: 0 # Document 0 is the deployment since its the first template
asserts:
- contains:
path: spec.template.spec.containers[0].args
content: --enable-feature-gateway=true
- it: Disables the gateway feature when both are false
set:
useExperimentalGatewayApi: false
gateway.enabled: false
template: controller-deployment.yaml
documentIndex: 0 # Document 0 is the deployment since its the first template
asserts:
- contains:
path: spec.template.spec.containers[0].args
content: --enable-feature-gateway=false
- it: Enables the gateway feature when the old value is true (backwards compatibility)
set:
useExperimentalGatewayApi: true
gateway.enabled: false
template: controller-deployment.yaml
documentIndex: 0 # Document 0 is the deployment since its the first template
asserts:
- contains:
path: spec.template.spec.containers[0].args
content: --enable-feature-gateway=true
- it: Should use the specified cluster domain name
set:
clusterDomain: svc.example.com
Expand Down
1 change: 0 additions & 1 deletion helm/ngrok-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,6 @@ agent:
##
## @section Kubernetes Gateway feature configuration
##
## @extra useExperimentalGatewayApi DEPRECATED: Use gateway.enabled instead
## @param gateway.enabled When true, Gateway API support will be enabled if the CRDs are detected. When false, Gateway API support will never be enabled
## @param gateway.disableReferenceGrants When true, disables required ReferenceGrants for cross-namespace references. Does nothing when gateway.enabled is false
##
Expand Down
2 changes: 1 addition & 1 deletion tools/make/deploy.mk
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ deploy_gateway: _deploy-check-env-vars docker-build manifests _helm_setup kind-l
--set-string log.level="8" \
--set log.stacktraceLevel=panic \
--set metaData.env=local,metaData.from=makefile \
--set useExperimentalGatewayApi=true \
--set gateway.enabled=true \
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ahh, i think this is what we saw and thought the old one was still used

--set drainPolicy="Delete" \
$(HELM_DESCRIPTION_FLAG)

Expand Down
Loading