feat(reconciler): Move crd install, upgrade and management from Helm …

…to OSM Move the crd install, upgrade and management from helm to osm-bootstrap. This will help OSM manage the crd entirely. Part of #4065 Signed-off-by: Sneha Chhabria <[email protected]>
openservicemesh · Sep 9, 2021 · 924155d · 924155d
1 parent 7a4366b
commit 924155d
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 156 deletions.
diff --git a/Makefile b/Makefile
@@ -74,11 +74,12 @@ build-osm-injector: clean-osm-injector
 
 .PHONY: build-osm-crds
 build-osm-crds: clean-osm-crds
-	cp -R ./charts/osm/crds ./bin/osm-crds
+	cp -R ./cmd/osm-bootstrap/crds ./bin/osm-crds
 
 .PHONY: build-osm-bootstrap
 build-osm-bootstrap: clean-osm-bootstrap
 	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v -o ./bin/osm-bootstrap/osm-bootstrap -ldflags "-X $(BUILD_DATE_VAR)=$(BUILD_DATE) -X $(BUILD_VERSION_VAR)=$(VERSION) -X $(BUILD_GITCOMMIT_VAR)=$(GIT_SHA) -s -w" ./cmd/osm-bootstrap
+	cp -R ./cmd/osm-bootstrap/crds ./bin/osm-crds
 
 .PHONY: build-osm
 build-osm: cmd/cli/chart.tgz

diff --git a/charts/osm/templates/cleanup-hook.yaml b/charts/osm/templates/cleanup-hook.yaml
@@ -128,22 +128,19 @@ spec:
       restartPolicy: Never
       containers:
         - name: garbage-collector
-          image: bitnami/kubectl
-          imagePullPolicy: IfNotPresent
+          image: "{{ .Values.OpenServiceMesh.image.registry }}/osm-crds:{{ .Values.OpenServiceMesh.image.tag }}"
+          imagePullPolicy: {{ .Values.OpenServiceMesh.image.pullPolicy }}
           command:
             - sh
             - -c
             - >
              kubectl delete --ignore-not-found meshconfig -n '{{ include "osm.namespace" . }}' osm-mesh-config;
-             kubectl patch crd/meshconfigs.config.openservicemesh.io -p '{"spec":{"conversion":{"strategy":"None", "webhook":null}}}' --type=merge;
-             kubectl patch crd/traffictargets.access.smi-spec.io -p '{"spec":{"conversion":{"strategy":"None", "webhook":null}}}' --type=merge;
-             kubectl patch crd/httproutegroups.specs.smi-spec.io -p '{"spec":{"conversion":{"strategy":"None", "webhook":null}}}' --type=merge;
-             kubectl patch crd/multiclusterservices.config.openservicemesh.io -p '{"spec":{"conversion":{"strategy":"None", "webhook":null}}}' --type=merge;
-             kubectl patch crd/egresses.policy.openservicemesh.io -p '{"spec":{"conversion":{"strategy":"None", "webhook":null}}}' --type=merge;
-             kubectl patch crd/ingressbackends.policy.openservicemesh.io -p '{"spec":{"conversion":{"strategy":"None", "webhook":null}}}' --type=merge;
-             kubectl patch crd/trafficsplits.split.smi-spec.io -p '{"spec":{"conversion":{"strategy":"None", "webhook":null}}}' --type=merge;
-             kubectl patch crd/tcproutes.specs.smi-spec.io -p '{"spec":{"conversion":{"strategy":"None", "webhook":null}}}' --type=merge;
+             kubectl apply -f /osm-crds;
       nodeSelector:
         kubernetes.io/arch: amd64
         kubernetes.io/os: linux
+{{- if .Values.OpenServiceMesh.imagePullSecrets }}
+      imagePullSecrets:
+{{ toYaml .Values.OpenServiceMesh.imagePullSecrets | indent 8 }}
+{{- end }}
 
diff --git a/charts/osm/templates/crds-upgrade-hook.yaml b/charts/osm/templates/crds-upgrade-hook.yaml
diff --git a/charts/osm/templates/osm-bootstrap-deployment.yaml b/charts/osm/templates/osm-bootstrap-deployment.yaml
@@ -31,6 +31,14 @@ spec:
       nodeSelector:
         kubernetes.io/arch: amd64
         kubernetes.io/os: linux
+      initContainers:
+        - name: init-osm-bootstrap
+          image: "{{ .Values.OpenServiceMesh.image.registry }}/osm-crds:{{ .Values.OpenServiceMesh.image.tag }}"
+          imagePullPolicy: {{ .Values.OpenServiceMesh.image.pullPolicy }}
+          args:
+          - apply
+          - -f
+          - /osm-crds
       containers:
         - name: osm-bootstrap
           image: "{{ .Values.OpenServiceMesh.image.registry }}/osm-bootstrap:{{ .Values.OpenServiceMesh.image.tag }}"

diff --git a/charts/osm/crds/config_meshconfig.yaml → ...osm-bootstrap/crds/config_meshconfig.yaml b/charts/osm/crds/config_meshconfig.yaml → ...osm-bootstrap/crds/config_meshconfig.yaml
diff --git a/...osm/crds/config_multicluster_service.yaml → ...rap/crds/config_multicluster_service.yaml b/...osm/crds/config_multicluster_service.yaml → ...rap/crds/config_multicluster_service.yaml
diff --git a/charts/osm/crds/policy_egress.yaml → cmd/osm-bootstrap/crds/policy_egress.yaml b/charts/osm/crds/policy_egress.yaml → cmd/osm-bootstrap/crds/policy_egress.yaml
diff --git a/charts/osm/crds/policy_ingress_backend.yaml → ...ootstrap/crds/policy_ingress_backend.yaml b/charts/osm/crds/policy_ingress_backend.yaml → ...ootstrap/crds/policy_ingress_backend.yaml
diff --git a/charts/osm/crds/smi_http_route_group.yaml → ...-bootstrap/crds/smi_http_route_group.yaml b/charts/osm/crds/smi_http_route_group.yaml → ...-bootstrap/crds/smi_http_route_group.yaml
diff --git a/charts/osm/crds/smi_tcp_route.yaml → cmd/osm-bootstrap/crds/smi_tcp_route.yaml b/charts/osm/crds/smi_tcp_route.yaml → cmd/osm-bootstrap/crds/smi_tcp_route.yaml
diff --git a/charts/osm/crds/smi_traffic_access.yaml → ...sm-bootstrap/crds/smi_traffic_access.yaml b/charts/osm/crds/smi_traffic_access.yaml → ...sm-bootstrap/crds/smi_traffic_access.yaml
diff --git a/charts/osm/crds/smi_traffic_split.yaml → ...osm-bootstrap/crds/smi_traffic_split.yaml b/charts/osm/crds/smi_traffic_split.yaml → ...osm-bootstrap/crds/smi_traffic_split.yaml
diff --git a/dockerfiles/Dockerfile.osm-bootstrap b/dockerfiles/Dockerfile.osm-bootstrap
@@ -1,2 +1,2 @@
 FROM gcr.io/distroless/static
-COPY osm-bootstrap /
+COPY . /