runtime and cluster

codefresh-io · Jan 31, 2024 · 2d0fa16 · 2d0fa16
1 parent 1c5e5b7
commit 2d0fa16
Show file tree

Hide file tree

Showing 7 changed files with 165 additions and 223 deletions.
diff --git a/controller/state.go b/controller/state.go
@@ -209,8 +209,7 @@ func (m *appStateManager) getRepoObjs(app *v1alpha1.Application, sources []v1alp
 			ProjectName:        proj.Name,
 			ProjectSourceRepos: proj.Spec.SourceRepos,
 			ApplicationIdentity: &apiclient.ApplicationIdentity{
-				Runtime:   "runtime",
-				Cluster:   "cluster",
+				Cluster:   app.Spec.Destination.Server,
 				Namespace: app.Spec.Destination.Namespace,
 				Name:      app.InstanceName(m.namespace),
 			},

diff --git a/pkg/codefresh/client.go b/pkg/codefresh/client.go
@@ -106,8 +106,8 @@ func (cc *CodefreshClient) Send(ctx context.Context, appName string, event *even
 func (client *CodefreshClient) GetApplicationConfiguration(app *ApplicationIdentity) (*ApplicationConfiguration, error) {
 	query := GraphQLQuery{
 		Query: `
-		query ($runtime: String!, $cluster: String!, $namespace: String!, $name: String!) {
-		  applicationConfiguration(runtime: $runtime, cluster: $cluster, namespace: $namespace, name: $name) {
+		query ($cluster: String!, $namespace: String!, $name: String!) {
+		  applicationConfigurationByRuntime(cluster: $cluster, namespace: $namespace, name: $name) {
 			versionSource {
 			  file
 			  jsonPath
@@ -116,7 +116,6 @@ func (client *CodefreshClient) GetApplicationConfiguration(app *ApplicationIdent
 		}
 		`,
 		Variables: map[string]interface{}{
-			"runtime":   app.Runtime,
 			"cluster":   app.Cluster,
 			"namespace": app.Namespace,
 			"name":      app.Name,

diff --git a/reposerver/apiclient/repository.pb.go b/reposerver/apiclient/repository.pb.go
diff --git a/reposerver/repository/repository.go b/reposerver/repository/repository.go
@@ -637,7 +637,6 @@ func (s *Service) GenerateManifest(ctx context.Context, q *apiclient.ManifestReq
 		}
 
 		versionConfig := s.GetVersionConfig(&codefresh.ApplicationIdentity{
-			Runtime:   q.ApplicationIdentity.Runtime,
 			Cluster:   q.ApplicationIdentity.Cluster,
 			Namespace: q.ApplicationIdentity.Namespace,
 			Name:      q.ApplicationIdentity.Name,

diff --git a/reposerver/repository/repository.proto b/reposerver/repository/repository.proto
@@ -9,10 +9,9 @@ import "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1/generated.p
 import "google/protobuf/empty.proto";
 
 message ApplicationIdentity {
-    string runtime = 1;
-    string cluster = 2;
-    string namespace = 3;
-    string name = 4;
+    string cluster = 1;
+    string namespace = 2;
+    string name = 3;
 }
 
 // ManifestRequest is a query for manifest generation.

diff --git a/server/application/application.go b/server/application/application.go
@@ -508,8 +508,7 @@ func (s *Server) GetManifests(ctx context.Context, q *application.ApplicationMan
 			ProjectName:        proj.Name,
 			ProjectSourceRepos: proj.Spec.SourceRepos,
 			ApplicationIdentity: &apiclient.ApplicationIdentity{
-				Runtime:   "runtime",
-				Cluster:   "cluster",
+				Cluster:   a.Spec.Destination.Server,
 				Namespace: a.Spec.Destination.Namespace,
 				Name:      a.InstanceName(s.ns),
 			},

diff --git a/util/argo/argo.go b/util/argo/argo.go
@@ -774,8 +774,7 @@ func verifyGenerateManifests(
 			HasMultipleSources: hasMultipleSources,
 			RefSources:         refSources,
 			ApplicationIdentity: &apiclient.ApplicationIdentity{
-				Runtime:   "runtime",
-				Cluster:   "cluster",
+				Cluster:   dest.Server,
 				Namespace: dest.Namespace,
 				Name:      name,
 			},