Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Infrastructure GitOps
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Operate
Terraform modules
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Shivering-Isles
Infrastructure GitOps
Commits
dfe9fc71
Verified
Commit
dfe9fc71
authored
1 year ago
by
Sheogorath
Browse files
Options
Downloads
Patches
Plain Diff
fix(nginx): Add missing haproxy adoption
parent
255d7f9e
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
clusters/k8s01/nginx-system/haproxy.yaml
+2
-2
2 additions, 2 deletions
clusters/k8s01/nginx-system/haproxy.yaml
clusters/k8s01/nginx-system/kustomization.yaml
+1
-0
1 addition, 0 deletions
clusters/k8s01/nginx-system/kustomization.yaml
with
3 additions
and
2 deletions
clusters/k8s01/nginx-system/haproxy.yaml
+
2
−
2
View file @
dfe9fc71
...
@@ -90,7 +90,7 @@ data:
...
@@ -90,7 +90,7 @@ data:
timeout connect 7s
timeout connect 7s
timeout client 10m
timeout client 10m
timeout server 10m
timeout server 10m
server svc-nginx-ingress-http ingress-nginx-internet-
ingress-nginx-
controller:80 send-proxy-v2
server svc-nginx-ingress-http ingress-nginx-internet-controller
r
:80 send-proxy-v2
listen https
listen https
bind 0.0.0.0:443
bind 0.0.0.0:443
...
@@ -99,7 +99,7 @@ data:
...
@@ -99,7 +99,7 @@ data:
timeout connect 7s
timeout connect 7s
timeout client 10m
timeout client 10m
timeout server 10m
timeout server 10m
server svc-nginx-ingress-https ingress-nginx-internet-
ingress-nginx-
controller:443 send-proxy-v2
server svc-nginx-ingress-https ingress-nginx-internet-controller:443 send-proxy-v2
---
---
apiVersion
:
v1
apiVersion
:
v1
kind
:
Service
kind
:
Service
...
...
This diff is collapsed.
Click to expand it.
clusters/k8s01/nginx-system/kustomization.yaml
+
1
−
0
View file @
dfe9fc71
apiVersion
:
kustomize.config.k8s.io/v1beta1
apiVersion
:
kustomize.config.k8s.io/v1beta1
kind
:
Kustomization
kind
:
Kustomization
resources
:
resources
:
-
haproxy.yaml
-
release-override.yaml
-
release-override.yaml
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment