prep next release

* tweaks for service catalog * ...
pluralsh · Dec 5, 2024 · d0d4fd2 · d0d4fd2
1 parent 52eceeb
commit d0d4fd2
Show file tree

Hide file tree

Showing 24 changed files with 445 additions and 41 deletions.
diff --git a/assets/src/components/layout/Sidebar.tsx b/assets/src/components/layout/Sidebar.tsx
@@ -93,13 +93,6 @@ function getMenuItems({
       path: HOME_ABS_PATH,
       hotkeys: ['shift H', '1'],
     },
-    {
-      text: 'Service catalog',
-      expandedLabel: 'Service catalog',
-      icon: <CatalogIcon />,
-      path: CATALOGS_ABS_PATH,
-      hotkeys: ['2'],
-    },
     {
       text: 'Apps',
       expandedLabel: 'Apps',
@@ -139,6 +132,13 @@ function getMenuItems({
       path: `${AI_ABS_PATH}`,
       hotkeys: ['shift A', '6'],
     },
+    {
+      text: 'Service catalog',
+      expandedLabel: 'Service catalog',
+      icon: <CatalogIcon />,
+      path: CATALOGS_ABS_PATH,
+      hotkeys: ['2'],
+    },
     {
       text: 'Builds',
       expandedLabel: 'Builds',

diff --git a/assets/src/generated/graphql-kubernetes.ts b/assets/src/generated/graphql-kubernetes.ts
@@ -1,4 +1,4 @@
-/* eslint-disable */
+ 
 /* prettier-ignore */
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';

diff --git a/assets/src/generated/graphql-plural.ts b/assets/src/generated/graphql-plural.ts
@@ -1,4 +1,4 @@
-/* eslint-disable */
+ 
 /* prettier-ignore */
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';

diff --git a/assets/src/generated/graphql.ts b/assets/src/generated/graphql.ts
@@ -1,4 +1,4 @@
-/* eslint-disable */
+ 
 /* prettier-ignore */
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
@@ -261,6 +261,8 @@ export type AiSettings = {
   ollama?: Maybe<OllamaSettings>;
   openai?: Maybe<OpenaiSettings>;
   provider?: Maybe<AiProvider>;
+  /** ai provider to use with tool calls */
+  toolProvider?: Maybe<AiProvider>;
   toolsEnabled?: Maybe<Scalars['Boolean']['output']>;
   vertex?: Maybe<VertexAiSettings>;
 };
@@ -273,6 +275,8 @@ export type AiSettingsAttributes = {
   ollama?: InputMaybe<OllamaAttributes>;
   openai?: InputMaybe<OpenaiSettingsAttributes>;
   provider?: InputMaybe<AiProvider>;
+  /** ai provider to use with tool calls */
+  toolProvider?: InputMaybe<AiProvider>;
   tools?: InputMaybe<ToolConfigAttributes>;
   vertex?: InputMaybe<VertexAiAttributes>;
 };
@@ -6684,6 +6688,7 @@ export type RootQueryType = {
   violationStatistics?: Maybe<Array<Maybe<ViolationStatistic>>>;
   vulnerabilityReport?: Maybe<VulnerabilityReport>;
   vulnerabilityReports?: Maybe<VulnerabilityReportConnection>;
+  vulnerabilityStatistics?: Maybe<Array<Maybe<VulnerabilityStatistic>>>;
   webhooks?: Maybe<WebhookConnection>;
   wireguardPeer?: Maybe<WireguardPeer>;
   wireguardPeers?: Maybe<Array<Maybe<WireguardPeer>>>;
@@ -7731,7 +7736,16 @@ export type RootQueryTypeVulnerabilityReportsArgs = {
   before?: InputMaybe<Scalars['String']['input']>;
   clusters?: InputMaybe<Array<InputMaybe<Scalars['ID']['input']>>>;
   first?: InputMaybe<Scalars['Int']['input']>;
+  grade?: InputMaybe<VulnReportGrade>;
   last?: InputMaybe<Scalars['Int']['input']>;
+  namespaces?: InputMaybe<Array<InputMaybe<Scalars['String']['input']>>>;
+  q?: InputMaybe<Scalars['String']['input']>;
+};
+
+
+export type RootQueryTypeVulnerabilityStatisticsArgs = {
+  clusters?: InputMaybe<Array<InputMaybe<Scalars['ID']['input']>>>;
+  namespaces?: InputMaybe<Array<InputMaybe<Scalars['String']['input']>>>;
   q?: InputMaybe<Scalars['String']['input']>;
 };
 
@@ -9489,6 +9503,14 @@ export type VulnOsAttributes = {
   name?: InputMaybe<Scalars['String']['input']>;
 };
 
+export enum VulnReportGrade {
+  A = 'A',
+  B = 'B',
+  C = 'C',
+  D = 'D',
+  F = 'F'
+}
+
 export enum VulnSeverity {
   Critical = 'CRITICAL',
   High = 'HIGH',
@@ -9596,6 +9618,12 @@ export type VulnerabilityReportEdge = {
   node?: Maybe<VulnerabilityReport>;
 };
 
+export type VulnerabilityStatistic = {
+  __typename?: 'VulnerabilityStatistic';
+  count: Scalars['Int']['output'];
+  grade: VulnReportGrade;
+};
+
 export type WaitingState = {
   __typename?: 'WaitingState';
   message?: Maybe<Scalars['String']['output']>;

diff --git a/charts/controller/crds/deployments.plural.sh_deploymentsettings.yaml b/charts/controller/crds/deployments.plural.sh_deploymentsettings.yaml
@@ -271,6 +271,18 @@ spec:
                     - BEDROCK
                     - VERTEX
                     type: string
+                  toolProvider:
+                    default: OPENAI
+                    description: Provider to use for tool calling, in case you want
+                      to use a different LLM more optimized to those tasks
+                    enum:
+                    - OPENAI
+                    - ANTHROPIC
+                    - OLLAMA
+                    - AZURE
+                    - BEDROCK
+                    - VERTEX
+                    type: string
                   vertex:
                     description: Vertex holds configuration for using GCP VertexAI
                       to generate LLM insights

diff --git a/charts/controller/crds/deployments.plural.sh_prautomations.yaml b/charts/controller/crds/deployments.plural.sh_prautomations.yaml
@@ -89,6 +89,49 @@ spec:
                 description: The base branch this pr will be based on (defaults to
                   the repo's main branch)
                 type: string
+              catalogRef:
+                description: CatalogRef the catalog this automation will belong to
+                properties:
+                  apiVersion:
+                    description: API version of the referent.
+                    type: string
+                  fieldPath:
+                    description: |-
+                      If referring to a piece of an object instead of an entire object, this string
+                      should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                      For example, if the object reference is to a container within a pod, this would take on a value like:
+                      "spec.containers{name}" (where "name" refers to the name of the container that triggered
+                      the event) or if no container name is specified "spec.containers[2]" (container with
+                      index 2 in this pod). This syntax is chosen only to have some well-defined way of
+                      referencing a part of an object.
+                    type: string
+                  kind:
+                    description: |-
+                      Kind of the referent.
+                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                    type: string
+                  name:
+                    description: |-
+                      Name of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                    type: string
+                  resourceVersion:
+                    description: |-
+                      Specific resourceVersion to which this reference is made, if any.
+                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
+                    type: string
+                  uid:
+                    description: |-
+                      UID of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
               clusterRef:
                 description: ClusterRef a cluster this pr works on
                 properties:

diff --git a/go/client/models_gen.go b/go/client/models_gen.go
diff --git a/go/controller/api/v1alpha1/catalog_types.go b/go/controller/api/v1alpha1/catalog_types.go
@@ -129,3 +129,17 @@ func (c *Catalog) Diff(hasher Hasher) (changed bool, sha string, err error) {
 
 	return !c.Status.IsSHAEqual(currentSha), currentSha, nil
 }
+
+// ConsoleID implements [PluralResource] interface
+func (in *Catalog) ConsoleID() *string {
+	return in.Status.ID
+}
+
+// ConsoleName implements [PluralResource] interface
+func (in *Catalog) ConsoleName() string {
+	if in.Spec.Name != nil {
+		return *in.Spec.Name
+	}
+
+	return in.Name
+}
diff --git a/go/controller/api/v1alpha1/deploymentsettings_types.go b/go/controller/api/v1alpha1/deploymentsettings_types.go
@@ -183,6 +183,13 @@ type AISettings struct {
 	// +kubebuilder:validation:Optional
 	Provider *console.AiProvider `json:"provider,omitempty"`
 
+	// Provider to use for tool calling, in case you want to use a different LLM more optimized to those tasks
+	//
+	// +kubebuilder:validation:Enum=OPENAI;ANTHROPIC;OLLAMA;AZURE;BEDROCK;VERTEX
+	// +kubebuilder:default=OPENAI
+	// +kubebuilder:validation:Optional
+	ToolProvider *console.AiProvider `json:"toolProvider,omitempty"`
+
 	// OpenAI holds the OpenAI provider configuration.
 	//
 	// +kubebuilder:validation:Optional
@@ -216,8 +223,9 @@ type AISettings struct {
 
 func (in *AISettings) Attributes(ctx context.Context, c client.Client, namespace string) (*console.AiSettingsAttributes, error) {
 	attr := &console.AiSettingsAttributes{
-		Enabled:  in.Enabled,
-		Provider: in.Provider,
+		Enabled:      in.Enabled,
+		Provider:     in.Provider,
+		ToolProvider: in.ToolProvider,
 	}
 
 	switch *in.Provider {

diff --git a/go/controller/api/v1alpha1/prautomation_types.go b/go/controller/api/v1alpha1/prautomation_types.go
@@ -177,6 +177,10 @@ type PrAutomationSpec struct {
 	// +kubebuilder:validation:Optional
 	ProjectRef *corev1.ObjectReference `json:"projectRef,omitempty"`
 
+	// CatalogRef the catalog this automation will belong to
+	// +kubebuilder:validation:Optional
+	CatalogRef *corev1.ObjectReference `json:"catalogRef,omitempty"`
+
 	// Bindings contain read and write policies of pr automation
 	// +kubebuilder:validation:Optional
 	Bindings *PrAutomationBindings `json:"bindings,omitempty"`

diff --git a/go/controller/api/v1alpha1/zz_generated.deepcopy.go b/go/controller/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/go/controller/config/crd/bases/deployments.plural.sh_deploymentsettings.yaml b/go/controller/config/crd/bases/deployments.plural.sh_deploymentsettings.yaml
@@ -271,6 +271,18 @@ spec:
                     - BEDROCK
                     - VERTEX
                     type: string
+                  toolProvider:
+                    default: OPENAI
+                    description: Provider to use for tool calling, in case you want
+                      to use a different LLM more optimized to those tasks
+                    enum:
+                    - OPENAI
+                    - ANTHROPIC
+                    - OLLAMA
+                    - AZURE
+                    - BEDROCK
+                    - VERTEX
+                    type: string
                   vertex:
                     description: Vertex holds configuration for using GCP VertexAI
                       to generate LLM insights