Merge pull request #27 from microsoft/eedorenko/config-schema

Config schema

.github/workflows/ci.yaml

@@ -47,6 +47,8 @@ jobs:
   Publish_Helm_Chart:  
     runs-on: ubuntu-latest
     needs: [Build_Push_Scheduler_Image]
+    permissions:
+      contents: write      
     steps:
       - name: Checkout
         uses: actions/checkout@v2

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.19 as builder
+FROM golang:1.20 as builder
 ARG TARGETOS
 ARG TARGETARCH
 

PROJECT

@@ -100,4 +100,12 @@ resources:
   kind: Environment
   path: github.com/microsoft/kalypso-scheduler/api/v1alpha1
   version: v1alpha1
+- api:
+    crdVersion: v1
+    namespaced: true
+  domain: kalypso.io
+  group: scheduler
+  kind: ConfigSchema
+  path: github.com/microsoft/kalypso-scheduler/api/v1alpha1
+  version: v1alpha1
 version: "3"

api/v1alpha1/assignment_types.go

@@ -43,6 +43,9 @@ type AssignmentSpec struct {
 // AssignmentStatus defines the observed state of Assignment
 type AssignmentStatus struct {
 	Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
+
+	//optional
+	GitIssueStatus GitIssueStatus `json:"gitIssueStatus,omitempty"`
 }
 
 //+kubebuilder:object:root=true

api/v1alpha1/configschema_types.go

@@ -0,0 +1,59 @@
+/*
+Copyright 2023 microsoft.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// ConfigSchemaSpec defines the desired state of ConfigSchema
+type ConfigSchemaSpec struct {
+	//+kubebuilder:pruning:PreserveUnknownFields
+	//+kubebuilder:validation:MinLength=0
+	Schema string `json:"schema"`
+}
+
+// ConfigSchemaStatus defines the observed state of ConfigSchema
+type ConfigSchemaStatus struct {
+	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
+	// Important: Run "make" to regenerate code after modifying this file
+}
+
+//+kubebuilder:object:root=true
+//+kubebuilder:subresource:status
+
+// ConfigSchema is the Schema for the configschemas API
+type ConfigSchema struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   ConfigSchemaSpec   `json:"spec,omitempty"`
+	Status ConfigSchemaStatus `json:"status,omitempty"`
+}
+
+//+kubebuilder:object:root=true
+
+// ConfigSchemaList contains a list of ConfigSchema
+type ConfigSchemaList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []ConfigSchema `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&ConfigSchema{}, &ConfigSchemaList{})
+}

api/v1alpha1/deploymenttarget_types.go

@@ -34,6 +34,9 @@ type DeploymentTargetSpec struct {
 	Environment string `json:"environment"`
 
 	Manifests map[string]string `json:"manifests"`
+
+	// +optional
+	ConfigSchemas []string `json:"configSchemas"`
 }
 
 type ManifestsSpec struct {

api/v1alpha1/gitopsrepo_types.go

@@ -62,6 +62,11 @@ type GitOpsRepoStatus struct {
 	Conditions      []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
 }
 
+type GitIssueStatus struct {
+	IssueNo     int    `json:"issueNo,omitempty"`
+	ContentHash string `json:"contentHash,omitempty"`
+}
+
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 

api/v1alpha1/workload_types.go

@@ -26,6 +26,8 @@ import (
 // WorkloadSpec defines the desired state of Workload
 type WorkloadSpec struct {
 	DeploymentTargets []DeploymentTargetDetail `json:"deploymentTargets,omitempty"`
+	// +optional
+	ConfigSchemas []string `json:"configSchemas"`
 }
 
 type DeploymentTargetDetail struct {

config/crd/bases/scheduler.kalypso.io_assignments.yaml

@@ -120,6 +120,14 @@ spec:
                   - type
                   type: object
                 type: array
+              gitIssueStatus:
+                description: optional
+                properties:
+                  contentHash:
+                    type: string
+                  issueNo:
+                    type: integer
+                type: object
             type: object
         type: object
     served: true

config/crd/bases/scheduler.kalypso.io_configschemas.yaml

@@ -0,0 +1,52 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.10.0
+  creationTimestamp: null
+  name: configschemas.scheduler.kalypso.io
+spec:
+  group: scheduler.kalypso.io
+  names:
+    kind: ConfigSchema
+    listKind: ConfigSchemaList
+    plural: configschemas
+    singular: configschema
+  scope: Namespaced
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: ConfigSchema is the Schema for the configschemas API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: ConfigSchemaSpec defines the desired state of ConfigSchema
+            properties:
+              schema:
+                minLength: 0
+                type: string
+                x-kubernetes-preserve-unknown-fields: true
+            required:
+            - schema
+            type: object
+          status:
+            description: ConfigSchemaStatus defines the observed state of ConfigSchema
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}

config/crd/bases/scheduler.kalypso.io_deploymenttargets.yaml

@@ -35,6 +35,10 @@ spec:
           spec:
             description: DeploymentTargetSpec defines the desired state of DeploymentTarget
             properties:
+              configSchemas:
+                items:
+                  type: string
+                type: array
               environment:
                 minLength: 0
                 type: string

config/crd/bases/scheduler.kalypso.io_workloads.yaml

@@ -35,9 +35,17 @@ spec:
           spec:
             description: WorkloadSpec defines the desired state of Workload
             properties:
+              configSchemas:
+                items:
+                  type: string
+                type: array
               deploymentTargets:
                 items:
                   properties:
+                    configSchemas:
+                      items:
+                        type: string
+                      type: array
                     environment:
                       minLength: 0
                       type: string