Skip to content

Fixes to clusters-in-any-namespace #1035

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 3 commits into from
Jul 3, 2022
Merged

Fixes to clusters-in-any-namespace #1035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a15896
Corrects MC-query RBAC for cluster-service SA
foot Jul 1, 2022
f6a519b
Move clusters-bases-kustomization into the namespaces cluster path
foot Jul 1, 2022
0ea2c96
Merge branch 'main' into fixes-mc-querying-in-all-clusters
foot Jul 3, 2022
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
15 changes: 15 additions & 0 deletions charts/mccp/templates/clusters-service/clusters_service_secrets_rb.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ subjects:
name: {{ include "mccp.serviceAccountName" . }}
namespace: {{ .Release.Namespace | quote }}
---
{{- if .Values.config.capi.clusters.namespace }}
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
Expand All @@ -26,6 +27,20 @@ subjects:
- kind: ServiceAccount
name: {{ include "mccp.serviceAccountName" . }}
namespace: {{ .Release.Namespace | quote }}
{{- else }}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: clusters-service-secrets-role
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: clusters-service-secrets-role
subjects:
- kind: ServiceAccount
name: {{ include "mccp.serviceAccountName" . }}
namespace: {{ .Release.Namespace | quote }}
{{- end }}
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
Expand Down
11 changes: 6 additions & 5 deletions cmd/clusters-service/pkg/server/clusters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ func (s *server) CreatePullRequest(ctx context.Context, msg *capiv1_proto.Create
}

if viper.GetString("add-bases-kustomization") == "enabled" {
commonKustomization, err := getCommonKustomization(clusterName)
commonKustomization, err := getCommonKustomization(cluster)
if err != nil {
return nil, fmt.Errorf("failed to get common kustomization for %s: %s", clusterName, err)
}
Expand Down Expand Up @@ -399,9 +399,9 @@ func getToken(ctx context.Context) (string, string, error) {
return providerToken.AccessToken, "oauth2", nil
}

func getCommonKustomization(clusterName string) (*gitprovider.CommitFile, error) {
func getCommonKustomization(cluster types.NamespacedName) (*gitprovider.CommitFile, error) {

commonKustomizationPath := getCommonKustomizationPath(clusterName)
commonKustomizationPath := getCommonKustomizationPath(cluster)
commonKustomization := &kustomizev1.Kustomization{
TypeMeta: metav1.TypeMeta{
Kind: kustomizev1.KustomizationKind,
Expand Down Expand Up @@ -623,10 +623,11 @@ func getClusterManifestPath(cluster types.NamespacedName) string {
)
}

func getCommonKustomizationPath(clusterName string) string {
func getCommonKustomizationPath(cluster types.NamespacedName) string {
return filepath.Join(
viper.GetString("capi-repository-clusters-path"),
clusterName,
cluster.Namespace,
cluster.Name,
"clusters-bases-kustomization.yaml",
)
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/clusters-service/pkg/server/clusters_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ metadata:
`,
},
{
Path: "clusters/dev/clusters-bases-kustomization.yaml",
Path: "clusters/default/dev/clusters-bases-kustomization.yaml",
Content: `apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
kind: Kustomization
metadata:
Expand Down Expand Up @@ -479,7 +479,7 @@ metadata:
`,
},
{
Path: "clusters/dev/clusters-bases-kustomization.yaml",
Path: "clusters/default/dev/clusters-bases-kustomization.yaml",
Content: `apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
kind: Kustomization
metadata:
Expand Down