Skip to content
This repository was archived by the owner on Oct 7, 2020. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/mesh/testdata/operator/output/operator-init.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
---
Expand Down
4 changes: 2 additions & 2 deletions cmd/mesh/testdata/operator/output/operator-remove.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
---
Expand Down
4 changes: 2 additions & 2 deletions data/operator/templates/crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
---
2 changes: 1 addition & 1 deletion deploy/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/istio/v1alpha1/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion pkg/apis/istio/v1alpha1/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/istiocontrolplane/inputs.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/name/name.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkg/vfs/assets.gen.go

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

2 changes: 1 addition & 1 deletion tests/e2e/e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down