Skip to content

Commit

Permalink
Remove dnsmgr from cloud
Browse files Browse the repository at this point in the history
Summary:
Now that certmgr is gone, and direct mode is deprecated, we don't need
to assign DNS names or SSL certs to clusters. Remove dnsmgr.
Note: skaffold won't remove the dnsmgr deployment, that will need to be cleaned
manually on release.

Test Plan: skaffold a dev cloud, deploy a vizier to it

Reviewers: michelle, philkuz

Reviewed By: michelle

JIRA Issues: PP-3335

Signed-off-by: Vihang Mehta <vihang@pixielabs.ai>

Differential Revision: https://phab.corp.pixielabs.ai/D11226

GitOrigin-RevId: 31c9946
  • Loading branch information
vihangm authored and copybaranaut committed Apr 18, 2022
1 parent 88a8275 commit 2b7a029
Show file tree
Hide file tree
Showing 58 changed files with 75 additions and 3,771 deletions.
32 changes: 0 additions & 32 deletions .fossa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -260,38 +260,6 @@ analyze:
type: go
target: px.dev/pixie/src/cloud/config_manager/controller
path: src/cloud/config_manager/controller
- name: px.dev/pixie/src/cloud/dnsmgr
type: go
target: px.dev/pixie/src/cloud/dnsmgr
path: src/cloud/dnsmgr
- name: px.dev/pixie/src/cloud/dnsmgr/controller
type: go
target: px.dev/pixie/src/cloud/dnsmgr/controller
path: src/cloud/dnsmgr/controller
- name: px.dev/pixie/src/cloud/dnsmgr/controllers/mock
type: go
target: px.dev/pixie/src/cloud/dnsmgr/controllers/mock
path: src/cloud/dnsmgr/controllers/mock
- name: px.dev/pixie/src/cloud/dnsmgr/dnsmgrenv
type: go
target: px.dev/pixie/src/cloud/dnsmgr/dnsmgrenv
path: src/cloud/dnsmgr/dnsmgrenv
- name: px.dev/pixie/src/cloud/dnsmgr/dnsmgrpb
type: go
target: px.dev/pixie/src/cloud/dnsmgr/dnsmgrpb
path: src/cloud/dnsmgr/dnsmgrpb
- name: px.dev/pixie/src/cloud/dnsmgr/dnsmgrpb/mock
type: go
target: px.dev/pixie/src/cloud/dnsmgr/dnsmgrpb/mock
path: src/cloud/dnsmgr/dnsmgrpb/mock
- name: px.dev/pixie/src/cloud/dnsmgr/load_certs
type: go
target: px.dev/pixie/src/cloud/dnsmgr/load_certs
path: src/cloud/dnsmgr/load_certs
- name: px.dev/pixie/src/cloud/dnsmgr/schema
type: go
target: px.dev/pixie/src/cloud/dnsmgr/schema
path: src/cloud/dnsmgr/schema
- name: px.dev/pixie/src/cloud/indexer
type: go
target: px.dev/pixie/src/cloud/indexer
Expand Down
1 change: 0 additions & 1 deletion BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ gazelle(
# gazelle:resolve go px.dev/pixie/src/cloud/auth/authpb //src/cloud/auth/authpb:auth_pl_go_proto
# gazelle:resolve go px.dev/pixie/src/cloud/config_manager/configmanagerpb //src/cloud/config_manager/configmanagerpb:service_pl_go_proto
# gazelle:resolve go px.dev/pixie/src/cloud/cron_script/cronscriptpb //src/cloud/cron_script/cronscriptpb:service_pl_go_proto
# gazelle:resolve go px.dev/pixie/src/cloud/dnsmgr/dnsmgrpb //src/cloud/dnsmgr/dnsmgrpb:service_pl_go_proto
# gazelle:resolve go px.dev/pixie/src/cloud/plugin/pluginpb //src/cloud/plugin/pluginpb:service_pl_go_proto
# gazelle:resolve go px.dev/pixie/src/cloud/profile/profilepb //src/cloud/profile/profilepb:service_pl_go_proto
# gazelle:resolve go px.dev/pixie/src/cloud/project_manager/projectmanagerpb //src/cloud/project_manager/projectmanagerpb:service_pl_go_proto
Expand Down
1 change: 0 additions & 1 deletion k8s/cloud/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ CLOUD_IMAGE_MAP = {
"gcr.io/pixie-oss/pixie-dev/cloud/auth_server_image": "//src/cloud/auth:auth_server_image",
"gcr.io/pixie-oss/pixie-dev/cloud/config_manager_server_image": "//src/cloud/config_manager:config_manager_server_image",
"gcr.io/pixie-oss/pixie-dev/cloud/cron_script_server_image": "//src/cloud/cron_script:cron_script_server_image",
"gcr.io/pixie-oss/pixie-dev/cloud/dnsmgr_server_image": "//src/cloud/dnsmgr:dnsmgr_server_image",
"gcr.io/pixie-oss/pixie-dev/cloud/indexer_server_image": "//src/cloud/indexer:indexer_server_image",
"gcr.io/pixie-oss/pixie-dev/cloud/job/create_admin_job_image": "//src/cloud/jobs/create_admin_user:create_admin_job_image",
"gcr.io/pixie-oss/pixie-dev/cloud/metrics_server_image": "//src/cloud/metrics:metrics_server_image",
Expand Down
9 changes: 0 additions & 9 deletions k8s/cloud/base/dns_config.yaml

This file was deleted.

73 changes: 0 additions & 73 deletions k8s/cloud/base/dnsmgr_deployment.yaml

This file was deleted.

15 changes: 0 additions & 15 deletions k8s/cloud/base/dnsmgr_service.yaml

This file was deleted.

3 changes: 0 additions & 3 deletions k8s/cloud/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ resources:
- contact_config.yaml
- proxy_envoy.yaml
- kuberesolver_role.yaml
- dns_config.yaml
- db_config.yaml
- tls_config.yaml
- service_config.yaml
Expand All @@ -19,8 +18,6 @@ resources:
- auth_service.yaml
- api_deployment.yaml
- api_service.yaml
- dnsmgr_deployment.yaml
- dnsmgr_service.yaml
- plugin_deployment.yaml
- plugin_service.yaml
- profile_deployment.yaml
Expand Down
1 change: 0 additions & 1 deletion k8s/cloud/base/service_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ data:
PL_PROFILE_SERVICE: kubernetes:///profile-service.plc:51500
PL_PROJECT_MANAGER_SERVICE: kubernetes:///project-manager-service.plc:50300
PL_VZMGR_SERVICE: kubernetes:///vzmgr-service.plc:51800
PL_DNSMGR_SERVICE: kubernetes:///dnsmgr-service.plc:51900
PL_ARTIFACT_TRACKER_SERVICE: kubernetes:///artifact-tracker-service.plc:50750
PL_ELASTIC_SERVICE: https://pl-elastic-es-http.plc:9200
PL_SCRIPTMGR_SERVICE: kubernetes:///scriptmgr-service.plc:52000
Expand Down
5 changes: 0 additions & 5 deletions k8s/cloud/base/vzmgr_deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,6 @@ spec:
secretKeyRef:
name: pl-db-secrets
key: database-key
- name: PL_DNSMGR_SERVICE
valueFrom:
configMapKeyRef:
name: pl-service-config
key: PL_DNSMGR_SERVICE
- name: PL_ARTIFACT_TRACKER_SERVICE
valueFrom:
configMapKeyRef:
Expand Down
1 change: 0 additions & 1 deletion k8s/cloud/dev/service_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ data:
PL_PROFILE_SERVICE: kubernetes:///profile-service.plc-dev:51500
PL_PROJECT_MANAGER_SERVICE: kubernetes:///project-manager-service.plc-dev:50300
PL_VZMGR_SERVICE: kubernetes:///vzmgr-service.plc-dev:51800
PL_DNSMGR_SERVICE: kubernetes:///dnsmgr-service.plc-dev:51900
PL_ARTIFACT_TRACKER_SERVICE: kubernetes:///artifact-tracker-service.plc-dev:50750
PL_ELASTIC_SERVICE: https://pl-elastic-es-http.plc-dev:9200
PL_SCRIPTMGR_SERVICE: kubernetes:///scriptmgr-service.plc-dev:52000
Expand Down
9 changes: 0 additions & 9 deletions k8s/cloud/prod/dns_config.yaml

This file was deleted.

1 change: 0 additions & 1 deletion k8s/cloud/prod/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ patchesStrategicMerge:
- service_config.yaml
- domain_config.yaml
- cloud_ingress_ip.yaml
- dns_config.yaml
- scriptmgr_config.yaml
- proxy_envoy.yaml
patches:
Expand Down
1 change: 0 additions & 1 deletion k8s/cloud/prod/service_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ data:
PL_PROFILE_SERVICE: kubernetes:///profile-service.plc:51500
PL_PROJECT_MANAGER_SERVICE: kubernetes:///project-manager-service.plc:50300
PL_VZMGR_SERVICE: kubernetes:///vzmgr-service.plc:51800
PL_DNSMGR_SERVICE: kubernetes:///dnsmgr-service.plc:51900
PL_ARTIFACT_TRACKER_SERVICE: kubernetes:///artifact-tracker-service.plc:50750
PL_ELASTIC_SERVICE: https://pl-elastic-es-http.plc:9200
PL_SCRIPTMGR_SERVICE: kubernetes:///scriptmgr-service.plc:52000
Expand Down
3 changes: 0 additions & 3 deletions k8s/cloud/public/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@ images:
- name: gcr.io/pixie-oss/pixie-dev/cloud/proxy_server_image
newName: gcr.io/pixie-oss/pixie-prod/cloud/proxy_server_image
newTag: latest
- name: gcr.io/pixie-oss/pixie-dev/cloud/dnsmgr_server_image
newName: gcr.io/pixie-oss/pixie-prod/cloud/dnsmgr_server_image
newTag: latest
- name: gcr.io/pixie-oss/pixie-dev/cloud/indexer_server_image
newName: gcr.io/pixie-oss/pixie-prod/cloud/indexer_server_image
newTag: latest
Expand Down
9 changes: 0 additions & 9 deletions k8s/cloud/staging/dns_config.yaml

This file was deleted.

1 change: 0 additions & 1 deletion k8s/cloud/staging/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ patchesStrategicMerge:
- service_config.yaml
- domain_config.yaml
- cloud_ingress_ip.yaml
- dns_config.yaml
- proxy_envoy.yaml
patches:
- path: db_sidecar.yaml
Expand Down
1 change: 0 additions & 1 deletion k8s/cloud/staging/service_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ data:
PL_PROFILE_SERVICE: kubernetes:///profile-service.plc-staging:51500
PL_PROJECT_MANAGER_SERVICE: kubernetes:///project-manager-service.plc-staging:50300
PL_VZMGR_SERVICE: kubernetes:///vzmgr-service.plc-staging:51800
PL_DNSMGR_SERVICE: kubernetes:///dnsmgr-service.plc-staging:51900
PL_ARTIFACT_TRACKER_SERVICE: kubernetes:///artifact-tracker-service.plc-staging:50750
PL_ELASTIC_SERVICE: https://pl-elastic-es-http.plc-staging:9200
PL_SCRIPTMGR_SERVICE: kubernetes:///scriptmgr-service.plc-staging:52000
Expand Down
29 changes: 0 additions & 29 deletions k8s/cloud/testing/db_sidecar.yaml

This file was deleted.

9 changes: 0 additions & 9 deletions k8s/cloud/testing/dns_config.yaml

This file was deleted.

1 change: 0 additions & 1 deletion k8s/cloud/testing/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ patchesStrategicMerge:
- service_config.yaml
- domain_config.yaml
- cloud_ingress_ip.yaml
- dns_config.yaml
- proxy_envoy.yaml
patches:
- path: db_sidecar.yaml
Expand Down
1 change: 0 additions & 1 deletion k8s/cloud/testing/service_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ data:
PL_PROFILE_SERVICE: kubernetes:///profile-service.plc-testing:51500
PL_PROJECT_MANAGER_SERVICE: kubernetes:///project-manager-service.plc-testing:50300
PL_VZMGR_SERVICE: kubernetes:///vzmgr-service.plc-testing:51800
PL_DNSMGR_SERVICE: kubernetes:///dnsmgr-service.plc-testing:51900
PL_ARTIFACT_TRACKER_SERVICE: kubernetes:///artifact-tracker-service.plc-testing:50750
PL_ELASTIC_SERVICE: https://pl-elastic-es-http.plc-testing:9200
PL_SCRIPTMGR_SERVICE: kubernetes:///scriptmgr-service.plc-testing:52000
Expand Down
6 changes: 0 additions & 6 deletions scripts/load_dev_db.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,6 @@ bazel run -c opt //src/utils/artifacts/artifact_db_updater:artifact_db_updater -

git checkout main "$versions_file"

# Update database with SSL certs.
sops --config="${repo_path}"/credentials/.sops.yaml --decrypt "${certs_path}" > "${certs_decoded_path}"
bazel run -c opt //src/cloud/dnsmgr/load_certs:load_certs -- \
--certs_path "${certs_decoded_path}" --postgres_db "pl" --postgres_port "${postgres_port}"
rm "${certs_decoded_path}"

# Kill kubectl port-forward.
kill -15 "$!"
sleep 2
Expand Down
4 changes: 0 additions & 4 deletions skaffold/skaffold_cloud.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@ build:
context: .
bazel:
target: //src/cloud/vzmgr:vzmgr_server_image.tar
- image: gcr.io/pixie-oss/pixie-dev/cloud/dnsmgr_server_image
context: .
bazel:
target: //src/cloud/dnsmgr:dnsmgr_server_image.tar
- image: gcr.io/pixie-oss/pixie-dev/cloud/indexer_server_image
context: .
bazel:
Expand Down
Loading

0 comments on commit 2b7a029

Please sign in to comment.