-
Notifications
You must be signed in to change notification settings - Fork 40
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: morvencao <[email protected]>
- Loading branch information
Showing
38 changed files
with
1,667 additions
and
67 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -129,6 +129,38 @@ jobs: | |
| env: | ||
| KUBECONFIG: /home/runner/.kube/config | ||
|
|
||
| e2e-cloudevents: | ||
| name: e2e-cloudevents | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: checkout code | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| fetch-depth: 1 | ||
| path: go/src/open-cluster-management.io/addon-framework | ||
| - name: install Go | ||
| uses: actions/setup-go@v3 | ||
| with: | ||
| go-version: ${{ env.GO_VERSION }} | ||
| - name: install imagebuilder | ||
| run: go install github.com/openshift/imagebuilder/cmd/[email protected] | ||
| - name: addon-examples-image # will build and tag the examples image | ||
| run: imagebuilder --allow-pull -t quay.io/open-cluster-management/addon-examples:latest -t quay.io/ocm/addon-examples:latest -f ./build/Dockerfile.example . | ||
| - name: setup kind | ||
| uses: engineerd/[email protected] | ||
| with: | ||
| version: v0.11.1 | ||
| name: cluster1 | ||
| - name: Load image on the nodes of the cluster | ||
| run: | | ||
| kind load docker-image --name=cluster1 quay.io/open-cluster-management/addon-examples:latest | ||
| kind load docker-image --name=cluster1 quay.io/ocm/addon-examples:latest | ||
| - name: Run e2e test with cloudevents | ||
| run: | | ||
| make test-e2e-cloudevents | ||
| env: | ||
| KUBECONFIG: /home/runner/.kube/config | ||
|
|
||
| e2e-hosted: | ||
| name: e2e-hosted | ||
| runs-on: ubuntu-latest | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "context" | ||
| goflag "flag" | ||
| "fmt" | ||
| "math/rand" | ||
| "os" | ||
| "time" | ||
|
|
||
| "github.com/spf13/cobra" | ||
| "github.com/spf13/pflag" | ||
| utilrand "k8s.io/apimachinery/pkg/util/rand" | ||
| "k8s.io/client-go/rest" | ||
| utilflag "k8s.io/component-base/cli/flag" | ||
| logs "k8s.io/component-base/logs" | ||
| "k8s.io/klog/v2" | ||
| addonv1alpha1client "open-cluster-management.io/api/client/addon/clientset/versioned" | ||
|
|
||
| "open-cluster-management.io/addon-framework/examples/helloworld_agent" | ||
| "open-cluster-management.io/addon-framework/examples/helloworld_cloudevents" | ||
| "open-cluster-management.io/addon-framework/pkg/addonfactory" | ||
| "open-cluster-management.io/addon-framework/pkg/addonmanager" | ||
| cmdfactory "open-cluster-management.io/addon-framework/pkg/cmd/factory" | ||
| "open-cluster-management.io/addon-framework/pkg/utils" | ||
| "open-cluster-management.io/addon-framework/pkg/version" | ||
| ) | ||
|
|
||
| func main() { | ||
| rand.Seed(time.Now().UTC().UnixNano()) | ||
|
|
||
| pflag.CommandLine.SetNormalizeFunc(utilflag.WordSepNormalizeFunc) | ||
| pflag.CommandLine.AddGoFlagSet(goflag.CommandLine) | ||
|
|
||
| logs.AddFlags(pflag.CommandLine) | ||
| logs.InitLogs() | ||
| defer logs.FlushLogs() | ||
|
|
||
| command := newCommand() | ||
| if err := command.Execute(); err != nil { | ||
| fmt.Fprintf(os.Stderr, "%v\n", err) | ||
| os.Exit(1) | ||
| } | ||
| } | ||
|
|
||
| func newCommand() *cobra.Command { | ||
| cmd := &cobra.Command{ | ||
| Use: "addon", | ||
| Short: "helloworld example addon", | ||
| Run: func(cmd *cobra.Command, args []string) { | ||
| if err := cmd.Help(); err != nil { | ||
| fmt.Fprintf(os.Stderr, "%v\n", err) | ||
| } | ||
| os.Exit(1) | ||
| }, | ||
| } | ||
|
|
||
| if v := version.Get().String(); len(v) == 0 { | ||
| cmd.Version = "<unknown>" | ||
| } else { | ||
| cmd.Version = v | ||
| } | ||
|
|
||
| cmd.AddCommand(newControllerCommand()) | ||
| cmd.AddCommand(helloworld_agent.NewAgentCommand(helloworld_cloudevents.AddonName)) | ||
|
|
||
| return cmd | ||
| } | ||
|
|
||
| func newControllerCommand() *cobra.Command { | ||
| o := addonmanager.NewManagerOptions() | ||
| c := &addManagerConfig{managerOptions: o} | ||
| cmd := cmdfactory. | ||
| NewControllerCommandConfig("helloworld-addon-controller", version.Get(), c.runController). | ||
| NewCommand() | ||
| cmd.Use = "controller" | ||
| cmd.Short = "Start the addon controller" | ||
| o.AddFlags(cmd) | ||
|
|
||
| return cmd | ||
| } | ||
|
|
||
| // addManagerConfig holds configuration for addon manager | ||
| type addManagerConfig struct { | ||
| managerOptions *addonmanager.ManagerOptions | ||
| } | ||
|
|
||
| func (c *addManagerConfig) runController(ctx context.Context, kubeConfig *rest.Config) error { | ||
| addonClient, err := addonv1alpha1client.NewForConfig(kubeConfig) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| mgr, err := addonmanager.New(kubeConfig, c.managerOptions) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| registrationOption := helloworld_cloudevents.NewRegistrationOption( | ||
| kubeConfig, | ||
| helloworld_cloudevents.AddonName, | ||
| utilrand.String(5), | ||
| ) | ||
|
|
||
| // Set agent install namespace from addon deployment config if it exists | ||
| registrationOption.AgentInstallNamespace = utils.AgentInstallNamespaceFromDeploymentConfigFunc( | ||
| utils.NewAddOnDeploymentConfigGetter(addonClient), | ||
| ) | ||
|
|
||
| agentAddon, err := addonfactory.NewAgentAddonFactory(helloworld_cloudevents.AddonName, helloworld_cloudevents.FS, "manifests/templates"). | ||
| WithConfigGVRs(utils.AddOnDeploymentConfigGVR). | ||
| WithGetValuesFuncs( | ||
| helloworld_cloudevents.GetDefaultValues, | ||
| addonfactory.GetAddOnDeploymentConfigValues( | ||
| utils.NewAddOnDeploymentConfigGetter(addonClient), | ||
| addonfactory.ToAddOnDeploymentConfigValues, | ||
| addonfactory.ToImageOverrideValuesFunc("Image", helloworld_cloudevents.DefaultImage), | ||
| ), | ||
| ). | ||
| WithAgentRegistrationOption(registrationOption). | ||
| WithAgentInstallNamespace( | ||
| utils.AgentInstallNamespaceFromDeploymentConfigFunc( | ||
| utils.NewAddOnDeploymentConfigGetter(addonClient), | ||
| ), | ||
| ). | ||
| WithAgentHealthProber(helloworld_cloudevents.AgentHealthProber()). | ||
| BuildTemplateAgentAddon() | ||
| if err != nil { | ||
| klog.Errorf("failed to build agent %v", err) | ||
| return err | ||
| } | ||
|
|
||
| err = mgr.AddAgent(agentAddon) | ||
| if err != nil { | ||
| klog.Fatal(err) | ||
| } | ||
|
|
||
| err = mgr.Start(ctx) | ||
| if err != nil { | ||
| klog.Fatal(err) | ||
| } | ||
| <-ctx.Done() | ||
|
|
||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
examples/deploy/addon/helloworld-cloudevents/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| namespace: open-cluster-management | ||
|
|
||
| resources: | ||
| - resources/cluster_role.yaml | ||
| - resources/cluster_role_binding.yaml | ||
| - resources/service_account.yaml | ||
| - resources/managed_clusterset_binding.yaml | ||
| - resources/placement.yaml | ||
| - resources/addon_deployment_config.yaml | ||
| - resources/helloworld_cloudevents_clustermanagementaddon.yaml | ||
| - resources/helloworld_cloudevents_controller.yaml | ||
| - resources/work-driver-config.yaml | ||
|
|
||
| images: | ||
| - name: quay.io/open-cluster-management/addon-examples | ||
| newName: quay.io/open-cluster-management/addon-examples | ||
| newTag: latest | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
|
|
||
| vars: | ||
| - name: EXAMPLE_IMAGE_NAME | ||
| objref: | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| name: helloworldcloudevents-controller | ||
| fieldref: | ||
| fieldpath: spec.template.spec.containers.[name=helloworldcloudevents-controller].image |
6 changes: 6 additions & 0 deletions
6
examples/deploy/addon/helloworld-cloudevents/resources/addon_deployment_config.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| apiVersion: addon.open-cluster-management.io/v1alpha1 | ||
| kind: AddOnDeploymentConfig | ||
| metadata: | ||
| name: global | ||
| spec: | ||
| agentInstallNamespace: open-cluster-management-agent-addon |
Oops, something went wrong.