Skip to content

Commit

Permalink
[release-1.0] Bump CRDs to v1 (#588)
Browse files Browse the repository at this point in the history
Bumps Istio, IstioRevision, IstioCNI and IstioRevisionTag to v1

Manual cherry-pick of #586

Signed-off-by: Daniel Grimm <[email protected]>
  • Loading branch information
dgn authored Jan 27, 2025
1 parent 7a71088 commit c9d9284
Show file tree
Hide file tree
Showing 125 changed files with 6,602 additions and 9,719 deletions.
16 changes: 8 additions & 8 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -17,32 +17,32 @@ resources:
controller: true
domain: sailoperator.io
kind: Istio
path: github.com/istio-ecosystem/sail-operator/api/v1alpha1
version: v1alpha1
path: github.com/istio-ecosystem/sail-operator/api/v1
version: v1
- api:
crdVersion: v1
namespaced: false
controller: true
domain: sailoperator.io
kind: IstioRevision
path: github.com/istio-ecosystem/sail-operator/api/v1alpha1
version: v1alpha1
path: github.com/istio-ecosystem/sail-operator/api/v1
version: v1
- api:
crdVersion: v1
namespaced: false
controller: true
domain: sailoperator.io
kind: IstioRevisionTag
path: github.com/istio-ecosystem/sail-operator/api/v1alpha1
version: v1alpha1
path: github.com/istio-ecosystem/sail-operator/api/v1
version: v1
- api:
crdVersion: v1
namespaced: false
controller: true
domain: sailoperator.io
kind: IstioCNI
path: github.com/istio-ecosystem/sail-operator/api/v1alpha1
version: v1alpha1
path: github.com/istio-ecosystem/sail-operator/api/v1
version: v1
- api:
crdVersion: v1
namespaced: false
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ This document aims to provide an overview of the project and some information fo
You manage your control plane through an `Istio` resource.

```yaml
apiVersion: sailoperator.io/v1alpha1
apiVersion: sailoperator.io/v1
kind: Istio
metadata:
name: example
Expand All @@ -44,7 +44,7 @@ spec:
When you create an `Istio` resource, the sail operator then creates an `IstioRevision` that represents a control plane deployment.

```yaml
apiVersion: sailoperator.io/v1alpha1
apiVersion: sailoperator.io/v1
kind: IstioRevision
metadata:
name: example
Expand All @@ -60,7 +60,7 @@ status:
You can customize your control plane installation through the `Istio` resource using Istio's `Helm` configuration values:

```yaml
apiVersion: sailoperator.io/v1alpha1
apiVersion: sailoperator.io/v1
kind: Istio
metadata:
name: example
Expand Down
22 changes: 22 additions & 0 deletions api/v1/common.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// 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 v1

import (
"time"
)

// testTime is only in unit tests to pin the time to a fixed value
var testTime *time.Time
34 changes: 34 additions & 0 deletions api/v1/groupversion_info.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
// 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 v1 contains API Schema definitions for the sailoperator.io v1 API group
// +kubebuilder:object:generate=true
// +groupName=sailoperator.io
package v1

import (
"k8s.io/apimachinery/pkg/runtime/schema"
"sigs.k8s.io/controller-runtime/pkg/scheme"
)

var (
// GroupVersion is group version used to register these objects
GroupVersion = schema.GroupVersion{Group: "sailoperator.io", Version: "v1"}

// SchemeBuilder is used to add go types to the GroupVersionKind scheme
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

// AddToScheme adds the types in this group-version to the given scheme.
AddToScheme = SchemeBuilder.AddToScheme
)
2 changes: 1 addition & 1 deletion api/v1alpha1/istio_types.go → api/v1/istio_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package v1alpha1
package v1

import (
"time"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package v1alpha1
package v1

import (
"time"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package v1alpha1
package v1

import (
"time"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package v1alpha1
package v1

import (
"reflect"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package v1alpha1
package v1

import (
"time"
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package v1alpha1
package v1

import (
k8sv1 "k8s.io/api/core/v1"
Expand Down
Loading

0 comments on commit c9d9284

Please sign in to comment.