Skip to content

Commit 940d5cd

Browse files
authored
Merge pull request #367 from citrix/doc-update-1.13
minor content updates for cic release 1.13.15
2 parents b7cff1d + 98cee3c commit 940d5cd

3 files changed

Lines changed: 17 additions & 18 deletions

File tree

canary/README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -773,9 +773,9 @@ Perform the following steps to deploy a sample application as a canary release.
773773

774774
1. Deploy the Citrix ingress controller using the steps in [deploy the Citrix ingress controller](https://developer-docs.citrix.com/projects/citrix-k8s-ingress-controller/en/latest/deploy/deploy-cic-yaml/). You can either deploy the Citrix ingress controller as a sidecar with Citrix ADC CPX or as a standalone pod which controls Citrix ADC VPX or MPX.
775775

776-
2. Deploy the `Guestbook` application.
776+
2. Deploy the `Guestbook` application using the [guestbook-deploy.yaml](https://github.com/citrix/citrix-k8s-ingress-controller/blob/master/example/simple-canary/guestbook-deploy.yaml) file.
777777

778-
kubectl apply -f guestbook.yaml
778+
kubectl apply -f guestbook-deploy.yaml
779779

780780
Following is the content of the `Guestbook` application.
781781

@@ -802,7 +802,7 @@ Perform the following steps to deploy a sample application as a canary release.
802802
- containerPort: 80
803803
```
804804
805-
3. Deploy a service to expose the `Guestbook` application
805+
3. Deploy a service to expose the `Guestbook` application using the [guestbook-service.yaml](https://github.com/citrix/citrix-k8s-ingress-controller/blob/master/example/simple-canary/guestbook-service.yaml) file.
806806

807807
kubectl apply -f guestbook-service.yaml
808808

@@ -826,9 +826,9 @@ Perform the following steps to deploy a sample application as a canary release.
826826
app: guestbook
827827
```
828828

829-
4. Deploy the Ingress object for the `Guestbook` application.
829+
4. Deploy the Ingress object for the `Guestbook` application using the [guestbook-ingress.yaml](https://github.com/citrix/citrix-k8s-ingress-controller/blob/master/example/simple-canary/guestbook-ingress.yaml) file.
830830

831-
kubectl apply -f guesbook-ingress.yaml
831+
kubectl apply -f guestbook-ingress.yaml
832832

833833
```yml
834834
apiVersion: extensions/v1beta1
@@ -848,7 +848,7 @@ Perform the following steps to deploy a sample application as a canary release.
848848
servicePort: 80
849849
```
850850

851-
5. Deploy a canary version of the `Guestbook` application.
851+
5. Deploy a canary version of the `Guestbook` application using the [canary-deployment.yaml](https://github.com/citrix/citrix-k8s-ingress-controller/blob/master/example/simple-canary/canary-deployment.yaml) file.
852852

853853
kubectl apply –f canary-deployment.yaml
854854

@@ -876,7 +876,7 @@ Perform the following steps to deploy a sample application as a canary release.
876876
- containerPort: 80
877877
```
878878

879-
6. Deploy a service to expose the canary version of the `Guestbook` application.
879+
6. Deploy a service to expose the canary version of the `Guestbook` application using the [canary-service.yaml](https://github.com/citrix/citrix-k8s-ingress-controller/blob/master/example/simple-canary/canary-service.yaml) file.
880880

881881
kubectl apply –f canary-service.yaml
882882

@@ -898,7 +898,7 @@ Perform the following steps to deploy a sample application as a canary release.
898898
app: guestbook-canary
899899
```
900900

901-
7. Deploy an Ingress object with annotations for the canary version of the `Guestbook` application.
901+
7. Deploy an Ingress object with annotations for the canary version of the `Guestbook` application using the [canary-ingress.yaml](https://github.com/citrix/citrix-k8s-ingress-controller/blob/master/example/simple-canary/canary-ingress.yaml) file.
902902

903903

904904
kubectl apply –f canary-ingress.yaml

docs/canary/canary.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -773,9 +773,9 @@ Perform the following steps to deploy a sample application as a canary release.
773773

774774
1. Deploy the Citrix ingress controller using the steps in [deploy the Citrix ingress controller](https://developer-docs.citrix.com/projects/citrix-k8s-ingress-controller/en/latest/deploy/deploy-cic-yaml/). You can either deploy the Citrix ingress controller as a sidecar with Citrix ADC CPX or as a standalone pod which controls Citrix ADC VPX or MPX.
775775

776-
2. Deploy the `Guestbook` application.
776+
2. Deploy the `Guestbook` application using the [guestbook-deploy.yaml](https://github.com/citrix/citrix-k8s-ingress-controller/blob/master/example/simple-canary/guestbook-deploy.yaml) file.
777777

778-
kubectl apply -f guestbook.yaml
778+
kubectl apply -f guestbook-deploy.yaml
779779

780780
Following is the content of the `Guestbook` application.
781781

@@ -802,7 +802,7 @@ Perform the following steps to deploy a sample application as a canary release.
802802
- containerPort: 80
803803
```
804804
805-
3. Deploy a service to expose the `Guestbook` application
805+
3. Deploy a service to expose the `Guestbook` application using the [guestbook-service.yaml](https://github.com/citrix/citrix-k8s-ingress-controller/blob/master/example/simple-canary/guestbook-service.yaml) file.
806806

807807
kubectl apply -f guestbook-service.yaml
808808

@@ -826,9 +826,9 @@ Perform the following steps to deploy a sample application as a canary release.
826826
app: guestbook
827827
```
828828

829-
4. Deploy the Ingress object for the `Guestbook` application.
829+
4. Deploy the Ingress object for the `Guestbook` application using the [guestbook-ingress.yaml](https://github.com/citrix/citrix-k8s-ingress-controller/blob/master/example/simple-canary/guestbook-ingress.yaml) file.
830830

831-
kubectl apply -f guesbook-ingress.yaml
831+
kubectl apply -f guestbook-ingress.yaml
832832

833833
```yml
834834
apiVersion: extensions/v1beta1
@@ -848,7 +848,7 @@ Perform the following steps to deploy a sample application as a canary release.
848848
servicePort: 80
849849
```
850850

851-
5. Deploy a canary version of the `Guestbook` application.
851+
5. Deploy a canary version of the `Guestbook` application using the [canary-deployment.yaml](https://github.com/citrix/citrix-k8s-ingress-controller/blob/master/example/simple-canary/canary-deployment.yaml) file.
852852

853853
kubectl apply –f canary-deployment.yaml
854854

@@ -876,7 +876,7 @@ Perform the following steps to deploy a sample application as a canary release.
876876
- containerPort: 80
877877
```
878878

879-
6. Deploy a service to expose the canary version of the `Guestbook` application.
879+
6. Deploy a service to expose the canary version of the `Guestbook` application using the [canary-service.yaml](https://github.com/citrix/citrix-k8s-ingress-controller/blob/master/example/simple-canary/canary-service.yaml) file.
880880

881881
kubectl apply –f canary-service.yaml
882882

@@ -898,7 +898,7 @@ Perform the following steps to deploy a sample application as a canary release.
898898
app: guestbook-canary
899899
```
900900

901-
7. Deploy an Ingress object with annotations for the canary version of the `Guestbook` application.
901+
7. Deploy an Ingress object with annotations for the canary version of the `Guestbook` application using the [canary-ingress.yaml](https://github.com/citrix/citrix-k8s-ingress-controller/blob/master/example/simple-canary/canary-ingress.yaml) file.
902902

903903

904904
kubectl apply –f canary-ingress.yaml

docs/deploy/deploy-api-gateway-using-gitops.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,7 @@ The API Gateway deployment CRD configures the following:
9898
| ---------- | ----------- |
9999
| `Repository` | Specifies the Git repository URL.|
100100
| `Branch` | Specifies the Git branch name (By default, master). |
101-
| `oas_secret_ref` | Specifies the Git access secret reference as a Kubernetes secret object name. **Note**: When creating a secret, keep the *user name* and *password* as the secret field names for user name and password.
102-
|
101+
| `oas_secret_ref` | Specifies the Git access secret reference as a Kubernetes secret object name. **Note**: When creating a secret, keep the *user name* and *password* as the secret field names for user name and password.|
103102
| `User_name` | Specifies the Git user name. |
104103
| `Password` | Specifies the Git password. **Note**: Credentials can be specified as a *git_secret_ref* as mentioned before or as user name and password in plain text format. |
105104
| `Files` | The credentials for these OAS URLs can be accessed from the `oas_secret_ref` field or user_name and password field combinations. |

0 commit comments

Comments
 (0)