Skip to content

Commit

Permalink
Removing ingress related deployments in favor of gateway-api
Browse files Browse the repository at this point in the history
  • Loading branch information
the2hill committed Jul 18, 2024
1 parent 5122b34 commit 8ad9e93
Show file tree
Hide file tree
Showing 43 changed files with 59 additions and 2,713 deletions.
45 changes: 0 additions & 45 deletions .github/workflows/kustomize-ingress.yaml

This file was deleted.

1 change: 0 additions & 1 deletion .github/workflows/kustomize-skyline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ jobs:
overlays:
- base
- aio
- fqdn
name: Kustomize
runs-on: ubuntu-latest
steps:
Expand Down
24 changes: 12 additions & 12 deletions ansible/inventory/openstack-flex/group_vars/k8s_cluster/addons.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,15 @@ rbd_provisioner_enabled: false
ingress_nginx_enabled: false
# ingress_nginx_host_network: false
ingress_publish_status_address: ""
ingress_nginx_nodeselector:
kubernetes.io/os: "linux"
node-role.kubernetes.io/control-plane: ""
ingress_nginx_tolerations:
- key: "openstack-compute-node"
operator: "Equal"
value: "enabled"
effect: "NoSchedule"
ingress_nginx_namespace: "ingress-nginx"
#ingress_nginx_nodeselector:
# kubernetes.io/os: "linux"
# node-role.kubernetes.io/control-plane: ""
#ingress_nginx_tolerations:
# - key: "openstack-compute-node"
# operator: "Equal"
# value: "enabled"
# effect: "NoSchedule"
#ingress_nginx_namespace: "ingress-nginx"
# ingress_nginx_insecure_port: 80
# ingress_nginx_secure_port: 443
# ingress_nginx_configmap:
Expand All @@ -122,9 +122,9 @@ ingress_nginx_namespace: "ingress-nginx"
# ingress_nginx_extra_args:
# - --default-ssl-certificate=default/foo-tls
# ingress_nginx_termination_grace_period_seconds: 300
ingress_nginx_class: nginx
ingress_nginx_without_class: false
ingress_nginx_default: true
#ingress_nginx_class: nginx
#ingress_nginx_without_class: false
#ingress_nginx_default: false

# ALB ingress controller deployment
ingress_alb_enabled: false
Expand Down
6 changes: 3 additions & 3 deletions base-helm-configs/barbican/barbican-helm-overrides.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,7 @@ manifests:
configmap_bin: true
configmap_etc: true
deployment_api: true
ingress_api: true
ingress_api: false
job_bootstrap: true
job_db_init: false
job_db_sync: true
Expand All @@ -716,10 +716,10 @@ manifests:
pod_test: true
secret_db: true
network_policy: false
secret_ingress_tls: true
secret_ingress_tls: false
secret_keystone: true
secret_rabbitmq: true
secret_registry: true
service_ingress_api: true
service_ingress_api: false
service_api: true
...
Original file line number Diff line number Diff line change
Expand Up @@ -2178,5 +2178,5 @@ manifests:
secret_rabbitmq: true
secret_registry: true
service_api: true
service_ingress_api: true
service_ingress_api: false
...
6 changes: 3 additions & 3 deletions base-helm-configs/cinder/cinder-helm-overrides.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1438,7 +1438,7 @@ manifests:
deployment_backup: false
deployment_scheduler: true
deployment_volume: false
ingress_api: true
ingress_api: false
job_backup_storage_init: true
job_bootstrap: false
job_clean: true
Expand All @@ -1457,9 +1457,9 @@ manifests:
pvc_backup: true
network_policy: false
secret_db: false
secret_ingress_tls: true
secret_ingress_tls: false
secret_keystone: true
secret_rabbitmq: false
secret_registry: true
service_api: true
service_ingress_api: true
service_ingress_api: false
6 changes: 3 additions & 3 deletions base-helm-configs/designate/designate-helm-overrides.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,7 @@ manifests:
deployment_producer: true
deployment_mdns: true
deployment_sink: false
ingress_api: true
ingress_api: false
job_bootstrap: true
job_db_init: true
job_db_sync: true
Expand All @@ -743,11 +743,11 @@ manifests:
pdb_mdns: true
pdb_sink: false
secret_db: true
secret_ingress_tls: true
secret_ingress_tls: false
secret_keystone: true
secret_rabbitmq: true
secret_registry: true
service_api: true
service_mdns: true
service_ingress_api: true
service_ingress_api: false
...
6 changes: 3 additions & 3 deletions base-helm-configs/glance/glance-helm-overrides.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -978,7 +978,7 @@ manifests:
configmap_bin: true
configmap_etc: true
deployment_api: true
ingress_api: true
ingress_api: false
job_bootstrap: true
job_clean: true
job_db_init: false
Expand All @@ -996,11 +996,11 @@ manifests:
pvc_images: true
network_policy: false
secret_db: true
secret_ingress_tls: true
secret_ingress_tls: false
secret_keystone: true
secret_rabbitmq: true
secret_registry: true
service_ingress_api: true
service_ingress_api: false
service_api: true

# NOTE: This is for enable helm resource-policy to keep glance-images PVC.
Expand Down
6 changes: 3 additions & 3 deletions base-helm-configs/gnocchi/gnocchi-helm-overrides.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ manifests:
daemonset_metricd: true
daemonset_statsd: true
deployment_api: true
ingress_api: true
ingress_api: false
job_bootstrap: true
job_clean: true
job_db_drop: false
Expand All @@ -670,8 +670,8 @@ manifests:
pod_gnocchi_test: false
secret_db: true
secret_keystone: true
secret_ingress_tls: true
secret_ingress_tls: false
service_api: true
service_ingress_api: true
service_ingress_api: false
service_statsd: true
...
10 changes: 5 additions & 5 deletions base-helm-configs/heat/heat-helm-overrides.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1224,8 +1224,8 @@ manifests:
deployment_cfn: true
deployment_cloudwatch: false
deployment_engine: true
ingress_api: true
ingress_cfn: true
ingress_api: false
ingress_cfn: false
ingress_cloudwatch: false
job_bootstrap: true
job_db_init: false
Expand All @@ -1244,14 +1244,14 @@ manifests:
pod_rally_test: false
network_policy: false
secret_db: true
secret_ingress_tls: true
secret_ingress_tls: false
secret_keystone: true
secret_rabbitmq: true
secret_registry: true
service_api: true
service_cfn: true
service_cloudwatch: false
service_ingress_api: true
service_ingress_cfn: true
service_ingress_api: false
service_ingress_cfn: false
service_ingress_cloudwatch: false
statefulset_engine: false
6 changes: 3 additions & 3 deletions base-helm-configs/horizon/horizon-helm-overrides.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7292,7 +7292,7 @@ manifests:
configmap_etc: true
configmap_logo: true
deployment: true
ingress_api: true
ingress_api: false
job_db_init: false
job_db_sync: true
job_db_drop: false
Expand All @@ -7301,8 +7301,8 @@ manifests:
pod_helm_test: false
network_policy: false
secret_db: true
secret_ingress_tls: true
secret_ingress_tls: false
secret_keystone: true
secret_registry: true
service_ingress: true
service_ingress: false
service: true
6 changes: 3 additions & 3 deletions base-helm-configs/keystone/keystone-helm-overrides.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1092,7 +1092,7 @@ manifests:
cron_credential_rotate: true
cron_fernet_rotate: true
deployment_api: true
ingress_api: true
ingress_api: false
job_bootstrap: true
job_credential_cleanup: false
job_credential_setup: true
Expand All @@ -1109,9 +1109,9 @@ manifests:
secret_credential_keys: true
secret_db: true
secret_fernet_keys: true
secret_ingress_tls: true
secret_ingress_tls: false
secret_keystone: true
secret_rabbitmq: true
secret_registry: true
service_ingress_api: true
service_ingress_api: false
service_api: true
6 changes: 3 additions & 3 deletions base-helm-configs/neutron/neutron-helm-overrides.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2517,7 +2517,7 @@ manifests:
daemonset_ovn_metadata_agent: true
deployment_ironic_agent: false
deployment_server: true
ingress_server: true
ingress_server: false
job_bootstrap: true
job_db_init: false
job_db_sync: true
Expand All @@ -2531,9 +2531,9 @@ manifests:
pod_rally_test: false
network_policy: false
secret_db: false
secret_ingress_tls: true
secret_ingress_tls: false
secret_keystone: true
secret_rabbitmq: false
secret_registry: true
service_ingress_server: true
service_ingress_server: false
service_server: true
14 changes: 7 additions & 7 deletions base-helm-configs/nova/nova-helm-overrides.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2532,10 +2532,10 @@ manifests:
deployment_novncproxy: true
deployment_spiceproxy: false
deployment_scheduler: true
ingress_metadata: true
ingress_novncproxy: true
ingress_metadata: false
ingress_novncproxy: false
ingress_spiceproxy: false
ingress_osapi: true
ingress_osapi: false
job_bootstrap: true
job_storage_init: false
job_db_init: false
Expand All @@ -2554,14 +2554,14 @@ manifests:
secret_db_api: true
secret_db_cell0: true
secret_db: true
secret_ingress_tls: true
secret_ingress_tls: false
secret_keystone: true
secret_rabbitmq: true
secret_registry: true
service_ingress_metadata: true
service_ingress_novncproxy: true
service_ingress_metadata: false
service_ingress_novncproxy: false
service_ingress_spiceproxy: false
service_ingress_osapi: true
service_ingress_osapi: false
service_metadata: true
service_novncproxy: true
service_spiceproxy: false
Expand Down
6 changes: 3 additions & 3 deletions base-helm-configs/octavia/octavia-helm-overrides.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -722,7 +722,7 @@ manifests:
deployment_api: true
deployment_worker: true
deployment_housekeeping: true
ingress_api: true
ingress_api: false
job_bootstrap: true
job_db_init: false
job_db_sync: true
Expand All @@ -737,9 +737,9 @@ manifests:
network_policy: false
secret_credential_keys: true
secret_db: true
secret_ingress_tls: true
secret_ingress_tls: false
secret_keystone: true
secret_rabbitmq: true
secret_registry: true
service_ingress_api: true
service_ingress_api: false
service_api: true
6 changes: 3 additions & 3 deletions base-helm-configs/placement/placement-helm-overrides.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -459,10 +459,10 @@ manifests:
job_ks_user: true
network_policy: false
secret_db: true
secret_ingress_tls: true
secret_ingress_tls: false
secret_registry: true
pdb: true
ingress: true
ingress: false
secret_keystone: true
service_ingress: true
service_ingress: false
service: true
2 changes: 1 addition & 1 deletion base-kustomize/argocd/base/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ server:
ingress:
annotations:
nginx.ingress.kubernetes.io/backend-protocol: HTTPS
enabled: true
enabled: false
ingressClassName: "nginx-cluster"
hosts: ["argocd.dfw-ospcv2-staging.ohthree.com"]
tls:
Expand Down
13 changes: 0 additions & 13 deletions base-kustomize/barbican/letsencrypt/kustomization.yaml

This file was deleted.

Loading

0 comments on commit 8ad9e93

Please sign in to comment.