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.

Sign up for GitHub

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

Jump to bottom

feat(publick8s): change LB annotation to move public ips RG #4647

Merged
merged 7 commits into from
Nov 9, 2023
Merged

feat(publick8s): change LB annotation to move public ips RG #4647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8cf77d2
feat(publick8s): change LB annotation to move public ips RG
smerle33 Nov 8, 2023
75a327e
wip
smerle33 Nov 8, 2023
e356630
wip: fixup of the publick8s public ingress LB annotations
dduportal Nov 8, 2023
3c81bcb
wip: update LDAP to use new svc annotations for LB
dduportal Nov 9, 2023
16c58d2
wip: update IPv6 to use new svc annotations for LB
dduportal Nov 9, 2023
57cd133
wip ipv6
smerle33 Nov 9, 2023
82f1246
Update config/ipv6-lb-service.yaml
dduportal Nov 9, 2023
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 clusters/publick8s.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ releases:
- name: ldap
namespace: ldap
chart: jenkins-infra/ldap
version: 0.2.1
version: 0.3.0
timeout: 600
values:
- "../config/ldap.yaml"
Expand Down Expand Up @@ -231,7 +231,7 @@ releases:
- name: ipv6-lb-service
namespace: public-nginx-ingress
chart: jenkins-infra/ipv6-lb-service
version: 0.1.0
version: 1.0.0
needs:
- public-nginx-ingress/public-nginx-ingress
values:
Expand Down
3 changes: 2 additions & 1 deletion config/ipv6-lb-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# azurerm_public_ip.publick8s_ipv6.ip_address in https://github.com/jenkins-infra/azure/blob/main/publick8s.tf
ipv6: 2603:1030:408:5::15a
ipv6PipName: public-publick8s-ipv6
resourceGroup: prod-public-ips
app:
name: "ingress-nginx"
component: "controller"
Expand Down
4 changes: 3 additions & 1 deletion config/ldap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
service:
type: LoadBalancer
# Public IPv4 defined as code in https://github.com/jenkins-infra/azure/blob/main/ldap.jenkins.io.tf instead of requesting a random new public IP, useful for DNS setup and changes
IP: 20.7.180.148
azurePip:
name: ldap-jenkins-io-ipv4
resourceGroup: prod-public-ips
whitelisted_sources:
- '20.85.71.108/32' # Accept inbound connections from publick8s public outbound IP
- '10.100.0.0/16' # publick8s Pod CIDR (internal IPs) for intrnal access
Expand Down
5 changes: 2 additions & 3 deletions config/public-nginx-ingress_publick8s.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@ controller:
service:
annotations:
service.beta.kubernetes.io/azure-load-balancer-internal: false
service.beta.kubernetes.io/azure-load-balancer-resource-group: prod-public-ips
# azurerm_public_ip.publick8s_ipv4.ip_address in https://github.com/jenkins-infra/azure/blob/main/publick8s.tf
service.beta.kubernetes.io/azure-load-balancer-ipv4: 20.7.178.24
# azurerm_public_ip.publick8s_ipv6.ip_address in https://github.com/jenkins-infra/azure/blob/main/publick8s.tf
service.beta.kubernetes.io/azure-load-balancer-ipv6: 2603:1030:408:5::15a
service.beta.kubernetes.io/azure-pip-name: public-publick8s-ipv4
externalTrafficPolicy: Local
ipFamilies:
- IPv4
Expand Down