diff --git a/config/internal/mcad/apiservice_external-metrics.yaml b/config/internal/mcad/apiservice_external-metrics.yaml deleted file mode 100644 index 0c242c111..000000000 --- a/config/internal/mcad/apiservice_external-metrics.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# {{ if (eq .Values.configMap.multiCluster true) }} -apiVersion: apiregistration.k8s.io/v1beta1 -kind: APIService -metadata: - name: v1beta1.external.metrics.k8s.io - labels: - app.kubernetes.io/managed-by: MCAD - codeflare.codeflare.dev/cr-name: {{.Name}} - codeflare.codeflare.dev/cr-namespace: {{.Namespace}} -spec: - service: - name: mcad-{{.Name}}-metrics - namespace: {{.Namespace}} - group: external.metrics.k8s.io - version: v1beta1 - insecureSkipTLSVerify: true - groupPriorityMinimum: 100 - versionPriority: 100 diff --git a/config/internal/mcad/deployment.yaml.tmpl b/config/internal/mcad/deployment.yaml.tmpl index 4620c1dc7..502ab69d8 100644 --- a/config/internal/mcad/deployment.yaml.tmpl +++ b/config/internal/mcad/deployment.yaml.tmpl @@ -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 diff --git a/config/internal/mcad/service.yaml.tmpl b/config/internal/mcad/service.yaml.tmpl deleted file mode 100644 index 3bdd1555f..000000000 --- a/config/internal/mcad/service.yaml.tmpl +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: mcad-{{.Name}}-metrics - namespace: {{.Namespace}} -spec: - ports: - - name: https - port: 443 - targetPort: 6443 - - name: http - port: 80 - targetPort: 8080 - selector: - app: mcad-{{.Name}} diff --git a/controllers/multi_cluster_app_dispatcher.go b/controllers/multi_cluster_app_dispatcher.go index ca3b7e799..3d80e3c59 100644 --- a/controllers/multi_cluster_app_dispatcher.go +++ b/controllers/multi_cluster_app_dispatcher.go @@ -22,7 +22,6 @@ import ( var multiClusterAppDispatcherTemplates = []string{ "mcad/configmap.yaml.tmpl", - "mcad/service.yaml.tmpl", "mcad/serviceaccount.yaml.tmpl", "mcad/deployment.yaml.tmpl", } diff --git a/controllers/testdata/mcad_test_results/case_1/rolebinding.yaml b/controllers/testdata/mcad_test_results/case_1/rolebinding.yaml deleted file mode 100644 index d9205e2b8..000000000 --- a/controllers/testdata/mcad_test_results/case_1/rolebinding.yaml +++ /dev/null @@ -1,13 +0,0 @@ -kind: RoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: blank-custom-resource-custom-metrics-auth-reader - namespace: default -subjects: - - kind: ServiceAccount - name: mcad-controller-blank-custom-resource - namespace: default -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: extension-apiserver-authentication-reader diff --git a/controllers/testdata/mcad_test_results/case_1/service.yaml b/controllers/testdata/mcad_test_results/case_1/service.yaml deleted file mode 100644 index 6b6b57e71..000000000 --- a/controllers/testdata/mcad_test_results/case_1/service.yaml +++ /dev/null @@ -1,26 +0,0 @@ -kind: Service -apiVersion: v1 -metadata: - name: mcad-blank-custom-resource-metrics - namespace: default -spec: - clusterIP: 172.31.181.101 - ipFamilies: - - IPv4 - ports: - - name: https - protocol: TCP - port: 443 - targetPort: 6443 - - name: http - protocol: TCP - port: 80 - targetPort: 8080 - internalTrafficPolicy: Cluster - clusterIPs: - - 172.31.181.101 - type: ClusterIP - ipFamilyPolicy: SingleStack - sessionAffinity: None - selector: - app: mcad-blank-custom-resource diff --git a/controllers/testdata/mcad_test_results/case_2/rolebinding.yaml b/controllers/testdata/mcad_test_results/case_2/rolebinding.yaml deleted file mode 100644 index 521a11b27..000000000 --- a/controllers/testdata/mcad_test_results/case_2/rolebinding.yaml +++ /dev/null @@ -1,13 +0,0 @@ -kind: RoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: populated-custom-resource-custom-metrics-auth-reader - namespace: default -subjects: - - kind: ServiceAccount - name: mcad-controller-populated-custom-resource - namespace: default -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: extension-apiserver-authentication-reader diff --git a/controllers/testdata/mcad_test_results/case_2/service.yaml b/controllers/testdata/mcad_test_results/case_2/service.yaml deleted file mode 100644 index 7f2d1d2bc..000000000 --- a/controllers/testdata/mcad_test_results/case_2/service.yaml +++ /dev/null @@ -1,26 +0,0 @@ -kind: Service -apiVersion: v1 -metadata: - name: mcad-populated-custom-resource-metrics - namespace: default -spec: - clusterIP: 172.31.181.101 - ipFamilies: - - IPv4 - ports: - - name: https - protocol: TCP - port: 443 - targetPort: 6443 - - name: http - protocol: TCP - port: 80 - targetPort: 8080 - internalTrafficPolicy: Cluster - clusterIPs: - - 172.31.181.101 - type: ClusterIP - ipFamilyPolicy: SingleStack - sessionAffinity: None - selector: - app: mcad-populated-custom-resource diff --git a/controllers/testdata/mcad_test_results/case_3/deployment.yaml b/controllers/testdata/mcad_test_results/case_3/deployment.yaml index 5efa0df2a..03f8dffd1 100644 --- a/controllers/testdata/mcad_test_results/case_3/deployment.yaml +++ b/controllers/testdata/mcad_test_results/case_3/deployment.yaml @@ -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: