Skip to content

Commit ab28ab0

Browse files
eedorenkoeedorenko
committed
compilable
1 parent e6f18b9 commit ab28ab0

File tree

10 files changed

+245
-180
lines changed

10 files changed

+245
-180
lines changed

‎api/v1alpha1/deploymentdescriptor_types.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ type DeploymentDescriptorSpec struct {
9696

9797
// DeploymentDescriptorStatus defines the observed state of DeploymentDescriptor
9898
type DeploymentDescriptorStatus struct {
99-
Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
99+
Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
100+
GitOpsCommitId string `json:"gitOpsCommitId,omitempty"`
100101
}
101102

102103
//+kubebuilder:object:root=true

‎api/v1alpha1/reconciler_types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ type ReconcilerType string
4141
const (
4242
ReconcilerTypeFlux ReconcilerType = "flux"
4343
ReconcilerTypeArc ReconcilerType = "arc"
44+
ReconcilerTypeWo ReconcilerType = "wo"
4445
)
4546

4647
type Deployment struct {

‎api/v1alpha1/zz_generated.deepcopy.go‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/crd/bases/hub.kalypso.io_azureresourcegraphs.yaml‎

Lines changed: 32 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.10.0
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.17.3
87
name: azureresourcegraphs.hub.kalypso.io
98
spec:
109
group: hub.kalypso.io
@@ -22,14 +21,19 @@ spec:
2221
API
2322
properties:
2423
apiVersion:
25-
description: 'APIVersion defines the versioned schema of this representation
26-
of an object. Servers should convert recognized schemas to the latest
27-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
24+
description: |-
25+
APIVersion defines the versioned schema of this representation of an object.
26+
Servers should convert recognized schemas to the latest internal value, and
27+
may reject unrecognized values.
28+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2829
type: string
2930
kind:
30-
description: 'Kind is a string value representing the REST resource this
31-
object represents. Servers may infer this from the endpoint the client
32-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
31+
description: |-
32+
Kind is a string value representing the REST resource this object represents.
33+
Servers may infer this from the endpoint the client submits requests to.
34+
Cannot be updated.
35+
In CamelCase.
36+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3337
type: string
3438
metadata:
3539
type: object
@@ -56,47 +60,39 @@ spec:
5660
description: AzureResourceGraphStatus defines the observed state of AzureResourceGraph
5761
properties:
5862
conditions:
59-
description: 'INSERT ADDITIONAL STATUS FIELD - define observed state
60-
of cluster Important: Run "make" to regenerate code after modifying
61-
this file'
63+
description: |-
64+
INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
65+
Important: Run "make" to regenerate code after modifying this file
6266
items:
63-
description: "Condition contains details for one aspect of the current
64-
state of this API Resource. --- This struct is intended for direct
65-
use as an array at the field path .status.conditions. For example,
66-
\n type FooStatus struct{ // Represents the observations of a
67-
foo's current state. // Known .status.conditions.type are: \"Available\",
68-
\"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
69-
// +listType=map // +listMapKey=type Conditions []metav1.Condition
70-
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
71-
protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
67+
description: Condition contains details for one aspect of the current
68+
state of this API Resource.
7269
properties:
7370
lastTransitionTime:
74-
description: lastTransitionTime is the last time the condition
75-
transitioned from one status to another. This should be when
76-
the underlying condition changed. If that is not known, then
77-
using the time when the API field changed is acceptable.
71+
description: |-
72+
lastTransitionTime is the last time the condition transitioned from one status to another.
73+
This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
7874
format: date-time
7975
type: string
8076
message:
81-
description: message is a human readable message indicating
82-
details about the transition. This may be an empty string.
77+
description: |-
78+
message is a human readable message indicating details about the transition.
79+
This may be an empty string.
8380
maxLength: 32768
8481
type: string
8582
observedGeneration:
86-
description: observedGeneration represents the .metadata.generation
87-
that the condition was set based upon. For instance, if .metadata.generation
88-
is currently 12, but the .status.conditions[x].observedGeneration
89-
is 9, the condition is out of date with respect to the current
90-
state of the instance.
83+
description: |-
84+
observedGeneration represents the .metadata.generation that the condition was set based upon.
85+
For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
86+
with respect to the current state of the instance.
9187
format: int64
9288
minimum: 0
9389
type: integer
9490
reason:
95-
description: reason contains a programmatic identifier indicating
96-
the reason for the condition's last transition. Producers
97-
of specific condition types may define expected values and
98-
meanings for this field, and whether the values are considered
99-
a guaranteed API. The value should be a CamelCase string.
91+
description: |-
92+
reason contains a programmatic identifier indicating the reason for the condition's last transition.
93+
Producers of specific condition types may define expected values and meanings for this field,
94+
and whether the values are considered a guaranteed API.
95+
The value should be a CamelCase string.
10096
This field may not be empty.
10197
maxLength: 1024
10298
minLength: 1
@@ -111,10 +107,6 @@ spec:
111107
type: string
112108
type:
113109
description: type of condition in CamelCase or in foo.example.com/CamelCase.
114-
--- Many .condition.type values are consistent across resources
115-
like Available, but because arbitrary conditions can be useful
116-
(see .node.status.conditions), the ability to deconflict is
117-
important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
118110
maxLength: 316
119111
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
120112
type: string

‎config/crd/bases/hub.kalypso.io_deploymentdescriptors.yaml‎

Lines changed: 31 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.10.0
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.17.3
87
name: deploymentdescriptors.hub.kalypso.io
98
spec:
109
group: hub.kalypso.io
@@ -22,14 +21,19 @@ spec:
2221
API
2322
properties:
2423
apiVersion:
25-
description: 'APIVersion defines the versioned schema of this representation
26-
of an object. Servers should convert recognized schemas to the latest
27-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
24+
description: |-
25+
APIVersion defines the versioned schema of this representation of an object.
26+
Servers should convert recognized schemas to the latest internal value, and
27+
may reject unrecognized values.
28+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2829
type: string
2930
kind:
30-
description: 'Kind is a string value representing the REST resource this
31-
object represents. Servers may infer this from the endpoint the client
32-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
31+
description: |-
32+
Kind is a string value representing the REST resource this object represents.
33+
Servers may infer this from the endpoint the client submits requests to.
34+
Cannot be updated.
35+
In CamelCase.
36+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3337
type: string
3438
metadata:
3539
type: object
@@ -136,43 +140,35 @@ spec:
136140
properties:
137141
conditions:
138142
items:
139-
description: "Condition contains details for one aspect of the current
140-
state of this API Resource. --- This struct is intended for direct
141-
use as an array at the field path .status.conditions. For example,
142-
\n type FooStatus struct{ // Represents the observations of a
143-
foo's current state. // Known .status.conditions.type are: \"Available\",
144-
\"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
145-
// +listType=map // +listMapKey=type Conditions []metav1.Condition
146-
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
147-
protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
143+
description: Condition contains details for one aspect of the current
144+
state of this API Resource.
148145
properties:
149146
lastTransitionTime:
150-
description: lastTransitionTime is the last time the condition
151-
transitioned from one status to another. This should be when
152-
the underlying condition changed. If that is not known, then
153-
using the time when the API field changed is acceptable.
147+
description: |-
148+
lastTransitionTime is the last time the condition transitioned from one status to another.
149+
This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
154150
format: date-time
155151
type: string
156152
message:
157-
description: message is a human readable message indicating
158-
details about the transition. This may be an empty string.
153+
description: |-
154+
message is a human readable message indicating details about the transition.
155+
This may be an empty string.
159156
maxLength: 32768
160157
type: string
161158
observedGeneration:
162-
description: observedGeneration represents the .metadata.generation
163-
that the condition was set based upon. For instance, if .metadata.generation
164-
is currently 12, but the .status.conditions[x].observedGeneration
165-
is 9, the condition is out of date with respect to the current
166-
state of the instance.
159+
description: |-
160+
observedGeneration represents the .metadata.generation that the condition was set based upon.
161+
For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
162+
with respect to the current state of the instance.
167163
format: int64
168164
minimum: 0
169165
type: integer
170166
reason:
171-
description: reason contains a programmatic identifier indicating
172-
the reason for the condition's last transition. Producers
173-
of specific condition types may define expected values and
174-
meanings for this field, and whether the values are considered
175-
a guaranteed API. The value should be a CamelCase string.
167+
description: |-
168+
reason contains a programmatic identifier indicating the reason for the condition's last transition.
169+
Producers of specific condition types may define expected values and meanings for this field,
170+
and whether the values are considered a guaranteed API.
171+
The value should be a CamelCase string.
176172
This field may not be empty.
177173
maxLength: 1024
178174
minLength: 1
@@ -187,10 +183,6 @@ spec:
187183
type: string
188184
type:
189185
description: type of condition in CamelCase or in foo.example.com/CamelCase.
190-
--- Many .condition.type values are consistent across resources
191-
like Available, but because arbitrary conditions can be useful
192-
(see .node.status.conditions), the ability to deconflict is
193-
important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
194186
maxLength: 316
195187
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
196188
type: string
@@ -202,6 +194,8 @@ spec:
202194
- type
203195
type: object
204196
type: array
197+
gitOpsCommitId:
198+
type: string
205199
type: object
206200
type: object
207201
served: true

0 commit comments

Comments
 (0)