diff --git a/cmd/mesh/testdata/operator/output/operator-init.yaml b/cmd/mesh/testdata/operator/output/operator-init.yaml index c470974b7..8750dc192 100644 --- a/cmd/mesh/testdata/operator/output/operator-init.yaml +++ b/cmd/mesh/testdata/operator/output/operator-init.yaml @@ -162,11 +162,11 @@ spec: status: description: 'Status describes each of istio control plane component status at the current time. 0 means NONE, 1 means UPDATING, 2 means HEALTHY, 3 means ERROR, 4 means RECONCILING. - More info: https://github.com/istio/operator/blob/master/pkg/apis/istio/v1alpha2/v1alpha2.pb.html & + More info: https://github.com/istio/api/blob/master/operator/v1alpha1/istio.operator.v1alpha1.pb.html & https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status' type: object versions: - - name: v1alpha2 + - name: v1alpha1 served: true storage: true --- diff --git a/cmd/mesh/testdata/operator/output/operator-remove.yaml b/cmd/mesh/testdata/operator/output/operator-remove.yaml index c470974b7..8750dc192 100644 --- a/cmd/mesh/testdata/operator/output/operator-remove.yaml +++ b/cmd/mesh/testdata/operator/output/operator-remove.yaml @@ -162,11 +162,11 @@ spec: status: description: 'Status describes each of istio control plane component status at the current time. 0 means NONE, 1 means UPDATING, 2 means HEALTHY, 3 means ERROR, 4 means RECONCILING. - More info: https://github.com/istio/operator/blob/master/pkg/apis/istio/v1alpha2/v1alpha2.pb.html & + More info: https://github.com/istio/api/blob/master/operator/v1alpha1/istio.operator.v1alpha1.pb.html & https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status' type: object versions: - - name: v1alpha2 + - name: v1alpha1 served: true storage: true --- diff --git a/data/operator/templates/crd.yaml b/data/operator/templates/crd.yaml index ac9f81bfb..7da856f34 100644 --- a/data/operator/templates/crd.yaml +++ b/data/operator/templates/crd.yaml @@ -36,11 +36,11 @@ spec: status: description: 'Status describes each of istio control plane component status at the current time. 0 means NONE, 1 means UPDATING, 2 means HEALTHY, 3 means ERROR, 4 means RECONCILING. - More info: https://github.com/istio/operator/blob/master/pkg/apis/istio/v1alpha2/v1alpha2.pb.html & + More info: https://github.com/istio/api/blob/master/operator/v1alpha1/istio.operator.v1alpha1.pb.html & https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status' type: object versions: - - name: v1alpha2 + - name: v1alpha1 served: true storage: true --- diff --git a/deploy/crds/istio_v1alpha2_istiooperator_cr.yaml b/deploy/crds/istio_v1alpha1_istiooperator_cr.yaml similarity index 100% rename from deploy/crds/istio_v1alpha2_istiooperator_cr.yaml rename to deploy/crds/istio_v1alpha1_istiooperator_cr.yaml diff --git a/deploy/crds/istio_v1alpha2_istiooperator_crd.yaml b/deploy/crds/istio_v1alpha1_istiooperator_crd.yaml similarity index 100% rename from deploy/crds/istio_v1alpha2_istiooperator_crd.yaml rename to deploy/crds/istio_v1alpha1_istiooperator_crd.yaml diff --git a/deploy/kustomization.yaml b/deploy/kustomization.yaml index 6e070118c..233a5bc18 100644 --- a/deploy/kustomization.yaml +++ b/deploy/kustomization.yaml @@ -1,7 +1,7 @@ --- namespace: istio-operator resources: -- crds/istio_v1alpha2_istiooperator_crd.yaml +- crds/istio_v1alpha1_istiooperator_crd.yaml - namespace.yaml - clusterrole.yaml - clusterrole_binding.yaml diff --git a/pkg/apis/istio/v1alpha1/doc.go b/pkg/apis/istio/v1alpha1/doc.go index 944eb009f..49a8765f4 100644 --- a/pkg/apis/istio/v1alpha1/doc.go +++ b/pkg/apis/istio/v1alpha1/doc.go @@ -12,5 +12,5 @@ // See the License for the specific language governing permissions and // limitations under the License. -// Package v1alpha2 contains API Schema definitions for the istio v1alpha2 API group +// Package v1alpha1 contains API Schema definitions for the istio v1alpha1 API group package v1alpha1 diff --git a/pkg/apis/istio/v1alpha1/register.go b/pkg/apis/istio/v1alpha1/register.go index bf642ba1c..893c9aa60 100644 --- a/pkg/apis/istio/v1alpha1/register.go +++ b/pkg/apis/istio/v1alpha1/register.go @@ -14,7 +14,7 @@ // NOTE: Boilerplate only. Ignore this file. -// Package v1alpha2 contains API Schema definitions for the istio v1alpha2 API group +// Package v1alpha1 contains API Schema definitions for the istio v1alpha1 API group // +k8s:deepcopy-gen=package,register // +groupName=install.istio.io package v1alpha1 diff --git a/pkg/controller/istiocontrolplane/inputs.go b/pkg/controller/istiocontrolplane/inputs.go index c903f45a4..987e3cd29 100644 --- a/pkg/controller/istiocontrolplane/inputs.go +++ b/pkg/controller/istiocontrolplane/inputs.go @@ -51,7 +51,7 @@ func init() { } -// IstioRenderingInput is a RenderingInput specific to an v1alpha2 IstioOperator instance. +// IstioRenderingInput is a RenderingInput specific to an v1alpha1 IstioOperator instance. type IstioRenderingInput struct { instance *v1alpha1.IstioOperator crPath string diff --git a/pkg/name/name.go b/pkg/name/name.go index de7018066..335a577d4 100644 --- a/pkg/name/name.go +++ b/pkg/name/name.go @@ -118,7 +118,7 @@ func IsComponentEnabledInSpec(componentName ComponentName, controlPlaneSpec *v1a } componentNode, ok := componentNodeI.(*v1alpha1.BoolValueForPB) if !ok { - return false, fmt.Errorf("component %s enabled has bad type %T, expect *v1alpha2.BoolValueForPB", componentName, componentNodeI) + return false, fmt.Errorf("component %s enabled has bad type %T, expect *v1alpha1.BoolValueForPB", componentName, componentNodeI) } if componentNode == nil { return false, nil diff --git a/pkg/vfs/assets.gen.go b/pkg/vfs/assets.gen.go index c373e8cd8..ca30c8108 100644 --- a/pkg/vfs/assets.gen.go +++ b/pkg/vfs/assets.gen.go @@ -38904,11 +38904,11 @@ spec: status: description: 'Status describes each of istio control plane component status at the current time. 0 means NONE, 1 means UPDATING, 2 means HEALTHY, 3 means ERROR, 4 means RECONCILING. - More info: https://github.com/istio/operator/blob/master/pkg/apis/istio/v1alpha2/v1alpha2.pb.html & + More info: https://github.com/istio/api/blob/master/operator/v1alpha1/istio.operator.v1alpha1.pb.html & https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status' type: object versions: - - name: v1alpha2 + - name: v1alpha1 served: true storage: true --- diff --git a/tests/e2e/e2e.sh b/tests/e2e/e2e.sh index b089d93ef..bbc1db7f2 100755 --- a/tests/e2e/e2e.sh +++ b/tests/e2e/e2e.sh @@ -39,7 +39,7 @@ cat "${ARTIFACTS}"/out/operator.yaml >> "${ARTIFACTS}"/out/deployment.yaml echo "..." >> "${ARTIFACTS}"/out/deployment.yaml # Create an operator manifest from the default control plane configuration -operator_manifest_files=( "deploy/namespace.yaml" "deploy/crds/istio_v1alpha2_istiooperator_crd.yaml" "deploy/service_account.yaml" "deploy/clusterrole.yaml" "deploy/clusterrole_binding.yaml" "deploy/service.yaml" "${ARTIFACTS}/out/deployment.yaml" "deploy/crds/istio_v1alpha2_istiooperator_cr.yaml" ) +operator_manifest_files=( "deploy/namespace.yaml" "deploy/crds/istio_v1alpha1_istiooperator_crd.yaml" "deploy/service_account.yaml" "deploy/clusterrole.yaml" "deploy/clusterrole_binding.yaml" "deploy/service.yaml" "${ARTIFACTS}/out/deployment.yaml" "deploy/crds/istio_v1alpha1_istiooperator_cr.yaml" ) # Generate the main manifest rm -f "${ISTIO_DIR}"/install/kubernetes/istio-operator.yaml