Skip to content

Commit

Permalink
Fix duros deployment for shooted seeds. (#195)
Browse files Browse the repository at this point in the history
  • Loading branch information
Gerrit91 authored Jul 6, 2021
1 parent 1418f6f commit 3487398
Show file tree
Hide file tree
Showing 14 changed files with 141 additions and 62 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/latest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ jobs:
username: ${{ secrets.DOCKER_REGISTRY_USER }}
password: ${{ secrets.DOCKER_REGISTRY_TOKEN }}

- name: Set up Go 1.16
uses: actions/setup-go@v2.1.3
with:
go-version: '1.16.x'

- name: Check (lint) and Test
run: |
make test-in-docker
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/pull_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ jobs:
password: ${{ secrets.DOCKER_REGISTRY_TOKEN }}
if: steps.fork.outputs.is_fork_pr == 'false'

- name: Set up Go 1.16
uses: actions/setup-go@v2.1.3
with:
go-version: '1.16.x'

- name: Check (lint) and Test
run: |
make test-in-docker
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ jobs:
username: ${{ secrets.DOCKER_REGISTRY_USER }}
password: ${{ secrets.DOCKER_REGISTRY_TOKEN }}

- name: Set up Go 1.16
uses: actions/setup-go@v2.1.3
with:
go-version: '1.16.x'

- name: Check (lint) and Test
run: |
make test-in-docker
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ data:
duros:
enabled: {{ .Values.config.storage.duros.enabled }}
{{- if .Values.config.storage.duros.enabled }}
seedConfig:
{{ toYaml .Values.config.storage.duros.seedConfig | indent 12 }}
partitionConfig:
{{ toYaml .Values.config.storage.duros.partitionConfig | indent 12 }}
{{- end }}
{{- if .Values.config.imagePullSecret.encodedDockerConfigJSON }}
imagePullSecret:
Expand Down
2 changes: 1 addition & 1 deletion charts/gardener-extension-provider-metal/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ config:
storage:
duros:
enabled: false
seedConfig: {}
partitionConfig: {}
imagePullSecret:
encodedDockerConfigJSON:

Expand Down
11 changes: 11 additions & 0 deletions charts/internal/control-plane/templates/duros-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ type: Opaque
data:
admin-key: {{ required ".Values.duros.controller.adminKey is required" (b64enc .Values.duros.controller.adminKey) }}
admin-token: {{ required ".Values.duros.controller.adminToken is required" (b64enc .Values.duros.controller.adminToken) }}
{{- if .Values.duros.controller.apiEndpoint }}
api-ca: {{ required ".Values.duros.controller.apiCA is required" (b64enc .Values.duros.controller.apiCA) }}
api-cert: {{ required ".Values.duros.controller.apiCert is required" (b64enc .Values.duros.controller.apiCert) }}
api-key: {{ required ".Values.duros.controller.apiKey is required" (b64enc .Values.duros.controller.apiKey) }}
{{- end }}
---
apiVersion: apps/v1
kind: Deployment
Expand Down Expand Up @@ -91,6 +96,12 @@ spec:
- -admin-token=/duros/admin-token
- -admin-key=/duros/admin-key
- -shoot-kubeconfig=/duros/client/kubeconfig
{{- if .Values.duros.controller.apiEndpoint }}
- -api-endpoint={{ .Values.duros.controller.apiEndpoint }}
- -api-ca=/duros/api-ca
- -api-cert=/duros/api-cert
- -api-key=/duros/api-key
{{- end }}
image: {{ index .Values.images "duros-controller" }}
imagePullPolicy: Always
resources:
Expand Down
4 changes: 4 additions & 0 deletions charts/internal/control-plane/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,5 +91,9 @@ duros:
- ip:port
adminKey: KEY
adminToken: tok
apiEndpoint:
apiCA:
apiKey:
apiCert:

imagePullSecret:
4 changes: 2 additions & 2 deletions example/controller-registration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
deployment:
type: helm
providerConfig:
chart: H4sIAAAAAAAAA+0ca2/bOLKf9SsI9xbYPZwlv+IWAnq4bJvdzV2bGEmuxeFwKGiJtlXLopaSkni7/e83fEiiZMmykjbZdjUIEIniDIfkzHBmSHqJmUsCwvrkNiZB5NGgHzJ67blQtCEx9q0n94YBwLOjI/EfoPxfPA/Hk+HoaDSd8vLhdDyYPEFH92+6GZIoxgyhJ4zSeF+9pu9fKSwb5//lCrPY3OKNf9c2muZ/NCnN/2gwGg+eoMHn7Ggd/MnnH4feW8L4vNvoemjgMMxfB+Zwaj43XBI5zAtjUXiMfiH+BjlcKNCCMhSvCPpZCRF6wyUGzZQAoUymjABviI0ahc24Ljf+2OPzrUOz/rvUMZf0Pm006f/RqGz/n00Gnf4/CFjWktpLLgE4Jsg0Lfi7JoFLmbX04lUyNx26sVIpyR9W2FlbKV7foUHMqO+D0DCy9KIYSkGUzGiFitKETNXG25OLy9PzM/VGbvEm9IlVR4evPuil/DjzcUBsSe00WDAMtRInTlha+I6yNWHyxTAsC82AV7wkymiRAM99EiG931EShlQZNFXoBUth2xzKGHFilLOGCqwZoU79q7NXzfofE5gaGKTozp5ga/9vNBgPRp3/9xDQZv7fr4gfwgJtxmErX7Bh/oej0bQ0/6Np5/89DHz82EcuWXgBQT3upPVQ/9Mno9lR43iwTIjahk7Ex3PiRyY4kuaabCU58ZLMCQsIyJHpUYs3VaBRQ+Ia+4ni6eNH5AWOn7gZpyZSiHsY2cUtM8ip2KimhmpftLTbCy8A4QkcItDNC+ITHBHzDJir5CxjzdvAgiE5Q4h/8RZohaMZg++3qBet8OhoakOzb3nz0BSvb8Z4iTKMkHlBvEC976J/fBeVazIS0siLKdvuIwF9JFUE7TsThM5q/S5PiEtCn243JIiVl58JR2RB6KEP12NrxZ8H2th/cIEW3nKDw76Y/GtwiyjrU5jNG+bFpDZH0LT+T6bjkv1/NplOO/v/EKCsT0Gr34qJPU/nVdq+Qppg7QWuzR1ykIc3ODS4pLg4xjZYAhnqV1vrasFRSBF40hWmVBRLIyMNs11hzjn536EQZDlGE147ZUe0GL0vSqmNfudE9va6SE4zao89ZZ8V7qT/LbOBDfp/ND4alfR/PJwMO/1/CPhcip3JxhdVZtlKpsIIoN/vi/96R4Tgmqkcm5loR6YikEq96fg0ccH7wH64wkNBKBsCFe7LwUhkuG+U7KWi5/ge8Ao1AzAiUE32EPgtlduiFJh1HBLycmAsvtqGJBJDxciviceIi3oN9M1dAsiLMvxeE39V+IplMchpaUuuNMx27OiIGR+/hm1HBTDatcsRsvbmCYvili0KnHZtSpTiklItVRvsrMBzPhUrWMpnoVBoT0z/w9Nje5FrFzNOksSOm0pmBGsgYKSvXIRxFJ2lql9qhGOaCsXMauZDCugYNN6Lt83YqqI2H9hZJ2HOSeSsiJv49YxIBDOtp7PhEj/GlwEOoxWNZ4R51G0iU4GSqzWsGoQdJ64Xp/zJtGIlVb26qeqlpHASrw4gwavpqNUCU64lyaZ28Aq+BHEt9WK1CjEBm0GTgCdGT255tpSwQxjfQTqgG3txZJMQg99Qtr5ieLHwnFxI2rFSpLLbCriPYJhYgP0zWXOfxjXTLxPL1XI40OxvajGAaN6xFY3ioEYNK1rWiZgprt4xXu8utESevKDgJWf6QDoOru49UCScszvRBMx9VP9FtncnvCbbMu2SgpRsp5swGh0kmakNFBjN+lFbPbOUhLip/NSKa5FKjqJ1cnTQMiWip1ni+5fEYYRbOIe6xH1FnXXqPf3z8vwsZbBUPbchlVhVw9WiwW81bPts0Cb+yxN47QLAhvhvOplOyvHfeDru4r+HAD1sSjOxMgJ6lc32wVHgF4n9opCI9Z2Ra4/z+YvHLdf2tbcB5wsNxJfQ9xwcFWyFKnzJ7bpsNAJeeIrHVn507KxeH8bHVBJINUER0AZFuEdBQGMRJGpG/8D0WrZIrYizjpKNlmoVSlidNytMw/cigY/+Yl4pLs0fYeBnOF6h3kGZ294Posty8wF40PkqLXQ1rO5NDdyB2Qa2DhSi59nyrARJcA8BJ4bwiGVz1W+SbOUP8vGzUa+cPdS3SD59snc+y42SXpEOX8NmFMS0GB5JjDD7WBh2utngwM0lrI+sChsupWYF8TTTahYtu35qA2hCm3rdvpq3/sLzyQsLIiOremjUfFlabqZMhrcS8mMb0M4tL3ASxmBu+ozwF2ggelFc5hVf2bPANnPMy23gRPq48Ja8wmmQ9m0V8RtbWwYUWqEhkamhfm4AahsQKOcpxnGGUKZ9I46wtO+BxGvi/IbMV5Su0wnOTPaLPRa7FjsiDMxIn3vNOleqlvKfZaVZKXTg1Fwv4u6rJouFzqnPeTaOx0wfqBeg3t96dbRU21WE3qlPNVRIcK1rlrQIr0+OX51cvD95ffLy6vT87P3Z8ZuTy9nxy5OsJkJin/gnRje2VojQwiO+e0EWxVJVzs2dnS0jZjYNd108Un5P3xz/fPIWmD2/eH/+9uTi3cXp1Q6vNrLEgSVtZ8Sq3CrZtwbwSY92ByyVEDnrWsuZ1Z2Vg89DxEVkMmLqUN9GVy9n5WiEkYgmzCEFcc8KqwKhHON3FOwL7MSoUT/ZkDfcnajoslQGjdUNryhnuNl23nfG63bVqpjZmXWtHiPYPQ98WI3ACJL6mefz4znkWEbNZ83r5lPEEyABzwNmJVx83GMIuo8rPqEsofoqAVdheSlzevB0KmyoKj65JU6iJ9afqnERfsBlweFLP4oB4c4fhPogAZHusOU1+mhNtrXHQrKDIzt4CMkFAVpFp0HFZ6F9FQ3yJg84hFJEi2lIfbrcisRGr3g4JU36pD6HFOAdf6ckgU669aObrIN3flJwyQInfvwGwnIbTUYD9amVeB8m3O35bVKWPbx/g5mENvE/6CssoywRVwHmibskhyUCGs9/T56V4v+j0bOjLv5/CFAquYzR9zwiq4qef0DD8hGQUMQl1vVwDiKSJgxm1H2VicePQjz+GJkDcKP/HeBr7PncBRTko2Te2OF7Zwy+BpPRRv/ZHDt3uQjWoP+TwVH5/NdoyM9/d/r/5YEfn9A1W8wx3w+kzPtN3nBYPxf+RH46RG5nXlCftNHvNprLEp97Kn1+quNnRpNQuC19pJ3kKB7hMAquPq+qNl0j+aJlESpKLJCBOJEfikmAyjK9uoy4C8/5Z/Au5oodbgyFY+pF8uGGWxPxFGZPSQhjSXa7nXWtsdcyj+NmpUUmen/t7RJ3KGWuF+hzvUtX2OISNQfChSpu2xFMy4Wdl99KaSqoyl+ELeZHcCrH9aZxEHs98Y8nucXDPMOolXmJ4G48ESUUrv3oFUJPk0vtg9r9hTildhiyRS8qvVoQE2Hf+y2VLfBYIfAUj5HY9crEWDrfqlbghtRLK+b7NSmiCNsKL2rnM9J1BvSC7BTMQT+hJ7I8r7Hz6QOdywfwFvMHC6IUKaBJLO5WqYDf0Q9XqTahSbpJx0kcHvfyr2pMhQPiHSTf6iCMGeFQKE3lPHDMZlIgIzRysL9vRoFGDI6ED71Oq8s5LBF/Kk+p9bmT4i08B9XZPFUtxs66ssEFRMk32PcLM3bjcTPRdqjSLeGmJsWW8QH03APsNNQBAWWekqf8tY0Zvd8q9qOU3y+2mEETKgeYjs8eDo3sBKK2zDbwA97sBzCOQnok8mUhQ/N5nO/HdlU6+ALQxv9XS0brEKAx/h+Uz3+PpqPu/seDQOX5b2U9/hjReyzOIStreDorhOWH7dtn2xR9deptMhmLiL64nyASqpjBEtNqe+KxZ/B+cAf9Vy7j4WagSf9Hk2FJ/yejQXf+50Fgn/6n3sOjmoHHHqBvHJr1X25Y3ecHoBr0fzwYl/V/MJk+6/T/IUCeZxJhWXp+yUbLlcN4sKTFgVWHjEo/CcBXz6WNxFrBQ45QO9107N/gbWQYeprdRkMjDwbRx0+GoZ0CUde9siSdzMGXTrbY6MhApfTcnooyQbePUt0BHRstsB8Rw9g9kGKj//7PKB0vEWUQ4lftcPIT6Hz/1lM3eJ5qe50hTiJ5FkYckzDkPq8cogt9gvKf5sk3ffXHuU/n1gZzl8maJ57vWoK0Jc9I8yNdRrrNrlGVs76kdOmT9/kROYnbxxt3OlFoYqZ7Y3PQUwXZD3cNzeHQvP26ezXc6VXv7y94z0byg2mahlHwCW1DnopIj7ZwD9Nwsk/V9wCrbgHiUCgIr2R9iGiQymp+I6+yhrgrNxzIzWp1kW045q/F+2JcLvULX6UrC/llr7Qgvb4lCRduZGX3sYx043z3jpVRf20ouw8hNUvs21de6qmoWHEvR/as+vZMdndGvYsoIOth9kS0UnnhQ85d+bLXDkP5Ja4KXsvXrzKrGYsCozQJhVsjlV3Xbndwo1lzo6LuPoWR/biLlFmiJCFlS92e7fyuDjrooIMOOuiggw466KCDDjrooIMOOuiggw466KCDDjrooIMOOuiggw46+OPD/wFZiwdOAHgAAA==
chart: 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
values:
image:
tag: v0.16.8
tag: v0.16.10
25 changes: 20 additions & 5 deletions pkg/apis/config/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,20 +143,35 @@ type StorageConfiguration struct {
type DurosConfiguration struct {
// Enabled enables duros storage when set to true.
Enabled bool
// SeedConfig is a map of a seed name to the duros seed configuration
SeedConfig map[string]DurosSeedConfiguration
// PartitionConfig is a map of a partition id to the duros partition configuration
PartitionConfig map[string]DurosPartitionConfiguration
}

// DurosSeedConfiguration is the configuration for duros for a particular seed
type DurosSeedConfiguration struct {
// Endpoints is the list of endpoints of the duros API
// DurosPartitionConfiguration is the configuration for duros for a particular partition
type DurosPartitionConfiguration struct {
// Endpoints is the list of endpoints for the storage data plane and control plane communication
Endpoints []string
// AdminKey is the key used for generating storage credentials
AdminKey string
// AdminToken is the token used by the duros-controller to authenticate against the duros API
AdminToken string
// StorageClasses contain information on the storage classes that the duros-controller creates in the shoot cluster
StorageClasses []DurosSeedStorageClass

// APIEndpoint is an optional endpoint used for control plane network communication.
//
// In certain scenarios the data plane network cannot be reached from the duros-controller in the seed
// (i.e. only the shoot is able to reach the storage network).
//
// In these cases, APIEndpoint can be utilized to point to a gRPC proxy such that the storage
// integration can be deployed anyway.
APIEndpoint *string
// APICA is the ca of the client cert to access the grpc-proxy
APICA string
// APICert is the cert of the client cert to access the grpc-proxy
APICert string
// APIKey is the key of the client cert to access the grpc-proxy
APIKey string
}

type DurosSeedStorageClass struct {
Expand Down
25 changes: 20 additions & 5 deletions pkg/apis/config/v1alpha1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -134,20 +134,35 @@ type DurosConfiguration struct {
// Enabled enables duros storage when set to true.
Enabled bool `json:"enabled"`

// SeedConfig is a map of a seed name to the duros seed configuration
SeedConfig map[string]DurosSeedConfiguration `json:"seedConfig"`
// PartitionConfig is a map of a partition id to the duros partition configuration
PartitionConfig map[string]DurosPartitionConfiguration `json:"partitionConfig"`
}

// DurosSeedConfiguration is the configuration for duros for a particular seed
type DurosSeedConfiguration struct {
// Endpoints is the list of endpoints of the duros API
// DurosPartitionConfiguration is the configuration for duros for a particular partition
type DurosPartitionConfiguration struct {
// Endpoints is the list of endpoints for the storage data plane and control plane communication
Endpoints []string `json:"endpoints"`
// AdminKey is the key used for generating storage credentials
AdminKey string `json:"adminKey"`
// AdminToken is the token used by the duros-controller to authenticate against the duros API
AdminToken string `json:"adminToken"`
// StorageClasses contain information on the storage classes that the duros-controller creates in the shoot cluster
StorageClasses []DurosSeedStorageClass `json:"storageClasses"`

// APIEndpoint is an optional endpoint used for control plane network communication.
//
// In certain scenarios the data plane network cannot be reached from the duros-controller in the seed
// (i.e. only the shoot is able to reach the storage network).
//
// In these cases, APIEndpoint can be utilized to point to a gRPC proxy such that the storage
// integration can be deployed anyway.
APIEndpoint *string `json:"apiEndpoint,omitempty"`
// APICA is the ca of the client cert to access the grpc-proxy
APICA string `json:"apiCA,omitempty"`
// APICert is the cert of the client cert to access the grpc-proxy
APICert string `json:"apiCert,omitempty"`
// APIKey is the key of the client cert to access the grpc-proxy
APIKey string `json:"apiKey,omitempty"`
}

type DurosSeedStorageClass struct {
Expand Down
Loading

0 comments on commit 3487398

Please sign in to comment.