Skip to content

Commit

Permalink
Add version check during release to ensure compiled version is accura…
Browse files Browse the repository at this point in the history
…te (#646)
  • Loading branch information
jessesuen authored and alexmt committed Sep 26, 2018
1 parent 1fcb90c commit dd94e5e
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 17 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ precheckin: test lint
release-precheck: manifests
@if [ "$(GIT_TREE_STATE)" != "clean" ]; then echo 'git tree state is $(GIT_TREE_STATE)' ; exit 1; fi
@if [ -z "$(GIT_TAG)" ]; then echo 'commit must be tagged to perform release' ; exit 1; fi
@if [ "$(GIT_TAG)" != "v`cat VERSION`" ]; then echo 'VERSION does not match git tag'; exit 1; fi

.PHONY: release
release: release-precheck precheckin cli-darwin cli-linux server-image controller-image repo-server-image cli-image
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.9.0
0.10.0
23 changes: 8 additions & 15 deletions docs/getting_started.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,28 +35,27 @@ curl -sSL -o /usr/local/bin/argocd https://github.com/argoproj/argo-cd/releases/
chmod +x /usr/local/bin/argocd
```

## 3. Open access to ArgoCD API server
## 3. Access the ArgoCD API server

By default, the ArgoCD API server is not exposed with an external IP. To access the API server,
choose one of the following means to expose the ArgoCD API server:

### Use a LoadBalancer
### Service Type LoadBalancer
Change the argocd-server service type to `LoadBalancer`:

```bash
kubectl patch svc argocd-server -n argocd -p '{"spec": {"type": "LoadBalancer"}}'
```

### Use Ingress
The ArgoCD API server can be exposed using Ingress. See the [ingress instructions](ingress.md)
on how to configure ArgoCD with ingress.
### Ingress
Follow the [ingress documentation](ingress.md) on how to configure ArgoCD with ingress.

### Port Forwarding
`kubectl port-forward` can also be used to connect to the API server without exposing the service.
The API server can be accessed using the localhost address.
The API server can be accessed using the localhost address/port.


## 4. Login to the server from the CLI
## 4. Login using the CLI

Login as the `admin` user. The initial password is autogenerated to be the pod name of the
ArgoCD API server. This can be retrieved with the command:
Expand All @@ -65,12 +64,6 @@ kubectl get pods -n argocd -l app=argocd-server -o name | cut -d'/' -f 2
```

Using the above password, login to ArgoCD's external IP:

On Minikube:
```bash
argocd login $(minikube service argocd-server -n argocd --url | cut -d'/' -f 3) --name minikube
```
Other clusters:
```bash
kubectl get svc -n argocd argocd-server
argocd login <EXTERNAL-IP>
Expand All @@ -86,8 +79,8 @@ argocd relogin
## 5. Register a cluster to deploy apps to (optional)

This step registers a cluster's credentials to ArgoCD, and is only necessary when deploying to
an external cluster. When deploying in-cluster (the same cluster that ArgoCD is running in),
https://kubernetes.default.svc should be used as the K8s API server address for apps.
an external cluster. When deploying internally (to the same cluster that ArgoCD is running in),
https://kubernetes.default.svc should be used as the application's K8s API server address.

First list all clusters contexts in your current kubconfig:
```bash
Expand Down
3 changes: 2 additions & 1 deletion docs/internal/releasing.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ git checkout -b release-X.Y
git push upstream release-X.Y
```

3. Update manifests with new version
3. Update VERSION and manifests with new version
```bash
vi VERSION # ensure value is desired X.Y.Z semantic version
vi manifests/base/kustomization.yaml # update with new image tags
make manifests
git commit -a -m "Update manifests to vX.Y.Z"
Expand Down

0 comments on commit dd94e5e

Please sign in to comment.