Skip to content

scaffolded OperatorConfig API #1027

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.

Sign up for GitHub

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

Merged
ibm-ci-bot merged 3 commits into from
Mar 28, 2024
Merged

scaffolded OperatorConfig API #1027

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66682b8
scaffolded OperatorConfig API
bitscuit Mar 20, 2024
7b31fec
changed operatorconfig controller to use NewODLMOperator type
bitscuit Mar 27, 2024
e44d839
renamed operatorconfig reconciler to just Reconciler
bitscuit Mar 27, 2024
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
Prev Previous commit
Next Next commit
changed operatorconfig controller to use NewODLMOperator type 
Signed-off-by: Henry H Li <[email protected]>
  • Loading branch information
@bitscuit
bitscuit committed Mar 27, 2024
commit 7b31fecd5fc82b3d00dc75da48d5239dd67d6eb2
8 changes: 3 additions & 5 deletions controllers/operatorconfig_controller.go → ...eratorconfig/operatorconfig_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,21 @@
// limitations under the License.
//

package controllers
package operatorconfig

import (
"context"

"k8s.io/apimachinery/pkg/runtime"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/log"

operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1"
deploy "github.com/IBM/operand-deployment-lifecycle-manager/controllers/operator"
)

// OperatorConfigReconciler reconciles a OperatorConfig object
type OperatorConfigReconciler struct {
client.Client
Scheme *runtime.Scheme
*deploy.ODLMOperator
}

//+kubebuilder:rbac:groups=operator.ibm.com,resources=operatorconfigs,verbs=get;list;watch;create;update;patch;delete
Expand Down
2 changes: 1 addition & 1 deletion controllers/suite_test.go → ...eratorconfig/operatorconfig_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
// limitations under the License.
//

package controllers
package operatorconfig

import (
"path/filepath"
Expand Down
7 changes: 3 additions & 4 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ import (
nssv1 "github.com/IBM/ibm-namespace-scope-operator/api/v1"

operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/constant"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/k8sutil"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/namespacescope"
Expand All @@ -50,6 +49,7 @@ import (
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/operandrequest"
deploy "github.com/IBM/operand-deployment-lifecycle-manager/controllers/operator"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/operatorchecker"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/operatorconfig"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/util"
// +kubebuilder:scaffold:imports
)
Expand Down Expand Up @@ -167,9 +167,8 @@ func main() {
}
}
}
if err = (&controllers.OperatorConfigReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
if err = (&operatorconfig.OperatorConfigReconciler{
ODLMOperator: deploy.NewODLMOperator(mgr, "OperatorConfig"),
}).SetupWithManager(mgr); err != nil {
klog.Error(err, "unable to create controller", "controller", "OperatorConfig")
os.Exit(1)
Expand Down