Skip to content

Commit 2a0ba19

Browse files
authored
Merge pull request #38503 from mburke5678/service.alpha.openshift.io
Change `service.alpha.openshift.io` to `service.beta.openshift.io`
2 parents 46c3ced + 847d4dc commit 2a0ba19

7 files changed

+21
-21
lines changed

modules/builds-service-serving-certificate-secrets.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ Service serving certificate secrets are intended to support complex middleware a
1010

1111
To secure communication to your service, have the cluster generate a signed serving certificate/key pair into a secret in your namespace.
1212

13-
* Set the `service.alpha.openshift.io/serving-cert-secret-name` annotation on your service with the value set to the name you want to use for your secret.
13+
* Set the `service.beta.openshift.io/serving-cert-secret-name` annotation on your service with the value set to the name you want to use for your secret.
1414
+
1515
Then, your `PodSpec` can mount that secret. When it is available, your pod runs. The certificate is good for the internal service DNS name, `<service.name>.<service.namespace>.svc`.
1616
+
17-
The certificate and key are in PEM format, stored in `tls.crt` and `tls.key` respectively. The certificate/key pair is automatically replaced when it gets close to expiration. View the expiration date in the `service.alpha.openshift.io/expiry` annotation on the secret, which is in RFC3339 format.
17+
The certificate and key are in PEM format, stored in `tls.crt` and `tls.key` respectively. The certificate/key pair is automatically replaced when it gets close to expiration. View the expiration date in the `service.beta.openshift.io/expiry` annotation on the secret, which is in RFC3339 format.
1818

1919
[NOTE]
2020
====

modules/builds-troubleshooting-service-certificate-generation.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
If your request for access to resources is denied:
99

1010
Issue::
11-
If a service certificate generation fails with (service's `service.alpha.openshift.io/serving-cert-generation-error` annotation contains):
11+
If a service certificate generation fails with (service's `service.beta.openshift.io/serving-cert-generation-error` annotation contains):
1212

1313
.Example output
1414
[source,terminal]
@@ -17,7 +17,7 @@ secret/ssl-key references serviceUID 62ad25ca-d703-11e6-9d6f-0e9c0057b608, which
1717
----
1818

1919
Resolution::
20-
The service that generated the certificate no longer exists, or has a different `serviceUID`. You must force certificates regeneration by removing the old secret, and clearing the following annotations on the service: `service.alpha.openshift.io/serving-cert-generation-error` and `service.alpha.openshift.io/serving-cert-generation-error-num`:
20+
The service that generated the certificate no longer exists, or has a different `serviceUID`. You must force certificates regeneration by removing the old secret, and clearing the following annotations on the service: `service.beta.openshift.io/serving-cert-generation-error` and `service.beta.openshift.io/serving-cert-generation-error-num`:
2121

2222
[source,terminal]
2323
----
@@ -26,12 +26,12 @@ $ oc delete secret <secret_name>
2626

2727
[source,terminal]
2828
----
29-
$ oc annotate service <service_name> service.alpha.openshift.io/serving-cert-generation-error-
29+
$ oc annotate service <service_name> service.beta.openshift.io/serving-cert-generation-error-
3030
----
3131

3232
[source,terminal]
3333
----
34-
$ oc annotate service <service_name> service.alpha.openshift.io/serving-cert-generation-error-num-
34+
$ oc annotate service <service_name> service.beta.openshift.io/serving-cert-generation-error-num-
3535
----
3636

3737
[NOTE]

modules/configuring-dynamic-admission.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ items:
257257
namespace: my-webhook-namespace
258258
name: server
259259
annotations:
260-
service.alpha.openshift.io/serving-cert-secret-name: server-serving-cert
260+
service.beta.openshift.io/serving-cert-secret-name: server-serving-cert
261261
spec:
262262
selector:
263263
server: "true"

modules/monitoring-exposing-custom-application-metrics-for-horizontal-pod-autoscaling.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ apiVersion: v1
148148
kind: Service
149149
metadata:
150150
annotations:
151-
service.alpha.openshift.io/serving-cert-secret-name: prometheus-adapter-tls
151+
service.beta.openshift.io/serving-cert-secret-name: prometheus-adapter-tls
152152
labels:
153153
name: prometheus-adapter
154154
name: prometheus-adapter

modules/nodes-pods-secrets-certificates-about.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ kind: Service
2222
metadata:
2323
name: registry
2424
annotations:
25-
service.alpha.openshift.io/serving-cert-secret-name: registry-cert<1>
25+
service.beta.openshift.io/serving-cert-secret-name: registry-cert<1>
2626
# ...
2727
----
2828
<1> Specify the name for the certificate

modules/nodes-pods-secrets-certificates-creating.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
= Generating signed certificates for use with secrets
77

88
To use a signed serving certificate/key pair with a pod, create or edit the service to add
9-
the `service.alpha.openshift.io/serving-cert-secret-name` annotation, then add the secret to the pod.
9+
the `service.beta.openshift.io/serving-cert-secret-name` annotation, then add the secret to the pod.
1010

1111
.Procedure
1212

1313
To create a _service serving certificate secret_:
1414

1515
. Edit the `Pod` spec for your service.
1616

17-
. Add the `service.alpha.openshift.io/serving-cert-secret-name` annotation
17+
. Add the `service.beta.openshift.io/serving-cert-secret-name` annotation
1818
with the name you want to use for your secret.
1919
+
2020
[source,yaml]
@@ -24,7 +24,7 @@ apiVersion: v1
2424
metadata:
2525
name: my-service
2626
annotations:
27-
service.alpha.openshift.io/serving-cert-secret-name: my-cert <1>
27+
service.beta.openshift.io/serving-cert-secret-name: my-cert <1>
2828
spec:
2929
selector:
3030
app: MyApp
@@ -73,9 +73,9 @@ $ oc describe secret my-cert
7373
Name: my-cert
7474
Namespace: openshift-console
7575
Labels: <none>
76-
Annotations: service.alpha.openshift.io/expiry: 2023-03-08T23:22:40Z
77-
service.alpha.openshift.io/originating-service-name: my-service
78-
service.alpha.openshift.io/originating-service-uid: 640f0ec3-afc2-4380-bf31-a8c784846a11
76+
Annotations: service.beta.openshift.io/expiry: 2023-03-08T23:22:40Z
77+
service.beta.openshift.io/originating-service-name: my-service
78+
service.beta.openshift.io/originating-service-uid: 640f0ec3-afc2-4380-bf31-a8c784846a11
7979
service.beta.openshift.io/expiry: 2023-03-08T23:22:40Z
8080
8181
Type: kubernetes.io/tls
@@ -117,7 +117,7 @@ The certificate will be good for the internal service DNS name,
117117
+
118118
The certificate/key pair is automatically replaced when it gets
119119
close to expiration. View the expiration date in the
120-
`service.alpha.openshift.io/expiry` annotation on the secret, which is in
120+
`service.beta.openshift.io/expiry` annotation on the secret, which is in
121121
RFC3339 format.
122122
+
123123
[NOTE]

modules/nodes-pods-secrets-troubleshooting.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
= Troubleshooting secrets
77

88
If a service certificate generation fails with (service's
9-
`service.alpha.openshift.io/serving-cert-generation-error` annotation
9+
`service.beta.openshift.io/serving-cert-generation-error` annotation
1010
contains):
1111

1212
[source,terminal]
@@ -17,8 +17,8 @@ secret/ssl-key references serviceUID 62ad25ca-d703-11e6-9d6f-0e9c0057b608, which
1717
The service that generated the certificate no longer exists, or has a different
1818
`serviceUID`. You must force certificates regeneration by removing the old
1919
secret, and clearing the following annotations on the service
20-
`service.alpha.openshift.io/serving-cert-generation-error`,
21-
`service.alpha.openshift.io/serving-cert-generation-error-num`:
20+
`service.beta.openshift.io/serving-cert-generation-error`,
21+
`service.beta.openshift.io/serving-cert-generation-error-num`:
2222

2323
. Delete the secret:
2424
+
@@ -31,12 +31,12 @@ $ oc delete secret <secret_name>
3131
+
3232
[source,terminal]
3333
----
34-
$ oc annotate service <service_name> service.alpha.openshift.io/serving-cert-generation-error-
34+
$ oc annotate service <service_name> service.beta.openshift.io/serving-cert-generation-error-
3535
----
3636
+
3737
[source,terminal]
3838
----
39-
$ oc annotate service <service_name> service.alpha.openshift.io/serving-cert-generation-error-num-
39+
$ oc annotate service <service_name> service.beta.openshift.io/serving-cert-generation-error-num-
4040
----
4141

4242
[NOTE]

0 commit comments

Comments
 (0)