Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed missed variable name changes from move to operator #559

Merged
merged 3 commits into from
Jul 11, 2019
Merged
Show file tree
Hide file tree
Changes from 2 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
2 changes: 1 addition & 1 deletion pkg/controller/planexecution/planexecution_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ func (r *ReconcilePlanExecution) Reconcile(request reconcile.Request) (reconcile
// Fetch OperatorVersion:
//
// - Get the task name from the step
// - Get the task definition from the FV
// - Get the task definition from the OV
// - Create the kustomize templates
// - Apply
configs["PlanName"] = planExecution.Spec.PlanName
Expand Down
12 changes: 6 additions & 6 deletions pkg/kudoctl/cmd/install/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -226,21 +226,21 @@ func versionExists(versions []string, currentVersion string) bool {

// installSingleOperatorToCluster installs a given Operator to the cluster
// TODO: needs testing
func installSingleOperatorToCluster(name, namespace string, f *v1alpha1.Operator, kc *kudo.Client) error {
if _, err := kc.InstallOperatorObjToCluster(f, namespace); err != nil {
func installSingleOperatorToCluster(name, namespace string, o *v1alpha1.Operator, kc *kudo.Client) error {
if _, err := kc.InstallOperatorObjToCluster(o, namespace); err != nil {
return errors.Wrapf(err, "installing %s-operator.yaml", name)
}
fmt.Printf("operator.%s/%s created\n", f.APIVersion, f.Name)
fmt.Printf("operator.%s/%s created\n", o.APIVersion, o.Name)
return nil
}

// installSingleOperatorVersionToCluster installs a given OperatorVersion to the cluster
// TODO: needs testing
func installSingleOperatorVersionToCluster(name, namespace string, kc *kudo.Client, fv *v1alpha1.OperatorVersion) error {
if _, err := kc.InstallOperatorVersionObjToCluster(fv, namespace); err != nil {
func installSingleOperatorVersionToCluster(name, namespace string, kc *kudo.Client, ov *v1alpha1.OperatorVersion) error {
if _, err := kc.InstallOperatorVersionObjToCluster(ov, namespace); err != nil {
return errors.Wrapf(err, "installing %s-operatorversion.yaml", name)
}
fmt.Printf("operatorversion.%s/%s created\n", fv.APIVersion, fv.Name)
fmt.Printf("operatorversion.%s/%s created\n", ov.APIVersion, ov.Name)
return nil
}

Expand Down
6 changes: 3 additions & 3 deletions pkg/kudoctl/util/kudo/kudo.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ func (c *Client) InstanceExistsInCluster(name, namespace, version, instanceName
}
}

// No instance exist with this name and FV exists
// No instance exist with this name and OV exists
if i == 0 {
return false, nil
}
Expand All @@ -115,13 +115,13 @@ func (c *Client) InstanceExistsInCluster(name, namespace, version, instanceName

// OperatorVersionsInstalled lists all the versions of given operator installed in the cluster in given ns
func (c *Client) OperatorVersionsInstalled(operatorName, namespace string) ([]string, error) {
fv, err := c.clientset.KudoV1alpha1().OperatorVersions(namespace).List(v1.ListOptions{})
ov, err := c.clientset.KudoV1alpha1().OperatorVersions(namespace).List(v1.ListOptions{})
if err != nil {
return nil, err
}
existingVersions := []string{}

for _, v := range fv.Items {
for _, v := range ov.Items {
if strings.HasPrefix(v.Name, operatorName) {
existingVersions = append(existingVersions, v.Spec.Version)
}
Expand Down
6 changes: 3 additions & 3 deletions pkg/kudoctl/util/repo/repo_operator.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,10 @@ func (r *OperatorRepository) GetBundle(name string, version string) (bundle.Bund

// GetOperatorVersionDependencies helper method returns a slice of strings that contains the names of all
// dependency Operators
func GetOperatorVersionDependencies(fv *v1alpha1.OperatorVersion) ([]string, error) {
func GetOperatorVersionDependencies(ov *v1alpha1.OperatorVersion) ([]string, error) {
var dependencyOperators []string
if fv.Spec.Dependencies != nil {
for _, v := range fv.Spec.Dependencies {
if ov.Spec.Dependencies != nil {
for _, v := range ov.Spec.Dependencies {
dependencyOperators = append(dependencyOperators, v.Name)
}
}
Expand Down