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

Ensure that created resources are update when needed #576

Merged
merged 5 commits into from
Dec 7, 2021
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
2 changes: 1 addition & 1 deletion cmd/cli/cmd/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func NewInstall() *cobra.Command {
flags.BoolVar(&opts.UpdateHostsFile, "update-hosts-file", true, "Updates /etc/hosts with entry for Capact GraphQL Gateway.")
flags.BoolVar(&opts.UpdateTrustedCerts, "update-trusted-certs", true, "Add Capact GraphQL Gateway certificate.")
flags.StringVar(&opts.Parameters.Override.HelmRepo, "helm-repo", capact.HelmRepoStable, fmt.Sprintf("Capact Helm chart repository location. It can be relative path to current working directory or URL. Use %s tag to select repository which holds the latest Helm chart versions.", capact.LatestVersionTag))
flags.StringVar(&opts.Parameters.ActionCRDLocation, "crd", capact.CRDUrl, "Capact Action CRD location.")
flags.StringVar(&opts.Parameters.ActionCRDLocation, "crd", "", "Overrides the Capact Action CRD location.")
flags.BoolVar(&opts.LocalRegistryEnabled, "enable-registry", false, "If specified, Capact images are pushed to Capact local Docker registry.")
flags.StringSliceVar(&opts.Parameters.Override.CapactStringOverrides, "capact-overrides", []string{}, "Overrides for Capact component.")
flags.StringSliceVar(&opts.Parameters.Override.IngressStringOverrides, "ingress-controller-overrides", []string{}, "Overrides for Ingress controller component.")
Expand Down
2 changes: 1 addition & 1 deletion cmd/cli/cmd/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func NewUpgrade() *cobra.Command {
flags.BoolVar(&opts.Parameters.IncreaseResourceLimits, "increase-resource-limits", true, "Enables higher resource requests and limits for components.")
flags.BoolVar(&opts.Parameters.Override.CapactValues.Engine.TestSetup.Enabled, "enable-test-setup", false, "Enables test setup for the Capact E2E validation scenarios.")
flags.BoolVar(&opts.Parameters.Override.CapactValues.Notes.PrintInsecure, "print-insecure-helm-release-notes", false, "Prints the base64-encoded Gateway password directly in Helm release notes.")
flags.StringVar(&opts.Parameters.ActionCRDLocation, "crd", capact.CRDUrl, "Capact Action CRD location.")
flags.StringVar(&opts.Parameters.ActionCRDLocation, "crd", "", "Overrides the Capact Action CRD location.")
flags.StringVar(&opts.ActionNamePrefix, "action-name-prefix", "capact-upgrade-", "Specifies Capact upgrade Action name prefix.")
flags.DurationVar(&opts.Timeout, "timeout", 10*time.Minute, `Maximum time during which the upgrade process is being watched, where "0" means "infinite". Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".`)
flags.BoolVarP(&opts.Wait, "wait", "w", true, `Waits for the upgrade process until it's finished or the defined "--timeout" has occurred.`)
Expand Down
2 changes: 1 addition & 1 deletion cmd/cli/docs/capact_install.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ capact install --version @local
--build-image strings Local images names that should be build when using @local version. Takes comma-separated list. (default [argo-actions,argo-runner,e2e-test,gateway,hub-js,k8s-engine,populator])
--capact-overrides strings Overrides for Capact component.
--cert-manager-overrides strings Overrides for Cert Manager component.
--crd string Capact Action CRD location. (default "https://raw.githubusercontent.com/capactio/capact/main/deploy/kubernetes/crds/core.capact.io_actions.yaml")
--crd string Overrides the Capact Action CRD location.
--enable-registry If specified, Capact images are pushed to Capact local Docker registry.
--environment string Capact environment. (default "kind")
--helm-repo string Capact Helm chart repository location. It can be relative path to current working directory or URL. Use @latest tag to select repository which holds the latest Helm chart versions. (default "https://storage.googleapis.com/capactio-stable-charts")
Expand Down
2 changes: 1 addition & 1 deletion cmd/cli/docs/capact_upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ capact upgrade --version 0.1.0

```
--action-name-prefix string Specifies Capact upgrade Action name prefix. (default "capact-upgrade-")
--crd string Capact Action CRD location. (default "https://raw.githubusercontent.com/capactio/capact/main/deploy/kubernetes/crds/core.capact.io_actions.yaml")
--crd string Overrides the Capact Action CRD location.
--enable-test-setup Enables test setup for the Capact E2E validation scenarios.
--helm-repo string Capact Helm chart repository URL. Use @latest tag to select repository which holds the latest Helm chart versions. (default "https://storage.googleapis.com/capactio-stable-charts")
-h, --help help for upgrade
Expand Down
2 changes: 2 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ require (
github.com/hokaccha/go-prettyjson v0.0.0-20210113012101-fb4e108d2519
github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0
github.com/iancoleman/strcase v0.1.2
github.com/jetstack/cert-manager v1.4.4
github.com/machinebox/graphql v0.2.2
github.com/matryer/is v1.4.0 // indirect
github.com/mattn/go-isatty v0.0.13
Expand Down Expand Up @@ -77,6 +78,7 @@ require (
gotest.tools v2.2.0+incompatible
helm.sh/helm/v3 v3.6.3
k8s.io/api v0.21.5
k8s.io/apiextensions-apiserver v0.21.3
k8s.io/apimachinery v0.21.5
k8s.io/cli-runtime v0.21.0
k8s.io/client-go v0.21.5
Expand Down
Loading