Skip to content

Commit 5ffe1d3

Browse files
committed
beta.kubernetes.io/os deprecated since v1.14, removed in v1.19
**Description of the change:** Switch to supported os node selector, beta one is deprecated AND removed now. **Motivation for the change:** kubernetes/kubernetes#89460 **Reviewer Checklist** - [x] Implementation matches the proposed design, or proposal is updated to match implementation - [x] Sufficient unit test coverage - [x] Sufficient end-to-end test coverage - [x] Docs updated or added to `/docs` - [x] Commit messages sensible and descriptive
1 parent 54dd65a commit 5ffe1d3

File tree

8 files changed

+22
-22
lines changed

8 files changed

+22
-22
lines changed

deploy/chart/values.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ olm:
1515
service:
1616
internalPort: 8080
1717
nodeSelector:
18-
beta.kubernetes.io/os: linux
18+
kubernetes.io/os: linux
1919
resources:
2020
requests:
2121
cpu: 10m
@@ -30,7 +30,7 @@ catalog:
3030
service:
3131
internalPort: 8080
3232
nodeSelector:
33-
beta.kubernetes.io/os: linux
33+
kubernetes.io/os: linux
3434
resources:
3535
requests:
3636
cpu: 10m
@@ -44,7 +44,7 @@ package:
4444
service:
4545
internalPort: 5443
4646
nodeSelector:
47-
beta.kubernetes.io/os: linux
47+
kubernetes.io/os: linux
4848
resources:
4949
requests:
5050
cpu: 10m

deploy/ocp/values.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ olm:
1515
service:
1616
internalPort: 8080
1717
nodeSelector:
18-
beta.kubernetes.io/os: linux
18+
kubernetes.io/os: linux
1919
node-role.kubernetes.io/master: ""
2020
tolerations:
2121
- key: node-role.kubernetes.io/master
@@ -43,7 +43,7 @@ catalog:
4343
service:
4444
internalPort: 8080
4545
nodeSelector:
46-
beta.kubernetes.io/os: linux
46+
kubernetes.io/os: linux
4747
node-role.kubernetes.io/master: ""
4848
tolerations:
4949
- key: node-role.kubernetes.io/master
@@ -69,7 +69,7 @@ package:
6969
service:
7070
internalPort: 5443
7171
nodeSelector:
72-
beta.kubernetes.io/os: linux
72+
kubernetes.io/os: linux
7373
node-role.kubernetes.io/master: ""
7474
tolerations:
7575
- key: node-role.kubernetes.io/master

deploy/upstream/quickstart/olm.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11696,7 +11696,7 @@ spec:
1169611696
port: 8080
1169711697
terminationMessagePolicy: FallbackToLogsOnError
1169811698
env:
11699-
11699+
1170011700
- name: OPERATOR_NAMESPACE
1170111701
valueFrom:
1170211702
fieldRef:
@@ -11707,10 +11707,10 @@ spec:
1170711707
requests:
1170811708
cpu: 10m
1170911709
memory: 160Mi
11710-
11711-
11710+
11711+
1171211712
nodeSelector:
11713-
beta.kubernetes.io/os: linux
11713+
kubernetes.io/os: linux
1171411714
---
1171511715
apiVersion: apps/v1
1171611716
kind: Deployment
@@ -11759,15 +11759,15 @@ spec:
1175911759
port: 8080
1176011760
terminationMessagePolicy: FallbackToLogsOnError
1176111761
env:
11762-
11762+
1176311763
resources:
1176411764
requests:
1176511765
cpu: 10m
1176611766
memory: 80Mi
11767-
11768-
11767+
11768+
1176911769
nodeSelector:
11770-
beta.kubernetes.io/os: linux
11770+
kubernetes.io/os: linux
1177111771
---
1177211772
kind: ClusterRole
1177311773
apiVersion: rbac.authorization.k8s.io/v1
@@ -11896,7 +11896,7 @@ spec:
1189611896
spec:
1189711897
serviceAccountName: olm-operator-serviceaccount
1189811898
nodeSelector:
11899-
beta.kubernetes.io/os: linux
11899+
kubernetes.io/os: linux
1190011900
containers:
1190111901
- name: packageserver
1190211902
command:

doc/design/building-your-csv.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ An APIService is uniquely identified by the group-version it provides and can be
202202
**Kind**: A kind that the APIService is expected to provide.
203203

204204
**DeploymentName**:
205-
Name of the deployment defined by your CSV that corresponds to your APIService (required for owned APIServices). During the CSV pending phase, the OLM Operator will search your CSV's InstallStrategy for a deployment spec with a matching name, and if not found, will not transition the CSV to the install ready phase.
205+
Name of the deployment defined by your CSV that corresponds to your APIService (required for owned APIServices). During the CSV pending phase, the OLM Operator will search your CSV's InstallStrategy for a deployment spec with a matching name, and if not found, will not transition the CSV to the install ready phase.
206206

207207
**Resources**:
208208
Your APIServices will own one or more types of Kubernetes objects. These are listed in the resources section to inform your end-users of the objects they might need to troubleshoot or how to connect to the application, such as the Service or Ingress rule that exposes a database.
@@ -345,7 +345,7 @@ Here’s a full example:
345345
imagePullSecrets:
346346
- name: ''
347347
nodeSelector:
348-
beta.kubernetes.io/os: linux
348+
kubernetes.io/os: linux
349349
serviceAccountName: example-operator
350350
permissions:
351351
- serviceAccountName: example-operator

pkg/controller/registry/reconciler/reconciler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ func Pod(source *v1alpha1.CatalogSource, name string, image string, labels map[s
143143
},
144144
},
145145
NodeSelector: map[string]string{
146-
"beta.kubernetes.io/os": "linux",
146+
"kubernetes.io/os": "linux",
147147
},
148148
},
149149
}

pkg/controller/registry/reconciler/reconciler_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func TestPodNodeSelector(t *testing.T) {
1515
},
1616
}
1717

18-
key := "beta.kubernetes.io/os"
18+
key := "kubernetes.io/os"
1919
value := "linux"
2020

2121
gotCatSrcPod := Pod(catsrc, "hello", "busybox", map[string]string{}, int32(0), int32(0))

pkg/package-server/provider/registry_test.go

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

pkg/package-server/provider/testdata/manifests/prometheus/0.22.2/prometheusoperator.0.22.2.clusterserviceversion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ spec:
184184
allowPrivilegeEscalation: false
185185
readOnlyRootFilesystem: true
186186
nodeSelector:
187-
beta.kubernetes.io/os: linux
187+
kubernetes.io/os: linux
188188
maturity: beta
189189
version: 0.22.2
190190
customresourcedefinitions:

0 commit comments

Comments
 (0)