-
Notifications
You must be signed in to change notification settings - Fork 93
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add update command + config parameters for operatorui and operatorapi
Signed-off-by: dviejokfs <dviejo@kungfusoftware.es>
- Loading branch information
Showing
13 changed files
with
314 additions
and
16 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
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 |
|---|---|---|
|
|
@@ -11,6 +11,9 @@ image: | |
| tag: "" | ||
|
|
||
|
|
||
| auth: | ||
| oidcJWKS: "" | ||
| oidcIssuer: "" | ||
|
|
||
| hlf: | ||
| mspID: "" | ||
|
|
||
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
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,131 @@ | ||
| package operatorapi | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "github.com/kfsoftware/hlf-operator/api/hlf.kungfusoftware.es/v1alpha1" | ||
| "github.com/kfsoftware/hlf-operator/kubectl-hlf/cmd/helpers" | ||
| "github.com/pkg/errors" | ||
| log "github.com/sirupsen/logrus" | ||
| "github.com/spf13/cobra" | ||
| "io" | ||
| "k8s.io/api/networking/v1beta1" | ||
| v1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| ) | ||
|
|
||
| type updateCmd struct { | ||
| out io.Writer | ||
| errOut io.Writer | ||
| apiOpts Options | ||
| } | ||
|
|
||
| func (c *updateCmd) validate() error { | ||
| return c.apiOpts.Validate() | ||
| } | ||
| func (c *updateCmd) run() error { | ||
| oclient, err := helpers.GetKubeOperatorClient() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| hosts := []v1alpha1.IngressHost{} | ||
| for _, host := range c.apiOpts.Hosts { | ||
| hosts = append(hosts, v1alpha1.IngressHost{ | ||
| Paths: []v1alpha1.IngressPath{ | ||
| { | ||
| Path: "/", | ||
| PathType: "Prefix", | ||
| }, | ||
| }, | ||
| Host: host, | ||
| }) | ||
| } | ||
| ingress := v1alpha1.Ingress{ | ||
| Enabled: true, | ||
| ClassName: "", | ||
| Annotations: map[string]string{ | ||
| "kubernetes.io/ingress.class": c.apiOpts.IngressClassName, | ||
| }, | ||
| TLS: []v1beta1.IngressTLS{}, | ||
| Hosts: hosts, | ||
| } | ||
| if c.apiOpts.TLSSecretName != "" { | ||
| ingress.TLS = []v1beta1.IngressTLS{ | ||
| { | ||
| Hosts: c.apiOpts.Hosts, | ||
| SecretName: c.apiOpts.TLSSecretName, | ||
| }, | ||
| } | ||
| } | ||
| config := v1alpha1.FabricOperatorAPIHLFConfig{ | ||
| MSPID: c.apiOpts.MSPID, | ||
| User: c.apiOpts.User, | ||
| NetworkConfig: v1alpha1.FabricOperatorAPINetworkConfig{ | ||
| SecretName: c.apiOpts.HLFSecretName, | ||
| Key: c.apiOpts.HLFKey, | ||
| }, | ||
| } | ||
| auth := &v1alpha1.FabricOperatorAPIAuth{ | ||
| OIDCJWKS: c.apiOpts.OIDCJWKS, | ||
| OIDCIssuer: c.apiOpts.OIDCIssuer, | ||
| } | ||
| ctx := context.Background() | ||
| fabricAPI, err := oclient.HlfV1alpha1().FabricOperatorAPIs(c.apiOpts.NS).Get(ctx, c.apiOpts.Name, v1.GetOptions{}) | ||
| if err != nil { | ||
| return errors.Wrapf(err, "failed to get Fabric Operator UI %s", c.apiOpts.Name) | ||
| } | ||
| fabricAPI.Spec.Ingress = ingress | ||
| fabricAPI.Spec.Image = c.apiOpts.Image | ||
| fabricAPI.Spec.Tag = c.apiOpts.Version | ||
| fabricAPI.Spec.HLFConfig = config | ||
| fabricAPI.Spec.Auth = auth | ||
| fabricAPI.Spec.Replicas = c.apiOpts.Replicas | ||
| if c.apiOpts.Output { | ||
| ot, err := helpers.MarshallWithoutStatus(&fabricAPI) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| fmt.Println(string(ot)) | ||
| } else { | ||
| ctx := context.Background() | ||
| _, err = oclient.HlfV1alpha1().FabricOperatorAPIs(c.apiOpts.NS).Update( | ||
| ctx, | ||
| fabricAPI, | ||
| v1.UpdateOptions{}, | ||
| ) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| log.Infof("Operator API %s created on namespace %s", fabricAPI.Name, fabricAPI.Namespace) | ||
| } | ||
| return nil | ||
| } | ||
| func newUpdateOperatorAPICmd(out io.Writer, errOut io.Writer) *cobra.Command { | ||
| c := updateCmd{out: out, errOut: errOut} | ||
| cmd := &cobra.Command{ | ||
| Use: "update", | ||
| Short: "Update a Operator API", | ||
| RunE: func(cmd *cobra.Command, args []string) error { | ||
| if err := c.validate(); err != nil { | ||
| return err | ||
| } | ||
| return c.run() | ||
| }, | ||
| } | ||
| f := cmd.Flags() | ||
| f.StringVar(&c.apiOpts.Name, "name", "", "Name of the Operator API to update") | ||
| f.StringVarP(&c.apiOpts.NS, "namespace", "n", helpers.DefaultNamespace, "Namespace scope for this request") | ||
| f.StringVarP(&c.apiOpts.Image, "image", "", helpers.DefaultOperationsOperatorAPIImage, "Image of the Operator API") | ||
| f.StringVarP(&c.apiOpts.Version, "version", "", helpers.DefaultOperationsOperatorAPIVersion, "Version of the Operator API") | ||
| f.StringVarP(&c.apiOpts.TLSSecretName, "tls-secret-name", "", "", "TLS Secret for the Operator API") | ||
| f.StringVarP(&c.apiOpts.IngressClassName, "ingress-class-name", "", "istio", "Ingress class name") | ||
| f.StringVarP(&c.apiOpts.MSPID, "hlf-mspid", "", "", "HLF Network Config MSPID") | ||
| f.StringVarP(&c.apiOpts.User, "hlf-user", "", "", "HLF Network Config User") | ||
| f.IntVarP(&c.apiOpts.Replicas, "replicas", "", 1, "Number of replicas of the Operator UI") | ||
| f.StringVarP(&c.apiOpts.HLFSecretName, "hlf-secret", "", "", "HLF Network Config Secret name") | ||
| f.StringVarP(&c.apiOpts.HLFKey, "hlf-secret-key", "", "", "HLF Network Config Secret key") | ||
| f.StringVarP(&c.apiOpts.OIDCJWKS, "oidc-jwks", "", "", "OIDC JWKS URL") | ||
| f.StringVarP(&c.apiOpts.OIDCIssuer, "oidc-issuer", "", "", "OIDC Issuer URL") | ||
| f.StringArrayVarP(&c.apiOpts.Hosts, "hosts", "", []string{}, "External hosts") | ||
| f.BoolVarP(&c.apiOpts.Output, "output", "o", false, "Output in yaml") | ||
| return cmd | ||
| } |
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
Oops, something went wrong.