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.

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

Jump to bottom

Mw/read for dev #34

Merged
merged 4 commits into from
Mar 27, 2024
Merged

Mw/read for dev #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
79e143e
Removed HTTPS, not supported at this time
wilkermichael Mar 6, 2024
35282f4
back in dev mode
wilkermichael Mar 6, 2024
2b57455
Merge branch 'main' into mw/read-for-dev
wilkermichael Mar 7, 2024
e0c2de0
Merge branch 'main' into mw/read-for-dev
wilkermichael Mar 18, 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
2 changes: 1 addition & 1 deletion pkg/version/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ var (
// A pre-release marker for the version. If this is "" (empty string)
// then it means that it is a final release. Otherwise, this is a pre-release
// such as "dev" (in development), "beta", "rc1", etc.
VersionPrerelease = "alpha1"
VersionPrerelease = "dev"
)

// GetHumanVersion composes the parts of the version in a way that's suitable
Expand Down
21 changes: 1 addition & 20 deletions testing/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
KUBERNETES_VERSION = v1.25.11
CONSUL_K8S_CHART_VERSION = 1.3.1
PLUGIN_DIR= $(shell realpath ../)
IMAGE=hashicorppreview/rollouts-plugin-trafficrouter-consul:0.0-dev
HTTPS_BINARY=https://github.com/argoproj-labs/rollouts-plugin-trafficrouter-sample-nginx/releases/download/v0.0.1/metric-plugin-linux-amd64
IMAGE=hashicorp/rollouts-plugin-trafficrouter-consul:0.0.1-alpha1

#Do Not change
VALUES_INIT_HELM=values_rollout_init.yaml
VALUES_HTTPS_HELM=values_rollout_https.yaml

### TEST VERIFICATION
.PHONY: setup
Expand Down Expand Up @@ -122,23 +120,6 @@ deploy-argo-image:
helm install argo-rollouts argo/argo-rollouts -f $(VALUES_INIT_HELM) -n argo-rollouts; \
kubectl apply -f $(PLUGIN_DIR)/yaml/rbac.yaml

#HTTPS
.PHONY: setup-https
setup-https: consul-setup argo-setup-https

.PHONY: argo-setup-https
argo-setup-https: argo-https-values deploy-argo-https apply-crds

.PHONY: argo-https-values
argo-https-values:
./scripts/create_values_rollout_https_helm.sh ./$(VALUES_HTTPS_HELM) $(HTTPS_BINARY)

.PHONY: deploy-argo-https
deploy-argo-https:
kubectl create namespace argo-rollouts; \
helm install argo-rollouts argo/argo-rollouts -f $(VALUES_HTTPS_HELM) -n argo-rollouts; \
kubectl apply -f $(PLUGIN_DIR)/yaml/rbac.yaml

## EXTRAS
.PHONY: install-required
install-required:
Expand Down
Loading