Skip to content

Remove irrelevant external metrics APIService resources #277

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

Merged
merged 2 commits into from
Sep 7, 2023
Merged

Remove irrelevant external metrics APIService resources #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22e9523
Remove external metrics APIService resources
ChristianZaccaria Sep 6, 2023
0b35902
Removed RBs, services, and ports from test results
ChristianZaccaria Sep 7, 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
18 changes: 0 additions & 18 deletions config/internal/mcad/apiservice_external-metrics.yaml
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions config/internal/mcad/deployment.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,6 @@ spec:
name: mcad-{{.Name}}-config
image: {{.ControllerImage}}
imagePullPolicy: Always
ports:
- name: https
containerPort: 6443
protocol: TCP
- name: http
containerPort: 8080
protocol: TCP
resources: {{.ControllerResources}}
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
Expand Down
15 changes: 0 additions & 15 deletions config/internal/mcad/service.yaml.tmpl
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion controllers/multi_cluster_app_dispatcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (

var multiClusterAppDispatcherTemplates = []string{
"mcad/configmap.yaml.tmpl",
"mcad/service.yaml.tmpl",
"mcad/serviceaccount.yaml.tmpl",
"mcad/deployment.yaml.tmpl",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the corresponding ports from the Deployment can also be removed:

ports:
  - name: https
     containerPort: 6443
     protocol: TCP
  - name: http
     containerPort: 8080
    protocol: TCP

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great catch! Changes were made now.

I do have a few thoughts though. Should we also be removing items from the MCAD test data ?

I.e., in mcad_test_results, there are some rolebindings and the same mentioned ports in the deployment of these tests.

These tests seem to run on the tag-and-build workflow.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great catch too! Indeed, these test data files should be amended accordingly too.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excellent, the respective files have been removed. Waiting on tests to pass.

}
Expand Down
13 changes: 0 additions & 13 deletions controllers/testdata/mcad_test_results/case_1/rolebinding.yaml
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions controllers/testdata/mcad_test_results/case_1/service.yaml
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions controllers/testdata/mcad_test_results/case_2/rolebinding.yaml
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions controllers/testdata/mcad_test_results/case_2/service.yaml
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions controllers/testdata/mcad_test_results/case_3/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,6 @@ spec:
name: mcad-custom-image-config
image: quay.io/project-codeflare/mcad-controller:custom
imagePullPolicy: Always
ports:
- name: https
containerPort: 6443
protocol: TCP
- name: http
containerPort: 8080
protocol: TCP
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
Expand Down