forked from openshift-service-mesh/sail-operator
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* upstream/main: (29 commits) Revision Tag Support (istio-ecosystem#413) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#497) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#495) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#492) Update e2e Documentation with env var to set sample yaml files (istio-ecosystem#487) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#490) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#489) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#488) Centralize the way the sample apps yaml are being set to be deployed (istio-ecosystem#483) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#485) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#484) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#482) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#480) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#479) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#478) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#477) Bump github.com/docker/docker in the go_modules group across 1 directory (istio-ecosystem#271) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#476) Add 1.24.0 (istio-ecosystem#474) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#475) ... # Conflicts: # api/v1alpha1/remoteistio_types.go # bundle/manifests/sailoperator.io_remoteistios.yaml # chart/crds/sailoperator.io_remoteistios.yaml # resources/latest/charts/base/Chart.yaml # resources/latest/charts/base/files/crd-all.gen.yaml # resources/latest/charts/base/values.yaml # resources/latest/charts/cni/Chart.yaml # resources/latest/charts/cni/templates/configmap-cni.yaml # resources/latest/charts/cni/templates/daemonset.yaml # resources/latest/charts/cni/values.yaml # resources/latest/charts/gateway/Chart.yaml # resources/latest/charts/istiod/Chart.yaml # resources/latest/charts/istiod/files/injection-template.yaml # resources/latest/charts/istiod/files/waypoint.yaml # resources/latest/charts/istiod/templates/serviceaccount.yaml # resources/latest/charts/istiod/values.yaml # resources/latest/charts/ztunnel/Chart.yaml # resources/latest/charts/ztunnel/templates/daemonset.yaml # resources/latest/charts/ztunnel/templates/rbac.yaml # resources/latest/charts/ztunnel/values.yaml # resources/latest/profiles/default.yaml # resources/v1.24.0/charts/base/files/profile-compatibility-version-1.21.yaml # resources/v1.24.0/charts/cni/files/profile-compatibility-version-1.21.yaml # resources/v1.24.0/charts/gateway/files/profile-compatibility-version-1.21.yaml # resources/v1.24.0/charts/istiod/files/profile-compatibility-version-1.21.yaml # resources/v1.24.0/charts/ztunnel/files/profile-compatibility-version-1.21.yaml
- Loading branch information
Showing
113 changed files
with
4,126 additions
and
2,123 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,204 @@ | ||
| // Copyright Istio Authors | ||
| // | ||
| // 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 ( | ||
| "time" | ||
|
|
||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| ) | ||
|
|
||
| const ( | ||
| IstioRevisionTagKind = "IstioRevisionTag" | ||
| DefaultRevisionTag = "default" | ||
| ) | ||
|
|
||
| // IstioRevisionTagSpec defines the desired state of IstioRevisionTag | ||
| type IstioRevisionTagSpec struct { | ||
| // +kubebuilder:validation:Required | ||
| TargetRef IstioRevisionTagTargetReference `json:"targetRef"` | ||
| } | ||
|
|
||
| // IstioRevisionTagTargetReference can reference either Istio or IstioRevision objects in the cluster. | ||
| type IstioRevisionTagTargetReference struct { | ||
| // Kind is the kind of the target resource. | ||
| // | ||
| // +kubebuilder:validation:MinLength=1 | ||
| // +kubebuilder:validation:MaxLength=253 | ||
| // +kubebuilder:validation:Required | ||
| Kind string `json:"kind"` | ||
|
|
||
| // Name is the name of the target resource. | ||
| // | ||
| // +kubebuilder:validation:MinLength=1 | ||
| // +kubebuilder:validation:MaxLength=253 | ||
| // +kubebuilder:validation:Required | ||
| Name string `json:"name"` | ||
| } | ||
|
|
||
| // IstioRevisionStatus defines the observed state of IstioRevision | ||
| type IstioRevisionTagStatus struct { | ||
| // ObservedGeneration is the most recent generation observed for this | ||
| // IstioRevisionTag object. It corresponds to the object's generation, which is | ||
| // updated on mutation by the API Server. The information in the status | ||
| // pertains to this particular generation of the object. | ||
| ObservedGeneration int64 `json:"observedGeneration,omitempty"` | ||
|
|
||
| // Represents the latest available observations of the object's current state. | ||
| Conditions []IstioRevisionTagCondition `json:"conditions,omitempty"` | ||
|
|
||
| // Reports the current state of the object. | ||
| State IstioRevisionTagConditionReason `json:"state,omitempty"` | ||
|
|
||
| // IstiodNamespace stores the namespace of the corresponding Istiod instance | ||
| IstiodNamespace string `json:"istiodNamespace"` | ||
|
|
||
| // IstioRevision stores the name of the referenced IstioRevision | ||
| IstioRevision string `json:"istioRevision"` | ||
| } | ||
|
|
||
| // GetCondition returns the condition of the specified type | ||
| func (s *IstioRevisionTagStatus) GetCondition(conditionType IstioRevisionTagConditionType) IstioRevisionTagCondition { | ||
| if s != nil { | ||
| for i := range s.Conditions { | ||
| if s.Conditions[i].Type == conditionType { | ||
| return s.Conditions[i] | ||
| } | ||
| } | ||
| } | ||
| return IstioRevisionTagCondition{Type: conditionType, Status: metav1.ConditionUnknown} | ||
| } | ||
|
|
||
| // SetCondition sets a specific condition in the list of conditions | ||
| func (s *IstioRevisionTagStatus) SetCondition(condition IstioRevisionTagCondition) { | ||
| var now time.Time | ||
| if testTime == nil { | ||
| now = time.Now() | ||
| } else { | ||
| now = *testTime | ||
| } | ||
|
|
||
| // The lastTransitionTime only gets serialized out to the second. This can | ||
| // break update skipping, as the time in the resource returned from the client | ||
| // may not match the time in our cached status during a reconcile. We truncate | ||
| // here to save any problems down the line. | ||
| lastTransitionTime := metav1.NewTime(now.Truncate(time.Second)) | ||
|
|
||
| for i, prevCondition := range s.Conditions { | ||
| if prevCondition.Type == condition.Type { | ||
| if prevCondition.Status != condition.Status { | ||
| condition.LastTransitionTime = lastTransitionTime | ||
| } else { | ||
| condition.LastTransitionTime = prevCondition.LastTransitionTime | ||
| } | ||
| s.Conditions[i] = condition | ||
| return | ||
| } | ||
| } | ||
|
|
||
| // If the condition does not exist, initialize the lastTransitionTime | ||
| condition.LastTransitionTime = lastTransitionTime | ||
| s.Conditions = append(s.Conditions, condition) | ||
| } | ||
|
|
||
| // IstioRevisionCondition represents a specific observation of the IstioRevision object's state. | ||
| type IstioRevisionTagCondition struct { | ||
| // The type of this condition. | ||
| Type IstioRevisionTagConditionType `json:"type,omitempty"` | ||
|
|
||
| // The status of this condition. Can be True, False or Unknown. | ||
| Status metav1.ConditionStatus `json:"status,omitempty"` | ||
|
|
||
| // Unique, single-word, CamelCase reason for the condition's last transition. | ||
| Reason IstioRevisionTagConditionReason `json:"reason,omitempty"` | ||
|
|
||
| // Human-readable message indicating details about the last transition. | ||
| Message string `json:"message,omitempty"` | ||
|
|
||
| // Last time the condition transitioned from one status to another. | ||
| LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"` | ||
| } | ||
|
|
||
| // IstioRevisionConditionType represents the type of the condition. Condition stages are: | ||
| // Installed, Reconciled, Ready | ||
| type IstioRevisionTagConditionType string | ||
|
|
||
| // IstioRevisionConditionReason represents a short message indicating how the condition came | ||
| // to be in its present state. | ||
| type IstioRevisionTagConditionReason string | ||
|
|
||
| const ( | ||
| // IstioRevisionConditionReconciled signifies whether the controller has | ||
| // successfully reconciled the resources defined through the CR. | ||
| IstioRevisionTagConditionReconciled IstioRevisionTagConditionType = "Reconciled" | ||
|
|
||
| // IstioRevisionTagNameAlreadyExists indicates that the a revision with the same name as the IstioRevisionTag already exists. | ||
| IstioRevisionTagReasonNameAlreadyExists IstioRevisionTagConditionReason = "NameAlreadyExists" | ||
|
|
||
| // IstioRevisionTagReasonReferenceNotFound indicates that the resource referenced by the tag's TargetRef was not found | ||
| IstioRevisionTagReasonReferenceNotFound IstioRevisionTagConditionReason = "RefNotFound" | ||
|
|
||
| // IstioRevisionReasonReconcileError indicates that the reconciliation of the resource has failed, but will be retried. | ||
| IstioRevisionTagReasonReconcileError IstioRevisionTagConditionReason = "ReconcileError" | ||
| ) | ||
|
|
||
| const ( | ||
| // IstioRevisionConditionInUse signifies whether any workload is configured to use the revision. | ||
| IstioRevisionTagConditionInUse IstioRevisionTagConditionType = "InUse" | ||
|
|
||
| // IstioRevisionReasonReferencedByWorkloads indicates that the revision is referenced by at least one pod or namespace. | ||
| IstioRevisionTagReasonReferencedByWorkloads IstioRevisionTagConditionReason = "ReferencedByWorkloads" | ||
|
|
||
| // IstioRevisionReasonNotReferenced indicates that the revision is not referenced by any pod or namespace. | ||
| IstioRevisionTagReasonNotReferenced IstioRevisionTagConditionReason = "NotReferencedByAnything" | ||
|
|
||
| // IstioRevisionReasonUsageCheckFailed indicates that the operator could not check whether any workloads use the revision. | ||
| IstioRevisionTagReasonUsageCheckFailed IstioRevisionTagConditionReason = "UsageCheckFailed" | ||
| ) | ||
|
|
||
| const ( | ||
| // IstioRevisionTagReasonHealthy indicates that the revision tag has been successfully reconciled and is in use. | ||
| IstioRevisionTagReasonHealthy IstioRevisionTagConditionReason = "Healthy" | ||
| ) | ||
|
|
||
| // +kubebuilder:object:root=true | ||
| // +kubebuilder:resource:scope=Cluster,shortName=istiorevtag,categories=istio-io | ||
| // +kubebuilder:subresource:status | ||
| // +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.state",description="The current state of this object." | ||
| // +kubebuilder:printcolumn:name="In use",type="string",JSONPath=".status.conditions[?(@.type==\"InUse\")].status",description="Whether the tag is being used by workloads." | ||
| // +kubebuilder:printcolumn:name="Revision",type="string",JSONPath=".status.istioRevision",description="The IstioRevision this object is referencing." | ||
| // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="The age of the object" | ||
|
|
||
| // IstioRevisionTag references a Istio or IstioRevision object and serves as an alias for sidecar injection. | ||
| type IstioRevisionTag struct { | ||
| metav1.TypeMeta `json:",inline"` | ||
| metav1.ObjectMeta `json:"metadata,omitempty"` | ||
|
|
||
| Spec IstioRevisionTagSpec `json:"spec,omitempty"` | ||
| Status IstioRevisionTagStatus `json:"status,omitempty"` | ||
| } | ||
|
|
||
| // +kubebuilder:object:root=true | ||
|
|
||
| // IstioRevisionList contains a list of IstioRevision | ||
| type IstioRevisionTagList struct { | ||
| metav1.TypeMeta `json:",inline"` | ||
| metav1.ListMeta `json:"metadata,omitempty"` | ||
| Items []IstioRevisionTag `json:"items"` | ||
| } | ||
|
|
||
| func init() { | ||
| SchemeBuilder.Register(&IstioRevisionTag{}, &IstioRevisionTagList{}) | ||
| } |
Oops, something went wrong.