Skip to content

Commit c7d2603

Browse files
Merge branch 'main' of github.com:ibm-cloud-architecture/cloud-native-bootcamp
2 parents 8674cff + 7c6fc35 commit c7d2603

File tree

8 files changed

+57
-42
lines changed

8 files changed

+57
-42
lines changed

docs/labs/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
| Setting up Persistent Volumes | Create a Persistent Volume that's accessible from a SQL Pod. | [Setting up Persistent Volumes](kubernetes/lab10/index.md) |
2424
| IKS Ingress Controller | Configure Ingress on Free IKS Cluster | [Setting IKS Ingress](kubernetes/ingress-iks/index.md) |
2525
| *** Solutions *** | | |
26-
| Lab Solutions | Solutions for the Kubernetes Labs | [Solutions](kubernetes/solutions/lab-solutions.md) |
26+
| Lab Solutions | Solutions for the Kubernetes Labs | [Solutions](kubernetes/lab-solutions.md) |
2727

2828
## Continuous Integration
2929

docs/openshift/configuration/config-map/index.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ You can data from a ConfigMap in 3 different ways.
99

1010
## Resources
1111

12-
**OpenShift**
12+
=== "OpenShift"
1313

14-
- [Mapping Volumes](https://docs.openshift.com/container-platform/4.13/nodes/containers/nodes-containers-projected-volumes.html){:target="_blank"}
14+
[Mapping Volumes :fontawesome-solid-globe:](https://docs.openshift.com/container-platform/4.13/nodes/containers/nodes-containers-projected-volumes.html){ .md-button target="_blank"}
1515

16-
**IKS**
16+
=== "Kubernetes"
1717

18-
- [ConfigMaps](https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/){:target="_blank"}
18+
[ConfigMaps :fontawesome-solid-globe:](https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/){ .md-button target="_blank"}
1919

2020
## References
2121

docs/openshift/configuration/index.md

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,13 @@ A Pod can use environment variables to expose information about itself to Contai
2222

2323
### Resources
2424

25-
**IKS & OpenShift**
26-
- [Container Commands](https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/)
27-
- [Environment Variables](https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/)
28-
- [Pod Exposing](https://kubernetes.io/docs/concepts/services-networking/connect-applications-service/#exposing-pods-to-the-cluster)
25+
=== "OpenShift & Kubernetes"
26+
27+
[Container Commands :fontawesome-solid-globe:](https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/){ .md-button target="_blank"}
28+
29+
[Environment Variables :fontawesome-solid-globe:](https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/){ .md-button target="_blank"}
30+
31+
[Pod Exposing :fontawesome-solid-globe:](https://kubernetes.io/docs/concepts/services-networking/connect-applications-service/#exposing-pods-to-the-cluster){ .md-button target="_blank"}
2932

3033
### References
3134

@@ -126,9 +129,11 @@ CPU and memory are each a resource type. A resource type has a base unit. CPU is
126129
127130
### Resources
128131
129-
**IKS & OpenShift**
130-
- [Compute Resources](https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container)
131-
- [Memory Management](https://kubernetes.io/docs/tasks/administer-cluster/manage-resources/memory-default-namespace/)
132+
=== "OpenShift & Kubernetes"
133+
134+
[Compute Resources :fontawesome-solid-globe:](https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container){ .md-button target="_blank"}
135+
136+
[Memory Management :fontawesome-solid-globe:](https://kubernetes.io/docs/tasks/administer-cluster/manage-resources/memory-default-namespace/){ .md-button target="_blank"}
132137
133138
### References
134139

docs/openshift/configuration/secrets/index.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,17 @@ A Secret is an object that contains a small amount of sensitive data such as a p
77

88
## Resources
99

10-
**OpenShift**
10+
=== "OpenShift"
11+
12+
[Image Pull Secrets :fontawesome-solid-globe:](https://docs.openshift.com/container-platform/4.13/openshift_images/managing_images/using-image-pull-secrets.html){ .md-button target="_blank"}
1113

12-
- [Image Pull Secrets](https://docs.openshift.com/container-platform/4.13/openshift_images/managing_images/using-image-pull-secrets.html){:target="_blank"}
13-
- [Secret Commands](https://docs.openshift.com/container-platform/4.13/cli_reference/openshift_cli/developer-cli-commands.html#oc-create-secret-generic){:target="_blank"}
14+
[Secret Commands :fontawesome-solid-globe:](https://docs.openshift.com/container-platform/4.13/cli_reference/openshift_cli/developer-cli-commands.html#oc-create-secret-generic){ .md-button target="_blank"}
15+
16+
=== "Kubernetes"
1417

15-
**IKS**
18+
[Secrets :fontawesome-solid-globe:](https://kubernetes.io/docs/concepts/configuration/secret/){ .md-button target="_blank"}
1619

17-
- [Secrets](https://kubernetes.io/docs/concepts/configuration/secret/){:target="_blank"}
18-
- [Secret Distribution](https://kubernetes.io/docs/tasks/inject-data-application/distribute-credentials-secure/){:target="_blank"}
20+
[Secret Distribution :fontawesome-solid-globe:](https://kubernetes.io/docs/tasks/inject-data-application/distribute-credentials-secure/){ .md-button target="_blank"}
1921

2022
## References
2123

docs/openshift/configuration/security-contexts/index.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ To specify security settings for a Pod, include the securityContext field in the
66

77
## Resources
88

9-
**OpenShift**
9+
=== "OpenShift"
1010

11-
- [Managing Security Contexts](https://docs.openshift.com/container-platform/4.13/authentication/managing-security-context-constraints.html){:target="_blank"}
11+
[Managing Security Contexts :fontawesome-solid-globe:](https://docs.openshift.com/container-platform/4.13/authentication/managing-security-context-constraints.html){ .md-button target="_blank"}
1212

13-
**IKS**
13+
=== "Kubernetes"
1414

15-
- [Security Contexts](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/){:target="_blank"}
15+
[Security Contexts :fontawesome-solid-globe:](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/){ .md-button target="_blank"}
1616

1717

1818
## References

docs/openshift/configuration/service-accounts/index.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,17 @@ User accounts are intended to be global. Names must be unique across all namespa
1010

1111
## Resources
1212

13-
**OpenShift**
13+
=== "OpenShift"
1414

15-
- [Service Accounts](https://docs.openshift.com/container-platform/4.13/authentication/understanding-and-creating-service-accounts.html){:target="_blank"}
16-
- [Using Service Accounts](https://docs.openshift.com/container-platform/4.13/authentication/using-service-accounts-in-applications.html){:target="_blank"}
15+
[Service Accounts :fontawesome-solid-globe:](https://docs.openshift.com/container-platform/4.13/authentication/understanding-and-creating-service-accounts.html){ .md-button target="_blank"}
1716

18-
**IKS**
17+
[Using Service Accounts :fontawesome-solid-globe:](https://docs.openshift.com/container-platform/4.13/authentication/using-service-accounts-in-applications.html){ .md-button target="_blank"}
1918

20-
- [Service Accounts](https://kubernetes.io/docs/reference/access-authn-authz/service-accounts-admin/){:target="_blank"}
21-
- [Service Account Configuration](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/){:target="_blank"}
19+
=== "Kubernetes"
20+
21+
[Service Accounts :fontawesome-solid-globe:](https://kubernetes.io/docs/reference/access-authn-authz/service-accounts-admin/){ .md-button target="_blank"}
22+
23+
[Service Account Configuration :fontawesome-solid-globe:](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/){ .md-button target="_blank"}
2224

2325
## References
2426

docs/openshift/deployments/index.md

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,21 @@ The following are typical use cases for Deployments:
1616

1717
## Resources
1818

19-
**OpenShift**
19+
=== "OpenShift"
2020

21-
- [Deployments](https://docs.openshift.com/container-platform/4.13/applications/deployments/what-deployments-are.html){:target="_blank"}
22-
- [Managing Deployment Processes](https://docs.openshift.com/container-platform/4.13/applications/deployments/managing-deployment-processes.html){:target="_blank"}
23-
- [DeploymentConfig Strategies](https://docs.openshift.com/container-platform/4.13/applications/deployments/deployment-strategies.html){:target="_blank"}
24-
- [Route Based Deployment Strategies](https://docs.openshift.com/container-platform/4.13/applications/deployments/route-based-deployment-strategies.html){:target="_blank"}
21+
[Deployments :fontawesome-solid-globe:](https://docs.openshift.com/container-platform/4.13/applications/deployments/what-deployments-are.html){ .md-button target="_blank"}
2522

26-
**IKS**
23+
[Managing Deployment Processes :fontawesome-solid-globe:](https://docs.openshift.com/container-platform/4.13/applications/deployments/managing-deployment-processes.html){ .md-button target="_blank"}
2724

28-
- [Deployments](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/){:target="_blank"}
29-
- [Scaling Deployments](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#scaling-a-deployment){:target="_blank"}
25+
[DeploymentConfig Strategies :fontawesome-solid-globe:](https://docs.openshift.com/container-platform/4.13/applications/deployments/deployment-strategies.html){ .md-button target="_blank"}
26+
27+
[Route Based Deployment Strategies :fontawesome-solid-globe:](https://docs.openshift.com/container-platform/4.13/applications/deployments/route-based-deployment-strategies.html){ .md-button target="_blank"}
28+
29+
=== "Kubernetes"
30+
31+
[Deployments :fontawesome-solid-globe:](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/){ .md-button target="_blank"}
32+
33+
[Scaling Deployments :fontawesome-solid-globe:](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#scaling-a-deployment){ .md-button target="_blank"}
3034

3135
## References
3236

docs/openshift/deployments/updates/index.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,17 @@ A Deployment’s revision is created when a Deployment’s rollout is triggered.
1515

1616
## Resources
1717

18-
**OpenShift**
18+
=== "OpenShift"
19+
20+
[Rollouts :fontawesome-solid-globe:](https://docs.openshift.com/container-platform/4.13/applications/deployments/what-deployments-are.html#delpoymentconfigs-specific-features_what-deployments-are){ .md-button target="_blank"}
1921

20-
- [Rollouts](https://docs.openshift.com/container-platform/4.13/applications/deployments/what-deployments-are.html#delpoymentconfigs-specific-features_what-deployments-are){:target="_blank"}
21-
- [Rolling Back](https://docs.openshift.com/container-platform/4.13/applications/deployments/managing-deployment-processes.html#deployments-rolling-back_deployment-operations){:target="_blank"}
22+
[Rolling Back :fontawesome-solid-globe:](https://docs.openshift.com/container-platform/4.13/applications/deployments/managing-deployment-processes.html#deployments-rolling-back_deployment-operations){ .md-button target="_blank"}
23+
24+
=== "Kubernetes"
2225

23-
**IKS**
26+
[Updating a Deployment :fontawesome-solid-globe:](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#updating-a-deployment){ .md-button target="_blank"}
2427

25-
- [Updating a Deployment](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#updating-a-deployment){:target="_blank"}
26-
- [Rolling Back a Deployment](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#rolling-back-a-deployment){:target="_blank"}
28+
[Rolling Back a Deployment :fontawesome-solid-globe:](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#rolling-back-a-deployment){ .md-button target="_blank"}
2729

2830

2931
## References

0 commit comments

Comments
 (0)