Open the Flux resource detail view when clicking the reconciliation status
What does this MR do and why?
This MR adds a functionality to view Flux resource details. It is available by clicking the Flux sync status badge
MR acceptance checklist
Please evaluate this MR against the MR acceptance checklist. It helps you analyze changes to reduce risks in quality, performance, reliability, security, and maintainability.
Screenshots or screen recordings
Screenshots are required for UI changes, and strongly recommended for all other merge requests.
Screen_Recording_2024-07-05_at_16.15.43
Screen_Recording_2024-07-05_at_16.16.01
How to set up and validate locally
Numbered steps to set up and validate the change are strongly suggested.
Validate locally without full set up (using patch)
- Visit Project -> Operate -> Environments
- Create/Edit an environment using the UI
- Apply patch
Click to expand
diff --git a/app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_overview.vue b/app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_overview.vue
index 5e459fafb8b2..857ba938aee4 100644
--- a/app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_overview.vue
+++ b/app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_overview.vue
@@ -68,11 +68,11 @@ export default {
fluxResourcePath: this.fluxResourcePath,
};
},
- skip() {
- return Boolean(
- !this.fluxResourcePath || this.fluxResourcePath?.includes(HELM_RELEASES_RESOURCE_TYPE),
- );
- },
+ // skip() {
+ // return Boolean(
+ // !this.fluxResourcePath || this.fluxResourcePath?.includes(HELM_RELEASES_RESOURCE_TYPE),
+ // );
+ // },
error(err) {
this.fluxApiError = err.message;
},
diff --git a/app/assets/javascripts/environments/environment_details/index.vue b/app/assets/javascripts/environments/environment_details/index.vue
index 73c34500a868..cc8f714f5f4a 100644
--- a/app/assets/javascripts/environments/environment_details/index.vue
+++ b/app/assets/javascripts/environments/environment_details/index.vue
@@ -46,7 +46,32 @@ export default {
};
},
update(data) {
- return data?.project?.environment;
+ const result = data?.project?.environment;
+ if (!result.clusterAgent) {
+ const clusterAgent = {
+ __typename: 'ClusterAgent',
+ id: 'gid://gitlab/Clusters::Agent/123',
+ name: 'my-agent',
+ webPath: '/gitlab-org/cluster-integration/-/cluster_agents/my-agent',
+ tokens: {
+ __typename: 'ClusterAgentTokenConnection',
+ nodes: [
+ {
+ __typename: 'ClusterAgentToken',
+ id: 'gid://gitlab/Clusters::AgentToken/123',
+ lastUsedAt: '2023-05-30T11:47:56Z',
+ },
+ ],
+ },
+ };
+
+ return {
+ ...result,
+ clusterAgent,
+ };
+ }
+
+ return result;
},
result() {
this.updateCurrentTab();
diff --git a/app/assets/javascripts/environments/graphql/resolvers/flux.js b/app/assets/javascripts/environments/graphql/resolvers/flux.js
index 8dedb275ac32..9998b6a32036 100644
--- a/app/assets/javascripts/environments/graphql/resolvers/flux.js
+++ b/app/assets/javascripts/environments/graphql/resolvers/flux.js
@@ -112,6 +112,41 @@ const getFluxResource = ({ query, variables, field, resourceType, client }) => {
const withCredentials = true;
const url = `${variables.configuration.basePath}/apis/${variables.fluxResourcePath}`;
+ updateConnectionStatus(client, {
+ configuration: variables.configuration,
+ namespace: 'flux-system',
+ resourceType,
+ status: connectionStatus.connected,
+ });
+ return mapFluxItems(
+ {
+ kind: 'Kustomization',
+ metadata: {
+ name: 'flux-system',
+ namespace: 'flux-system',
+ },
+ status: {
+ conditions: [
+ {
+ message: 'Applied revision: main@sha1:f259306804c5b8417748b33c86fcd5a327ed1aba',
+ reason: 'ReconciliationSucceeded',
+ status: 'True',
+ type: 'Ready',
+ },
+ ],
+ inventory: [
+ {
+ id: '_alerts.notification.toolkit.fluxcd.io_apiextensions.k8s.io_CustomResourceDefinition',
+ },
+ {
+ id: '_buckets.source.toolkit.fluxcd.io_apiextensions.k8s.io_CustomResourceDefinition',
+ },
+ ],
+ },
+ },
+ KUSTOMIZATIONS_RESOURCE_TYPE,
+ );
+
return axios
.get(url, { withCredentials, headers })
.then((res) => {
- Visit the Environments page and select the environment.
- Validate the Flux sync status
- Click on the Flux sync status to validate the drawer with the resource details.
Validate locally with the full set up and real data
-
Follow this guide to start with the Flux.
-
Visit Project -> Operate -> Environments
-
Create/Edit an environment using the UI
-
Enable KAS on your GDK (steps 1-2 from the guide).
-
Visit the Project -> Infrastructure -> Kubernetes clusters page and create an agent following the instruction from the modal.
- Select the "Connect a cluster" button
- The modal should pop up
- In the modal select "Select an agent or enter a name to create new"
- You probably won't have any configured agents to show up in the list, create a new one by typing the name of your choice
- The button should appear at the bottom of the list saying "Create agent:
<your-agent-name>
" - Select the button and click "Register" in the next view.
- Save the token to use it in the next point.
-
Add the following configuration inside your project in
.gitlab/agents/<your-agent-name>/config.yaml
for the user_access agent:user_access: access_as: agent: {} projects: - id: <your-group>/<your-project-to-share-agent-with>
-
Note that the shared agents should be connected to the cluster in order to appear in the list. Please follow points 3-8 from the guide and then the Deploy the GitLab Agent (agentk) with k3d section to create a local cluster and connect your agent with the cluster.
-
Select an agent from the dropdown in the Environments settings page and save the change.
-
Visit the Environments page and select the environment that has an associated agent.
-
Validate the Flux sync status
-
Click on the Flux sync status to validate the drawer with the resource details.
Related to #438265 (closed)