Skip to content

Commit c3abbf2

Browse files
neiswneisw
authored
Revert "OCPBUGS-66948: Pin IPAM CRDs to release-4.20"
1 parent 65eb451 commit c3abbf2

File tree

1,357 files changed

+76517
-320027
lines changed

Some content is hidden

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

1,357 files changed

+76517
-320027
lines changed

‎openshift/Makefile‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1+
BIN_DIR := bin
12
TOOLS_DIR := tools
23

34
$(RELEASE_DIR):
45
mkdir -p $(RELEASE_DIR)/
56

6-
MANIFESTS_GEN := $(TOOLS_DIR)/bin/manifests-gen
7-
KUSTOMIZE := $(TOOLS_DIR)/bin/kustomize
8-
9-
$(TOOLS_DIR)/bin/%:
10-
$(MAKE) -C $(TOOLS_DIR) bin/$*
7+
MANIFESTS_GEN := go run ./vendor/github.com/openshift/cluster-capi-operator/manifests-gen/
118

129
.PHONY: check-env
1310
check-env:
@@ -19,21 +16,8 @@ endif
1916
update-manifests-gen:
2017
cd tools && go get github.com/openshift/cluster-capi-operator/manifests-gen && go mod tidy && go mod vendor
2118

22-
.PHONY: update-ipam-ref
23-
update-ipam-ref:
24-
# Get the current HEAD of the release-4.20 branch
25-
$(eval current_head := $(shell git ls-remote https://github.com/openshift/cluster-api release-4.20 | awk '$$2 == "refs/heads/release-4.20" {print $$1}'))
26-
27-
# Pin the current head in the ipam CRD kustomize resource target
28-
sed -i "s,https://github.com/openshift/cluster-api/config/crd?ref=.*,https://github.com/openshift/cluster-api/config/crd?ref=$(current_head)," ipam/kustomization.yaml
29-
30-
.PHONY: ipam-manifests
31-
ipam-manifests: $(KUSTOMIZE)
32-
$(KUSTOMIZE) build ipam -o manifests/0000_30_cluster-api_04_crd.core-cluster-api.yaml
33-
34-
# Rebasebot runs ocp-manifests, so we make it generate ipam-manifests too
3519
.PHONY: ocp-manifests
36-
ocp-manifests: ipam-manifests $(MANIFESTS_GEN) check-env | $(RELEASE_DIR) ## Builds openshift specific manifests
20+
ocp-manifests: $(RELEASE_DIR) check-env ## Builds openshift specific manifests
3721
# Generate provider manifests.
3822
# TODO: load the provider-version dynamically at rebase time when this is invoked by the Rebase Bot during one of its lifecycle hooks.
39-
$(MANIFESTS_GEN) --provider-name "cluster-api" --provider-type "CoreProvider" --provider-version "${PROVIDER_VERSION}" --base-path "../" --manifests-path "./manifests" --kustomize-dir="openshift"
23+
cd tools && $(MANIFESTS_GEN) --provider-name "cluster-api" --provider-type "CoreProvider" --provider-version "${PROVIDER_VERSION}" --base-path "../../" --manifests-path "../manifests" --kustomize-dir="openshift"

‎openshift/infrastructure-components-openshift.yaml‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ metadata:
88
include.release.openshift.io/single-node-developer: "true"
99
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
1010
service.beta.openshift.io/inject-cabundle: "true"
11+
creationTimestamp: null
1112
labels:
1213
cluster.x-k8s.io/provider: cluster-api
1314
clusterctl.cluster.x-k8s.io: ""
@@ -5317,6 +5318,7 @@ metadata:
53175318
include.release.openshift.io/single-node-developer: "true"
53185319
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
53195320
service.beta.openshift.io/inject-cabundle: "true"
5321+
creationTimestamp: null
53205322
labels:
53215323
cluster.x-k8s.io/provider: cluster-api
53225324
clusterctl.cluster.x-k8s.io: ""
@@ -9107,6 +9109,7 @@ metadata:
91079109
include.release.openshift.io/single-node-developer: "true"
91089110
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
91099111
service.beta.openshift.io/inject-cabundle: "true"
9112+
creationTimestamp: null
91109113
labels:
91119114
cluster.x-k8s.io/provider: cluster-api
91129115
clusterctl.cluster.x-k8s.io: ""
@@ -11269,6 +11272,7 @@ metadata:
1126911272
include.release.openshift.io/single-node-developer: "true"
1127011273
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
1127111274
service.beta.openshift.io/inject-cabundle: "true"
11275+
creationTimestamp: null
1127211276
labels:
1127311277
cluster.x-k8s.io/provider: cluster-api
1127411278
clusterctl.cluster.x-k8s.io: ""
@@ -13551,6 +13555,7 @@ metadata:
1355113555
include.release.openshift.io/single-node-developer: "true"
1355213556
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
1355313557
service.beta.openshift.io/inject-cabundle: "true"
13558+
creationTimestamp: null
1355413559
labels:
1355513560
cluster.x-k8s.io/provider: cluster-api
1355613561
clusterctl.cluster.x-k8s.io: ""
@@ -16165,6 +16170,7 @@ metadata:
1616516170
include.release.openshift.io/single-node-developer: "true"
1616616171
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
1616716172
service.beta.openshift.io/inject-cabundle: "true"
16173+
creationTimestamp: null
1616816174
labels:
1616916175
cluster.x-k8s.io/provider: cluster-api
1617016176
clusterctl.cluster.x-k8s.io: ""
@@ -16965,6 +16971,7 @@ metadata:
1696516971
include.release.openshift.io/single-node-developer: "true"
1696616972
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
1696716973
service.beta.openshift.io/inject-cabundle: "true"
16974+
creationTimestamp: null
1696816975
labels:
1696916976
cluster.x-k8s.io/provider: cluster-api
1697016977
clusterctl.cluster.x-k8s.io: ""
@@ -19252,6 +19259,7 @@ metadata:
1925219259
include.release.openshift.io/single-node-developer: "true"
1925319260
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
1925419261
service.beta.openshift.io/inject-cabundle: "true"
19262+
creationTimestamp: null
1925519263
labels:
1925619264
cluster.x-k8s.io/provider: cluster-api
1925719265
clusterctl.cluster.x-k8s.io: ""
@@ -20166,6 +20174,7 @@ metadata:
2016620174
include.release.openshift.io/single-node-developer: "true"
2016720175
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
2016820176
service.beta.openshift.io/inject-cabundle: "true"
20177+
creationTimestamp: null
2016920178
labels:
2017020179
cluster.x-k8s.io/provider: cluster-api
2017120180
clusterctl.cluster.x-k8s.io: ""
@@ -20611,6 +20620,7 @@ metadata:
2061120620
include.release.openshift.io/single-node-developer: "true"
2061220621
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
2061320622
service.beta.openshift.io/inject-cabundle: "true"
20623+
creationTimestamp: null
2061420624
labels:
2061520625
cluster.x-k8s.io/provider: cluster-api
2061620626
clusterctl.cluster.x-k8s.io: ""
@@ -22056,6 +22066,7 @@ metadata:
2205622066
include.release.openshift.io/single-node-developer: "true"
2205722067
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
2205822068
service.beta.openshift.io/inject-cabundle: "true"
22069+
creationTimestamp: null
2205922070
labels:
2206022071
cluster.x-k8s.io/provider: cluster-api
2206122072
clusterctl.cluster.x-k8s.io: ""
@@ -22808,8 +22819,8 @@ metadata:
2280822819
exclude.release.openshift.io/internal-openshift-hosted: "true"
2280922820
include.release.openshift.io/self-managed-high-availability: "true"
2281022821
include.release.openshift.io/single-node-developer: "true"
22811-
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
2281222822
service.beta.openshift.io/inject-cabundle: "true"
22823+
creationTimestamp: null
2281322824
labels:
2281422825
cluster.x-k8s.io/provider: cluster-api
2281522826
clusterctl.cluster.x-k8s.io: ""
@@ -23175,8 +23186,8 @@ metadata:
2317523186
exclude.release.openshift.io/internal-openshift-hosted: "true"
2317623187
include.release.openshift.io/self-managed-high-availability: "true"
2317723188
include.release.openshift.io/single-node-developer: "true"
23178-
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
2317923189
service.beta.openshift.io/inject-cabundle: "true"
23190+
creationTimestamp: null
2318023191
labels:
2318123192
cluster.x-k8s.io/provider: cluster-api
2318223193
clusterctl.cluster.x-k8s.io: ""
@@ -23805,6 +23816,7 @@ metadata:
2380523816
include.release.openshift.io/self-managed-high-availability: "true"
2380623817
include.release.openshift.io/single-node-developer: "true"
2380723818
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
23819+
creationTimestamp: null
2380823820
labels:
2380923821
cluster.x-k8s.io/provider: cluster-api
2381023822
clusterctl.cluster.x-k8s.io: ""
@@ -24061,6 +24073,7 @@ metadata:
2406124073
include.release.openshift.io/self-managed-high-availability: "true"
2406224074
include.release.openshift.io/single-node-developer: "true"
2406324075
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
24076+
creationTimestamp: null
2406424077
labels:
2406524078
cluster.x-k8s.io/provider: cluster-api
2406624079
clusterctl.cluster.x-k8s.io: ""
@@ -24096,6 +24109,7 @@ rules: []
2409624109
apiVersion: apps/v1
2409724110
kind: Deployment
2409824111
metadata:
24112+
creationTimestamp: null
2409924113
labels:
2410024114
cluster.x-k8s.io/provider: cluster-api
2410124115
clusterctl.cluster.x-k8s.io: ""
@@ -24113,6 +24127,7 @@ spec:
2411324127
metadata:
2411424128
annotations:
2411524129
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
24130+
creationTimestamp: null
2411624131
labels:
2411724132
cluster.x-k8s.io/provider: cluster-api
2411824133
control-plane: controller-manager
@@ -24201,6 +24216,7 @@ kind: MutatingWebhookConfiguration
2420124216
metadata:
2420224217
annotations:
2420324218
service.beta.openshift.io/inject-cabundle: "true"
24219+
creationTimestamp: null
2420424220
labels:
2420524221
cluster.x-k8s.io/provider: cluster-api
2420624222
clusterctl.cluster.x-k8s.io: ""
@@ -24388,6 +24404,7 @@ kind: ValidatingWebhookConfiguration
2438824404
metadata:
2438924405
annotations:
2439024406
service.beta.openshift.io/inject-cabundle: "true"
24407+
creationTimestamp: null
2439124408
labels:
2439224409
cluster.x-k8s.io/provider: cluster-api
2439324410
clusterctl.cluster.x-k8s.io: ""

‎openshift/ipam/kustomization.yaml‎

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

‎openshift/manifests/0000_30_cluster-api_04_cm.core-cluster-api.yaml‎

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

0 commit comments

Comments
 (0)