changes

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/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
 

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/kustomization.yaml

@@ -13,6 +13,7 @@ resources:
 - bases/scheduler.kalypso.io_baserepoes.yaml
 - bases/scheduler.kalypso.io_workloadregistrations.yaml
 - bases/scheduler.kalypso.io_environments.yaml
+- bases/scheduler.kalypso.io_configschemas.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
 patchesStrategicMerge:
@@ -29,6 +30,7 @@ patchesStrategicMerge:
 #- patches/webhook_in_baserepoes.yaml
 #- patches/webhook_in_workloadregistrations.yaml
 #- patches/webhook_in_environments.yaml
+#- patches/webhook_in_configschemas.yaml
 #+kubebuilder:scaffold:crdkustomizewebhookpatch
 
 # [CERTMANAGER] To enable cert-manager, uncomment all the sections with [CERTMANAGER] prefix.
@@ -44,6 +46,7 @@ patchesStrategicMerge:
 #- patches/cainjection_in_baserepoes.yaml
 #- patches/cainjection_in_workloadregistrations.yaml
 #- patches/cainjection_in_environments.yaml
+#- patches/cainjection_in_configschemas.yaml
 #+kubebuilder:scaffold:crdkustomizecainjectionpatch
 
 # the following config is for teaching kustomize how to do kustomization for CRDs.

config/crd/patches/cainjection_in_configschemas.yaml

@@ -0,0 +1,7 @@
+# The following patch adds a directive for certmanager to inject CA into the CRD
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
+  name: configschemas.scheduler.kalypso.io

config/crd/patches/webhook_in_configschemas.yaml

@@ -0,0 +1,16 @@
+# The following patch enables a conversion webhook for the CRD
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: configschemas.scheduler.kalypso.io
+spec:
+  conversion:
+    strategy: Webhook
+    webhook:
+      clientConfig:
+        service:
+          namespace: system
+          name: webhook-service
+          path: /convert
+      conversionReviewVersions:
+      - v1

config/rbac/configschema_editor_role.yaml

@@ -0,0 +1,31 @@
+# permissions for end users to edit configschemas.
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    app.kubernetes.io/name: clusterrole
+    app.kubernetes.io/instance: configschema-editor-role
+    app.kubernetes.io/component: rbac
+    app.kubernetes.io/created-by: kalypso-scheduler
+    app.kubernetes.io/part-of: kalypso-scheduler
+    app.kubernetes.io/managed-by: kustomize
+  name: configschema-editor-role
+rules:
+- apiGroups:
+  - scheduler.kalypso.io
+  resources:
+  - configschemas
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - scheduler.kalypso.io
+  resources:
+  - configschemas/status
+  verbs:
+  - get

config/rbac/configschema_viewer_role.yaml

@@ -0,0 +1,27 @@
+# permissions for end users to view configschemas.
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    app.kubernetes.io/name: clusterrole
+    app.kubernetes.io/instance: configschema-viewer-role
+    app.kubernetes.io/component: rbac
+    app.kubernetes.io/created-by: kalypso-scheduler
+    app.kubernetes.io/part-of: kalypso-scheduler
+    app.kubernetes.io/managed-by: kustomize
+  name: configschema-viewer-role
+rules:
+- apiGroups:
+  - scheduler.kalypso.io
+  resources:
+  - configschemas
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - scheduler.kalypso.io
+  resources:
+  - configschemas/status
+  verbs:
+  - get