Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ingress Error #177

Merged
merged 3 commits into from
Aug 27, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ concurrency:
jobs:
# Spell Check job
SpellCheck:
if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' # Run on PR and manual dispatch
if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && github.ref == 'refs/heads/main')
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -45,7 +45,7 @@ jobs:
# Deployment job
Deploy:
needs: SpellCheck # Run only after SpellCheck job is successful
if: github.event_name == 'push' && github.ref == 'refs/heads/main' || github.event_name == 'workflow_dispatch'
if: (github.event_name == 'push' && github.ref == 'refs/heads/main') || github.event_name == 'workflow_dispatch'
environment:
name: github-pages
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion bicep/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ module serviceBlade 'modules/blade_service.bicep' = {
clusterSize: enableBurstable ? 'Burstable' : 'Standard'
clusterAdminIds: clusterAdminIds

clusterIngress: ingressType == '' ? 'Both' : ingressType
clusterIngress: ingressType == '' ? 'External' : ingressType
serviceCidr: clusterNetwork.serviceCidr == '' ? '172.16.0.0/16' : clusterNetwork.serviceCidr
dnsServiceIP: clusterNetwork.dnsServiceIP == '' ? '172.16.0.10' : clusterNetwork.v
networkPlugin: enablePodSubnet ? 'azure' : clusterNetworkPlugin
Expand Down
2 changes: 2 additions & 0 deletions charts/istio-ingress/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,7 @@ Install the helm chart.
```bash
# Create Namespace
NAMESPACE=istio-system
helm template istio-ingress -f custom_values.yaml .

helm upgrade --install istio-ingress . -n $NAMESPACE
```
15 changes: 7 additions & 8 deletions charts/istio-ingress/templates/gateways.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,30 +32,29 @@ spec:
{{- else }}
- "*"
{{- end }}
{{- if .requireSSL }}
tls:
{{- if .requireSSL }}
httpsRedirect: true # sends 301 redirect for http requests
{{- end }}
{{- with .tls }}
tls:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .tls }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}

{{- if .Values.ingress }}
{{- if hasKey .Values.ingress "internalGateway" }}
{{- if .Values.ingress.internalGateway.enabled }}
---
{{- $internalGateway := merge (dict "gatewayType" "internal") .Values.ingress.internalGateway -}}
{{- $internalGateway := merge (dict "gatewayType" "internal" "requireSSL" .Values.ingress.internalGateway.requireSSL) .Values.ingress.internalGateway -}}
{{ include "gateway" $internalGateway }}
{{- end }}
{{- end }}

{{- if hasKey .Values.ingress "externalGateway" }}
{{- if .Values.ingress.externalGateway.enabled }}
---
{{- $externalGateway := merge (dict "gatewayType" "external") .Values.ingress.externalGateway -}}
{{- $externalGateway := merge (dict "gatewayType" "external" "requireSSL" .Values.ingress.externalGateway.requireSSL) .Values.ingress.externalGateway -}}
{{ include "gateway" $externalGateway }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
1 change: 0 additions & 1 deletion docs/src/feature_flags.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ Modify the AKS cluster network configuration for Azure CNI with Dynamic IP alloc
| ENABLE_POD_SUBNET | Enables a separate subnet for pod networking in the AKS cluster |



## Vnet Injection

__Purpose:__ Enables a bring your own network capability.
Expand Down