From 79e23a79a76e45e779d731ac49c283ae4bce2f9d Mon Sep 17 00:00:00 2001 From: Arkadiusz Galwas Date: Tue, 19 Sep 2023 19:09:05 +0200 Subject: [PATCH] Added patch with Gardener Cluster configuration --- Makefile | 10 +- ...cturemanager.kyma-project.io_clusters.yaml | 49 ------ ...ager.kyma-project.io_gardenerclusters.yaml | 148 ++++++++++++++++++ config/default/kustomization.yaml | 3 +- .../manager_gardener_secret_patch.yaml | 21 +++ config/manager/kustomization.yaml | 4 +- 6 files changed, 180 insertions(+), 55 deletions(-) delete mode 100644 config/crd/bases/infrastructuremanager.kyma-project.io_clusters.yaml create mode 100644 config/crd/bases/infrastructuremanager.kyma-project.io_gardenerclusters.yaml create mode 100644 config/default/manager_gardener_secret_patch.yaml diff --git a/Makefile b/Makefile index 60603908..9b736907 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # Image URL to use all building/pushing image targets -IMG ?= controller:latest +IMG ?= europe-docker.pkg.dev/kyma-project/dev/infrastructure-manager:PR-37 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. ENVTEST_K8S_VERSION = 1.27.1 @@ -108,6 +108,10 @@ ifndef ignore-not-found ignore-not-found = false endif +.PHONY: gardener-secret-deploy +gardener-secret-deploy: + $(KUBECTL) create secret generic gardener-credentials --from-file kubeconfig=$(GARDENER_KUBECONFIG_PATH) -n kcp-system + .PHONY: install install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~/.kube/config. $(KUSTOMIZE) build config/crd | $(KUBECTL) apply -f - @@ -139,7 +143,7 @@ CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen ENVTEST ?= $(LOCALBIN)/setup-envtest ## Tool Versions -KUSTOMIZE_VERSION ?= v5.0.1 +KUSTOMIZE_VERSION ?= v4.5.5 CONTROLLER_TOOLS_VERSION ?= v0.12.0 .PHONY: kustomize @@ -149,7 +153,7 @@ $(KUSTOMIZE): $(LOCALBIN) echo "$(LOCALBIN)/kustomize version is not expected $(KUSTOMIZE_VERSION). Removing it before installing."; \ rm -rf $(LOCALBIN)/kustomize; \ fi - test -s $(LOCALBIN)/kustomize || GOBIN=$(LOCALBIN) GO111MODULE=on go install sigs.k8s.io/kustomize/kustomize/v5@$(KUSTOMIZE_VERSION) + test -s $(LOCALBIN)/kustomize || GOBIN=$(LOCALBIN) GO111MODULE=on go install sigs.k8s.io/kustomize/kustomize/v4@$(KUSTOMIZE_VERSION) .PHONY: controller-gen controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary. If wrong version is installed, it will be overwritten. diff --git a/config/crd/bases/infrastructuremanager.kyma-project.io_clusters.yaml b/config/crd/bases/infrastructuremanager.kyma-project.io_clusters.yaml deleted file mode 100644 index 77af01f4..00000000 --- a/config/crd/bases/infrastructuremanager.kyma-project.io_clusters.yaml +++ /dev/null @@ -1,49 +0,0 @@ ---- -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - controller-gen.kubebuilder.io/version: v0.12.0 - name: clusters.infrastructuremanager.kyma-project.io -spec: - group: infrastructuremanager.kyma-project.io - names: - kind: Cluster - listKind: ClusterList - plural: clusters - singular: cluster - scope: Namespaced - versions: - - name: v1 - schema: - openAPIV3Schema: - description: Cluster is the Schema for the clusters API - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - metadata: - type: object - spec: - description: ClusterSpec defines the desired state of Cluster - properties: - foo: - description: Foo is an example field of Cluster. Edit cluster_types.go - to remove/update - type: string - type: object - status: - description: ClusterStatus defines the observed state of Cluster - type: object - type: object - served: true - storage: true - subresources: - status: {} diff --git a/config/crd/bases/infrastructuremanager.kyma-project.io_gardenerclusters.yaml b/config/crd/bases/infrastructuremanager.kyma-project.io_gardenerclusters.yaml new file mode 100644 index 00000000..cd7d2c53 --- /dev/null +++ b/config/crd/bases/infrastructuremanager.kyma-project.io_gardenerclusters.yaml @@ -0,0 +1,148 @@ +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.12.0 + name: gardenerclusters.infrastructuremanager.kyma-project.io +spec: + group: infrastructuremanager.kyma-project.io + names: + kind: GardenerCluster + listKind: GardenerClusterList + plural: gardenerclusters + singular: gardenercluster + scope: Namespaced + versions: + - name: v1 + schema: + openAPIV3Schema: + description: GardenerCluster is the Schema for the clusters API + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation + of an object. Servers should convert recognized schemas to the latest + internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this + object represents. Servers may infer this from the endpoint the client + submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: + description: GardenerClusterSpec defines the desired state of GardenerCluster + properties: + kubeconfig: + description: Kubeconfig defines the desired kubeconfig location + properties: + secret: + description: SecretKeyRef defines the location, and structure + of the secret containing kubeconfig + properties: + key: + type: string + name: + type: string + namespace: + type: string + required: + - key + - name + - namespace + type: object + required: + - secret + type: object + required: + - kubeconfig + type: object + status: + description: GardenerClusterStatus defines the observed state of GardenerCluster + properties: + conditions: + description: List of status conditions to indicate the status of a + ServiceInstance. + items: + description: "Condition contains details for one aspect of the current + state of this API Resource. --- This struct is intended for direct + use as an array at the field path .status.conditions. For example, + \n type FooStatus struct{ // Represents the observations of a + foo's current state. // Known .status.conditions.type are: \"Available\", + \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge + // +listType=map // +listMapKey=type Conditions []metav1.Condition + `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" + protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }" + properties: + lastTransitionTime: + description: lastTransitionTime is the last time the condition + transitioned from one status to another. This should be when + the underlying condition changed. If that is not known, then + using the time when the API field changed is acceptable. + format: date-time + type: string + message: + description: message is a human readable message indicating + details about the transition. This may be an empty string. + maxLength: 32768 + type: string + observedGeneration: + description: observedGeneration represents the .metadata.generation + that the condition was set based upon. For instance, if .metadata.generation + is currently 12, but the .status.conditions[x].observedGeneration + is 9, the condition is out of date with respect to the current + state of the instance. + format: int64 + minimum: 0 + type: integer + reason: + description: reason contains a programmatic identifier indicating + the reason for the condition's last transition. Producers + of specific condition types may define expected values and + meanings for this field, and whether the values are considered + a guaranteed API. The value should be a CamelCase string. + This field may not be empty. + maxLength: 1024 + minLength: 1 + pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$ + type: string + status: + description: status of the condition, one of True, False, Unknown. + enum: + - "True" + - "False" + - Unknown + type: string + type: + description: type of condition in CamelCase or in foo.example.com/CamelCase. + --- Many .condition.type values are consistent across resources + like Available, but because arbitrary conditions can be useful + (see .node.status.conditions), the ability to deconflict is + important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt) + maxLength: 316 + pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ + type: string + required: + - lastTransitionTime + - message + - reason + - status + - type + type: object + type: array + x-kubernetes-list-map-keys: + - type + x-kubernetes-list-type: map + state: + description: State signifies current state of Gardener Cluster. Value + can be one of ("Ready", "Processing", "Error", "Deleting"). + type: string + type: object + required: + - spec + type: object + served: true + storage: true + subresources: + status: {} diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 58eb8de3..57173f51 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -1,5 +1,5 @@ # Adds namespace to all resources. -namespace: infrastructure-manager-system +namespace: kcp-system # Value of this field is prepended to the # names of all resources, e.g. a deployment named @@ -31,6 +31,7 @@ patchesStrategicMerge: # If you want your controller-manager to expose the /metrics # endpoint w/o any authn/z, please comment the following line. - manager_auth_proxy_patch.yaml +- manager_gardener_secret_patch.yaml diff --git a/config/default/manager_gardener_secret_patch.yaml b/config/default/manager_gardener_secret_patch.yaml new file mode 100644 index 00000000..88d39f15 --- /dev/null +++ b/config/default/manager_gardener_secret_patch.yaml @@ -0,0 +1,21 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: controller-manager + namespace: system +spec: + template: + spec: + volumes: + - name: gardener-kubeconfig + secret: + secretName: gardener-credentials + containers: + - name: manager + command: + - /manager +# args: +# - --gardener-kubeconfig-path=/gardener/kubeconfig/kubeconfig + volumeMounts: + - name: gardener-kubeconfig + mountPath: /gardener/kubeconfig diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 8af8ea33..cc9a5b69 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization images: - name: controller - newName: infrastructure-manager - newTag: 0.0.1 + newName: europe-docker.pkg.dev/kyma-project/dev/infrastructure-manager + newTag: PR-37