Skip to content
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

feat(split): use configuration-observability-oss, removed xService #127

Merged
merged 2 commits into from
Nov 4, 2023
Merged

feat(split): use configuration-observability-oss, removed xService #127

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
c960e09
feat(split): prometheus and gitops
haarchri Nov 4, 2023
19fb0a5
style(white): remove whitespace
haarchri Nov 4, 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
76 changes: 49 additions & 27 deletions apis/cluster/composition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ spec:
apiVersion: aws.platformref.upbound.io/v1alpha1
kind: XCluster
resources:
- base:
- name: XNetwork
base:
apiVersion: aws.platform.upbound.io/v1alpha1
kind: XNetwork
patches:
Expand All @@ -27,13 +28,13 @@ spec:
toFieldPath: status.subnetIds
policy:
fromFieldPath: Required
name: compositeNetworkEKS
- base:

- name: XEKS
base:
apiVersion: aws.platform.upbound.io/v1alpha1
kind: XEKS
connectionDetails:
- fromConnectionSecretKey: kubeconfig
name: compositeClusterEKS
patches:
- fromFieldPath: spec.parameters.id
toFieldPath: metadata.labels[xeks.aws.platform.upbound.io/cluster-id]
Expand Down Expand Up @@ -65,31 +66,52 @@ spec:
toFieldPath: spec.parameters.iam.roleArn
- fromFieldPath: spec.parameters.iam.userArn
toFieldPath: spec.parameters.iam.userArn
- base:
apiVersion: aws.platformref.upbound.io/v1alpha1
kind: XServices
name: compositeClusterServices

- name: XOss
base:
apiVersion: observe.platform.upbound.io/v1alpha1
kind: XOss
patches:
- fromFieldPath: spec.parameters.deletionPolicy
toFieldPath: spec.deletionPolicy
toFieldPath: spec.parameters.deletionPolicy
- fromFieldPath: spec.parameters.id
toFieldPath: spec.providerConfigRef.name
- fromFieldPath: spec.parameters.services.operators.flux.version
toFieldPath: spec.operators.flux.version
- fromFieldPath: spec.parameters.services.operators.prometheus.version
toFieldPath: spec.operators.prometheus.version
- fromFieldPath: spec.parameters.gitops.url
toFieldPath: spec.gitops.url
- fromFieldPath: spec.parameters.gitops.path
toFieldPath: spec.gitops.path
- fromFieldPath: spec.parameters.gitops.kubeConfigSecretRef.name
toFieldPath: spec.gitops.kubeConfigSecretRef.name
- fromFieldPath: spec.parameters.gitops.kubeConfigSecretRef.namespace
toFieldPath: spec.gitops.kubeConfigSecretRef.namespace
- fromFieldPath: spec.parameters.serviceSelector
toFieldPath: spec.compositionSelector.matchLabels[type]
toFieldPath: spec.parameters.id
- fromFieldPath: spec.parameters.operators.prometheus.version
toFieldPath: spec.parameters.operators.prometheus.version

- name: XFlux
base:
apiVersion: gitops.platform.upbound.io/v1alpha1
kind: XFlux
patches:
- fromFieldPath: spec.parameters.deletionPolicy
toFieldPath: spec.parameters.deletionPolicy
- fromFieldPath: spec.parameters.id
toFieldPath: spec.parameters.providerConfigName
- fromFieldPath: spec.parameters.operators.flux.version
toFieldPath: spec.parameters.operators.flux.version
- fromFieldPath: spec.parameters.operators.flux-sync.version
toFieldPath: spec.parameters.operators.flux-sync.version
- fromFieldPath: spec.parameters.gitops
toFieldPath: spec.parameters.source

- name: usageXEksByXFlux
base:
apiVersion: apiextensions.crossplane.io/v1alpha1
kind: Usage
spec:
of:
apiVersion: aws.platform.upbound.io/v1alpha1
kind: XEKS
resourceSelector:
matchControllerRef: true
by:
apiVersion: gitops.platform.upbound.io/v1alpha1
kind: XFlux
resourceSelector:
matchControllerRef: true

- name: usageXEksByXService
- name: usageXEksByXOss
base:
apiVersion: apiextensions.crossplane.io/v1alpha1
kind: Usage
Expand All @@ -100,8 +122,8 @@ spec:
resourceSelector:
matchControllerRef: true
by:
apiVersion: aws.platformref.upbound.io/v1alpha1
kind: XServices
apiVersion: observe.platform.upbound.io/v1alpha1
kind: XOss
resourceSelector:
matchControllerRef: true

Expand Down
Loading