Skip to content

Commit 088d118

Browse files
committed
Rm Hybrid Helm & Java Operators from OSDK docs
1 parent 997c861 commit 088d118

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+9
-1913
lines changed

_topic_maps/_topic_map.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2009,21 +2009,6 @@ Topics:
20092009
File: osdk-helm-updating-projects
20102010
- Name: Helm support
20112011
File: osdk-helm-support
2012-
- Name: Hybrid Helm Operator
2013-
File: osdk-hybrid-helm
2014-
- Name: Updating Hybrid Helm-based projects
2015-
File: osdk-hybrid-helm-updating-projects
2016-
- Name: Java-based Operators
2017-
Dir: java
2018-
Topics:
2019-
- Name: Getting started
2020-
File: osdk-java-quickstart
2021-
- Name: Tutorial
2022-
File: osdk-java-tutorial
2023-
- Name: Project layout
2024-
File: osdk-java-project-layout
2025-
- Name: Updating Java-based projects
2026-
File: osdk-java-updating-projects
20272012
- Name: Defining cluster service versions (CSVs)
20282013
File: osdk-generating-csvs
20292014
- Name: Working with bundle images

_topic_maps/_topic_map_osd.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -779,21 +779,6 @@ Topics:
779779
File: osdk-helm-updating-projects
780780
- Name: Helm support
781781
File: osdk-helm-support
782-
# - Name: Hybrid Helm Operator <= Tech Preview
783-
# File: osdk-hybrid-helm
784-
# - Name: Updating Hybrid Helm-based projects <= Tech Preview
785-
# File: osdk-hybrid-helm-updating-projects
786-
# - Name: Java-based Operators <= Tech Preview
787-
# Dir: java
788-
# Topics:
789-
# - Name: Getting started
790-
# File: osdk-java-quickstart
791-
# - Name: Tutorial
792-
# File: osdk-java-tutorial
793-
# - Name: Project layout
794-
# File: osdk-java-project-layout
795-
# - Name: Updating Java-based projects
796-
# File: osdk-java-updating-projects
797782
- Name: Defining cluster service versions (CSVs)
798783
File: osdk-generating-csvs
799784
- Name: Working with bundle images

_topic_maps/_topic_map_rosa.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,21 +1023,6 @@ Topics:
10231023
File: osdk-helm-updating-projects
10241024
- Name: Helm support
10251025
File: osdk-helm-support
1026-
# - Name: Hybrid Helm Operator <= Tech Preview
1027-
# File: osdk-hybrid-helm
1028-
# - Name: Updating Hybrid Helm-based projects <= Tech Preview
1029-
# File: osdk-hybrid-helm-updating-projects
1030-
# - Name: Java-based Operators <= Tech Preview
1031-
# Dir: java
1032-
# Topics:
1033-
# - Name: Getting started
1034-
# File: osdk-java-quickstart
1035-
# - Name: Tutorial
1036-
# File: osdk-java-tutorial
1037-
# - Name: Project layout
1038-
# File: osdk-java-project-layout
1039-
# - Name: Updating Java-based projects
1040-
# File: osdk-java-updating-projects
10411026
- Name: Defining cluster service versions (CSVs)
10421027
File: osdk-generating-csvs
10431028
- Name: Working with bundle images

_unused_topics/osdk-updating-v125-to-v128.adoc

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
// * operators/operator_sdk/golang/osdk-golang-updating-projects.adoc
44
// * operators/operator_sdk/ansible/osdk-ansible-updating-projects.adoc
55
// * operators/operator_sdk/helm/osdk-helm-updating-projects.adoc
6-
// * operators/operator_sdk/helm/osdk-hybrid-helm-updating-projects.adoc
7-
// * operators/operator_sdk/java/osdk-java-updating-projects.adoc
6+
// * operators/operator_sdk/helm/
87

98
ifeval::["{context}" == "osdk-golang-updating-projects"]
109
:golang:
@@ -18,14 +17,6 @@ ifeval::["{context}" == "osdk-helm-updating-projects"]
1817
:helm:
1918
:type: Helm
2019
endif::[]
21-
ifeval::["{context}" == "osdk-hybrid-helm-updating-projects"]
22-
:hybrid:
23-
:type: Hybrid Helm
24-
endif::[]
25-
ifeval::["{context}" == "osdk-java-updating-projects"]
26-
:java:
27-
:type: Java
28-
endif::[]
2920

3021
:_mod-docs-content-type: PROCEDURE
3122
[id="osdk-upgrading-projects_{context}"]
@@ -40,7 +31,7 @@ The following procedure updates an existing {type}-based Operator project for co
4031
4132
.Procedure
4233

43-
ifdef::helm,hybrid,java[]
34+
ifdef::helm[]
4435
* Find the `ose-kube-rbac-proxy` pull spec in the following files, and update the image tag to `v4.14`:
4536
endif::[]
4637
ifdef::ansible,golang[]
@@ -136,12 +127,4 @@ endif::[]
136127
ifeval::["{context}" == "osdk-helm-updating-projects"]
137128
:!helm:
138129
:!type:
139-
endif::[]
140-
ifeval::["{context}" == "osdk-hybrid-helm-updating-projects"]
141-
:!hybrid:
142-
:!type:
143-
endif::[]
144-
ifeval::["{context}" == "osdk-java-updating-projects"]
145-
:!java:
146-
:!type:
147-
endif::[]
130+
endif::[]

modules/osdk-bundle-operator.adoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Module included in the following assemblies:
22
//
33
// * operators/operator_sdk/golang/osdk-golang-tutorial.adoc
4-
// * operators/operator_sdk/java/osdk-java-tutorial.adoc
54
// * operators/operator_sdk/ansible/osdk-ansible-tutorial.adoc
65
// * operators/operator_sdk/helm/osdk-helm-tutorial.adoc
76
// * operators/operator_sdk/osdk-working-bundle-images.adoc

modules/osdk-common-prereqs.adoc

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66
// * operators/operator_sdk/ansible/osdk-ansible-tutorial.adoc
77
// * operators/operator_sdk/helm/osdk-helm-quickstart.adoc
88
// * operators/operator_sdk/helm/osdk-helm-tutorial.adoc
9-
// * operators/operator_sdk/helm/osdk-hybrid-helm.adoc
109
// * operators/operator_sdk/osdk-working-bundle-images.adoc
11-
// * operators/operator_sdk/java/osdk-java-quickstart.adoc
12-
// * operators/operator_sdk/java/osdk-java-tutorial.adoc
1310

1411
ifeval::["{context}" == "osdk-ansible-quickstart"]
1512
:ansible:
@@ -23,12 +20,6 @@ endif::[]
2320
ifeval::["{context}" == "osdk-golang-tutorial"]
2421
:golang:
2522
endif::[]
26-
ifeval::["{context}" == "osdk-java-quickstart"]
27-
:java:
28-
endif::[]
29-
ifeval::["{context}" == "osdk-java-tutorial"]
30-
:java:
31-
endif::[]
3223

3324
[id="osdk-common-prereqs_{context}"]
3425
= Prerequisites
@@ -45,10 +36,6 @@ ifdef::ansible[]
4536
* link:https://www.python.org/downloads/[Python] 3.9+
4637
* link:https://pypi.org/project/kubernetes/[Python Kubernetes client]
4738
endif::[]
48-
ifdef::java[]
49-
* link:https://java.com/en/download/help/download_options.html[Java] 11+
50-
* link:https://maven.apache.org/install.html[Maven] 3.6.3+
51-
endif::[]
5239
ifndef::openshift-dedicated,openshift-rosa[]
5340
* Logged into an {product-title} {product-version} cluster with `oc` with an account that has `cluster-admin` permissions
5441
endif::openshift-dedicated,openshift-rosa[]
@@ -69,9 +56,3 @@ endif::[]
6956
ifeval::["{context}" == "osdk-golang-tutorial"]
7057
:!golang:
7158
endif::[]
72-
ifeval::["{context}" == "osdk-java-quickstart"]
73-
:!java:
74-
endif::[]
75-
ifeval::["{context}" == "osdk-java-tutorial"]
76-
:!java:
77-
endif::[]

modules/osdk-create-project.adoc

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ ifeval::["{context}" == "osdk-helm-tutorial"]
1919
:type: Helm
2020
:app: nginx
2121
endif::[]
22-
ifeval::["{context}" == "osdk-java-tutorial"]
23-
:java:
24-
:type: Java
25-
:app: memcached
26-
endif::[]
2722

2823
:_mod-docs-content-type: PROCEDURE
2924
[id="osdk-create-project_{context}"]
@@ -63,9 +58,6 @@ endif::[]
6358
ifdef::helm[]
6459
with the `helm` plugin
6560
endif::[]
66-
ifdef::java[]
67-
with the `quarkus` plugin
68-
endif::[]
6961
to initialize the project:
7062
+
7163
[source,terminal,subs="attributes+"]
@@ -109,14 +101,6 @@ The `init` command creates the `nginx-operator` project specifically for watchin
109101

110102
. For Helm-based projects, the `init` command generates the RBAC rules in the `config/rbac/role.yaml` file based on the resources that would be deployed by the default manifest for the chart. Verify that the rules generated in this file meet the permission requirements of the Operator.
111103
endif::[]
112-
ifdef::java[]
113-
----
114-
$ operator-sdk init \
115-
--plugins=quarkus \
116-
--domain=example.com \
117-
--project-name=memcached-operator
118-
----
119-
endif::[]
120104

121105
ifeval::["{context}" == "osdk-golang-tutorial"]
122106
:!golang:
@@ -133,8 +117,3 @@ ifeval::["{context}" == "osdk-helm-tutorial"]
133117
:!type:
134118
:!app:
135119
endif::[]
136-
ifeval::["{context}" == "osdk-java-tutorial"]
137-
:!java:
138-
:!type:
139-
:!app:
140-
endif::[]

modules/osdk-deploy-olm.adoc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ endif::[]
1111
ifeval::["{context}" == "osdk-working-bundle-images"]
1212
:golang:
1313
endif::[]
14-
ifeval::["{context}" == "osdk-java-tutorial"]
15-
:java:
16-
endif::[]
1714

1815
:_mod-docs-content-type: PROCEDURE
1916
[id="osdk-deploy-olm_{context}"]
@@ -70,7 +67,4 @@ ifeval::["{context}" == "osdk-golang-tutorial"]
7067
endif::[]
7168
ifeval::["{context}" == "osdk-working-bundle-images"]
7269
:!golang:
73-
endif::[]
74-
ifeval::["{context}" == "osdk-java-tutorial"]
75-
:!java:
7670
endif::[]

modules/osdk-hh-create-cr.adoc

Lines changed: 0 additions & 157 deletions
This file was deleted.

0 commit comments

Comments
 (0)