Merge pull request #243 from iankko/RHSSO-1928

iankko · web-flow · commit 74526a9faef6 · 2022-04-07T10:15:56.000+02:00
[RHSSO-1928] Drop service.alpha.kubernetes.io/tolerate-unready-endpoints: "true" RH-SSO JGroups ping's service annotation. Use 'Service.spec.publishNotReadyAddresses' boolean set to "true" instead
diff --git a/template.adoc.in b/template.adoc.in
@@ -205,11 +205,11 @@ For DNS_PING to work, the following steps must be taken:
 . A ping service which exposes the ping port must be defined.  This service
   should be "headless" (ClusterIP=None) and must have the following:
 .. The port must be named for port discovery to work.
-.. It must be annotated with `service.alpha.kubernetes.io/tolerate-unready-endpoints`
-   set to `"true"`.  Omitting this annotation will result in each node forming
-   their own "cluster of one" during startup, then merging their cluster into
-   the other nodes' clusters after startup (as the other nodes are not detected
-   until after they have started).
+.. The `spec.publishNotReadyAddresses` field of this service must be set to
+   `"true"`. Omitting the setting of this boolean will result in each node
+   forming their own "cluster of one" during startup, then merging their
+   cluster into the other nodes' clusters after startup (as the other nodes are
+   not detected until after they have started).
 
 .Example ping service for use with DNS_PING
 [source,yaml]
@@ -221,12 +221,12 @@ spec:
     ports:
     - name: ping
       port: 8888
+    publishNotReadyAddresses: true
     selector:
         deploymentConfig: eap-app
 metadata:
     name: eap-app-ping
     annotations:
-        service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
         description: "The JGroups ping port for clustering."
 ----
 
diff --git a/templates/sso75-https.json b/templates/sso75-https.json
@@ -271,6 +271,7 @@
                         "port": 8888
                     }
                 ],
+                "publishNotReadyAddresses": true,
                 "selector": {
                     "deploymentConfig": "${APPLICATION_NAME}"
                 }
@@ -281,7 +282,6 @@
                     "application": "${APPLICATION_NAME}"
                 },
                 "annotations": {
-                    "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true",
                     "description": "The JGroups ping port for clustering."
                 }
             }
diff --git a/templates/sso75-ocp4-x509-https.json b/templates/sso75-ocp4-x509-https.json
@@ -164,6 +164,7 @@
                         "port": 8888
                     }
                 ],
+                "publishNotReadyAddresses": true,
                 "selector": {
                     "deploymentConfig": "${APPLICATION_NAME}"
                 }
@@ -174,7 +175,6 @@
                     "application": "${APPLICATION_NAME}"
                 },
                 "annotations": {
-                    "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true",
                     "service.alpha.openshift.io/serving-cert-secret-name": "sso-x509-jgroups-secret",
                     "description": "The JGroups ping port for clustering."
                 }
diff --git a/templates/sso75-ocp4-x509-postgresql-persistent.json b/templates/sso75-ocp4-x509-postgresql-persistent.json
@@ -245,6 +245,7 @@
                         "port": 8888
                     }
                 ],
+                "publishNotReadyAddresses": true,
                 "selector": {
                     "deploymentConfig": "${APPLICATION_NAME}"
                 }
@@ -255,7 +256,6 @@
                     "application": "${APPLICATION_NAME}"
                 },
                 "annotations": {
-                    "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true",
                     "service.alpha.openshift.io/serving-cert-secret-name": "sso-x509-jgroups-secret",
                     "description": "The JGroups ping port for clustering."
                 }
diff --git a/templates/sso75-postgresql-persistent.json b/templates/sso75-postgresql-persistent.json
@@ -353,6 +353,7 @@
                         "port": 8888
                     }
                 ],
+                "publishNotReadyAddresses": true,
                 "selector": {
                     "deploymentConfig": "${APPLICATION_NAME}"
                 }
@@ -363,7 +364,6 @@
                     "application": "${APPLICATION_NAME}"
                 },
                 "annotations": {
-                    "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true",
                     "description": "The JGroups ping port for clustering."
                 }
             }
diff --git a/templates/sso75-postgresql.json b/templates/sso75-postgresql.json
@@ -349,6 +349,7 @@
                         "port": 8888
                     }
                 ],
+                "publishNotReadyAddresses": true,
                 "selector": {
                     "deploymentConfig": "${APPLICATION_NAME}"
                 }
@@ -359,7 +360,6 @@
                     "application": "${APPLICATION_NAME}"
                 },
                 "annotations": {
-                    "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true",
                     "description": "The JGroups ping port for clustering."
                 }
             }
diff --git a/templates/sso75-x509-https.json b/templates/sso75-x509-https.json
@@ -150,6 +150,7 @@
                         "port": 8888
                     }
                 ],
+                "publishNotReadyAddresses": true,
                 "selector": {
                     "deploymentConfig": "${APPLICATION_NAME}"
                 }
@@ -160,7 +161,6 @@
                     "application": "${APPLICATION_NAME}"
                 },
                 "annotations": {
-                    "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true",
                     "service.alpha.openshift.io/serving-cert-secret-name": "sso-x509-jgroups-secret",
                     "description": "The JGroups ping port for clustering."
                 }
diff --git a/templates/sso75-x509-postgresql-persistent.json b/templates/sso75-x509-postgresql-persistent.json
@@ -331,6 +331,7 @@
                         "port": 8888
                     }
                 ],
+                "publishNotReadyAddresses": true,
                 "selector": {
                     "deploymentConfig": "${APPLICATION_NAME}"
                 }
@@ -341,7 +342,6 @@
                     "application": "${APPLICATION_NAME}"
                 },
                 "annotations": {
-                    "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true",
                     "service.alpha.openshift.io/serving-cert-secret-name": "sso-x509-jgroups-secret",
                     "description": "The JGroups ping port for clustering."
                 }

Original file line number	Diff line number	Diff line change
`@@ -271,6 +271,7 @@`
`271`	`271`	`"port": 8888`
`272`	`272`	`}`
`273`	`273`	`],`
	`274`	`+ "publishNotReadyAddresses": true,`
`274`	`275`	`"selector": {`
`275`	`276`	`"deploymentConfig": "${APPLICATION_NAME}"`
`276`	`277`	`}`
`@@ -281,7 +282,6 @@`
`281`	`282`	`"application": "${APPLICATION_NAME}"`
`282`	`283`	`},`
`283`	`284`	`"annotations": {`
`284`		`- "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true",`
`285`	`285`	`"description": "The JGroups ping port for clustering."`
`286`	`286`	`}`
`287`	`287`	`}`
Original file line number	Diff line number	Diff line change
`@@ -164,6 +164,7 @@`
`164`	`164`	`"port": 8888`
`165`	`165`	`}`
`166`	`166`	`],`
	`167`	`+ "publishNotReadyAddresses": true,`
`167`	`168`	`"selector": {`
`168`	`169`	`"deploymentConfig": "${APPLICATION_NAME}"`
`169`	`170`	`}`
`@@ -174,7 +175,6 @@`
`174`	`175`	`"application": "${APPLICATION_NAME}"`
`175`	`176`	`},`
`176`	`177`	`"annotations": {`
`177`		`- "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true",`
`178`	`178`	`"service.alpha.openshift.io/serving-cert-secret-name": "sso-x509-jgroups-secret",`
`179`	`179`	`"description": "The JGroups ping port for clustering."`
`180`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -245,6 +245,7 @@`
`245`	`245`	`"port": 8888`
`246`	`246`	`}`
`247`	`247`	`],`
	`248`	`+ "publishNotReadyAddresses": true,`
`248`	`249`	`"selector": {`
`249`	`250`	`"deploymentConfig": "${APPLICATION_NAME}"`
`250`	`251`	`}`
`@@ -255,7 +256,6 @@`
`255`	`256`	`"application": "${APPLICATION_NAME}"`
`256`	`257`	`},`
`257`	`258`	`"annotations": {`
`258`		`- "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true",`
`259`	`259`	`"service.alpha.openshift.io/serving-cert-secret-name": "sso-x509-jgroups-secret",`
`260`	`260`	`"description": "The JGroups ping port for clustering."`
`261`	`261`	`}`
Original file line number	Diff line number	Diff line change
`@@ -353,6 +353,7 @@`
`353`	`353`	`"port": 8888`
`354`	`354`	`}`
`355`	`355`	`],`
	`356`	`+ "publishNotReadyAddresses": true,`
`356`	`357`	`"selector": {`
`357`	`358`	`"deploymentConfig": "${APPLICATION_NAME}"`
`358`	`359`	`}`
`@@ -363,7 +364,6 @@`
`363`	`364`	`"application": "${APPLICATION_NAME}"`
`364`	`365`	`},`
`365`	`366`	`"annotations": {`
`366`		`- "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true",`
`367`	`367`	`"description": "The JGroups ping port for clustering."`
`368`	`368`	`}`
`369`	`369`	`}`
Original file line number	Diff line number	Diff line change
`@@ -349,6 +349,7 @@`
`349`	`349`	`"port": 8888`
`350`	`350`	`}`
`351`	`351`	`],`
	`352`	`+ "publishNotReadyAddresses": true,`
`352`	`353`	`"selector": {`
`353`	`354`	`"deploymentConfig": "${APPLICATION_NAME}"`
`354`	`355`	`}`
`@@ -359,7 +360,6 @@`
`359`	`360`	`"application": "${APPLICATION_NAME}"`
`360`	`361`	`},`
`361`	`362`	`"annotations": {`
`362`		`- "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true",`
`363`	`363`	`"description": "The JGroups ping port for clustering."`
`364`	`364`	`}`
`365`	`365`	`}`
Original file line number	Diff line number	Diff line change
`@@ -150,6 +150,7 @@`
`150`	`150`	`"port": 8888`
`151`	`151`	`}`
`152`	`152`	`],`
	`153`	`+ "publishNotReadyAddresses": true,`
`153`	`154`	`"selector": {`
`154`	`155`	`"deploymentConfig": "${APPLICATION_NAME}"`
`155`	`156`	`}`
`@@ -160,7 +161,6 @@`
`160`	`161`	`"application": "${APPLICATION_NAME}"`
`161`	`162`	`},`
`162`	`163`	`"annotations": {`
`163`		`- "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true",`
`164`	`164`	`"service.alpha.openshift.io/serving-cert-secret-name": "sso-x509-jgroups-secret",`
`165`	`165`	`"description": "The JGroups ping port for clustering."`
`166`	`166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -331,6 +331,7 @@`
`331`	`331`	`"port": 8888`
`332`	`332`	`}`
`333`	`333`	`],`
	`334`	`+ "publishNotReadyAddresses": true,`
`334`	`335`	`"selector": {`
`335`	`336`	`"deploymentConfig": "${APPLICATION_NAME}"`
`336`	`337`	`}`
`@@ -341,7 +342,6 @@`
`341`	`342`	`"application": "${APPLICATION_NAME}"`
`342`	`343`	`},`
`343`	`344`	`"annotations": {`
`344`		`- "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true",`
`345`	`345`	`"service.alpha.openshift.io/serving-cert-secret-name": "sso-x509-jgroups-secret",`
`346`	`346`	`"description": "The JGroups ping port for clustering."`
`347`	`347`	`}`