openshift/installer
1
0
Fork 0
mirror of https://github.com/openshift/installer.git synced 2026-02-06 09:47:02 +01:00
Code Issues Releases Activity

*: format all yaml files

Browse Source 
Rather than just checking the old directories, we'd might as well test
the entire repository. This also updates all of the yaml files, making
them more readable, in my opinion.
This commit is contained in:
Alex Crawford
2018-09-27 16:18:09 -07:00
parent 564bcc96a4
commit ff9e5479e0
30 changed files with 278 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
glide.yaml
View File

@@ -1,42 +1,43 @@
---
package: github.com/openshift/installer
excludeDirs:
- tests
- tests
import:
- package: github.com/ghodss/yaml
version: 73d445a93680fa1a78ae23a5839bad48f32ba1ee
- package: github.com/sirupsen/logrus
version: 081307d9bc1364753142d5962fc1d795c742baaf
- package: gopkg.in/yaml.v2
version: 53feefa2559fb8dfa8d81baad31be332c97d6c77
- package: gopkg.in/alecthomas/kingpin.v2
version: 947dcec5ba9c011838740e680966fd7087a71d0d
- package: github.com/coreos/tectonic-config
version: 0d649ebfd3552dfa5c6cc2cf053e17ba924b7024
- package: k8s.io/apimachinery
version: kubernetes-1.9.0
- package: golang.org/x/crypto
version: df8d4716b3472e4a531c33cedbe537dae921a1a9
- package: github.com/coreos/ignition
version: v0.26.0
- package: github.com/vincent-petithory/dataurl
version: 9a301d65acbb728fcc3ace14f45f511a4cfeea9c
- package: sigs.k8s.io/cluster-api
version: 0.0.0-alpha.2
subpackages:
- pkg/client/clientset_generated/clientset
- package: github.com/AlecAivazis/survey
version: 1.6.2
- package: github.com/aws/aws-sdk-go
version: ^1.15.39
- package: github.com/libvirt/libvirt-go
version: ^v4.7.0
- package: github.com/openshift/hive
version: 296cb990171c6da62e134f3590c120bd16ef4d43
subpackages:
- contrib/pkg/aws_tag_deprovision
- package: github.com/ghodss/yaml
version: 73d445a93680fa1a78ae23a5839bad48f32ba1ee
- package: github.com/sirupsen/logrus
version: 081307d9bc1364753142d5962fc1d795c742baaf
- package: gopkg.in/yaml.v2
version: 53feefa2559fb8dfa8d81baad31be332c97d6c77
- package: gopkg.in/alecthomas/kingpin.v2
version: 947dcec5ba9c011838740e680966fd7087a71d0d
- package: github.com/coreos/tectonic-config
version: 0d649ebfd3552dfa5c6cc2cf053e17ba924b7024
- package: k8s.io/apimachinery
version: kubernetes-1.9.0
- package: golang.org/x/crypto
version: df8d4716b3472e4a531c33cedbe537dae921a1a9
- package: github.com/coreos/ignition
version: v0.26.0
- package: github.com/vincent-petithory/dataurl
version: 9a301d65acbb728fcc3ace14f45f511a4cfeea9c
- package: sigs.k8s.io/cluster-api
version: 0.0.0-alpha.2
subpackages:
- pkg/client/clientset_generated/clientset
- package: github.com/AlecAivazis/survey
version: 1.6.2
- package: github.com/aws/aws-sdk-go
version: ^1.15.39
- package: github.com/libvirt/libvirt-go
version: ^v4.7.0
- package: github.com/openshift/hive
version: 296cb990171c6da62e134f3590c120bd16ef4d43
subpackages:
- contrib/pkg/aws_tag_deprovision
testImport:
- package: github.com/stretchr/testify
version: ^1.2.2
subpackages:
- assert
- package: github.com/shurcooL/vfsgen
- package: github.com/stretchr/testify
version: ^1.2.2
subpackages:
- assert
- package: github.com/shurcooL/vfsgen

2
hack/yaml-lint.sh
View File

@@ -1,6 +1,6 @@
#!/bin/sh
if [ "$IS_CONTAINER" != "" ]; then
yamllint --config-data "{extends: default, rules: {line-length: {level: warning, max: 120}}}" ./examples/ ./installer/
yamllint --config-data "{extends: default, rules: {line-length: {level: warning, max: 120}}}" .
else
podman run --rm \
--env IS_CONTAINER=TRUE \

5
pkg/asset/manifests/content/bootkube/01-tectonic-namespace.go
View File

@@ -3,11 +3,12 @@ package bootkube
const (
// TectonicNamespace is the constant to represent contents of Tectonic_Namespace.yaml file
TectonicNamespace = `
---
apiVersion: v1
kind: Namespace
metadata:
name: tectonic-system # Create the namespace first.
labels: # network policy can only select by labels
name: tectonic-system # Create the namespace first.
labels: # network policy can only select by labels
name: tectonic-system
openshift.io/run-level: "1"
`

1
pkg/asset/manifests/content/bootkube/02-ingress-namespace.go
View File

@@ -3,6 +3,7 @@ package bootkube
const (
// IngressNamespace is the constant to represent contents of Ingress_Namespace.yaml file
IngressNamespace = `
---
apiVersion: v1
kind: Namespace
metadata:

1
pkg/asset/manifests/content/bootkube/03-openshift-web-console-namespace.go
View File

@@ -3,6 +3,7 @@ package bootkube
const (
// OpenshiftWebConsoleNamespace is the constant to represent contents of Openshift_WebConsoleNamespace.yaml file
OpenshiftWebConsoleNamespace = `
---
apiVersion: v1
kind: Namespace
metadata:

1
pkg/asset/manifests/content/bootkube/05-openshift-cluster-api-namespace.go
View File

@@ -3,6 +3,7 @@ package bootkube
const (
// OpenshiftClusterAPINamespace is the constant to represent contents of Openshift_ClusterApiNamespace.yaml file
OpenshiftClusterAPINamespace = `
---
apiVersion: v1
kind: Namespace
metadata:

1
pkg/asset/manifests/content/bootkube/app-version-kind.go
View File

@@ -3,6 +3,7 @@ package bootkube
const (
// AppVersionKind is the constant to represent contents of App_VersionKind.yaml file
AppVersionKind = `
---
apiVersion: "apiextensions.k8s.io/v1beta1"
kind: "CustomResourceDefinition"
metadata:

3
pkg/asset/manifests/content/bootkube/app-version-mao.go
View File

@@ -3,6 +3,7 @@ package bootkube
const (
// AppVersionMao is the constant to represent contents of App_VersionMao.yaml file
AppVersionMao = `
---
apiVersion: tco.coreos.com/v1
kind: AppVersion
metadata:
@@ -16,7 +17,7 @@ spec:
status:
currentVersion:
paused: false
upgradereq: 1
upgradereq: 1
upgradecomp: 0
`
)

3
pkg/asset/manifests/content/bootkube/app-version-tectonic-network.go
View File

@@ -3,6 +3,7 @@ package bootkube
const (
// AppVersionTectonicNetwork is the constant to represent contents of App_VersionTectonicNetwork.yaml file
AppVersionTectonicNetwork = `
---
apiVersion: tco.coreos.com/v1
kind: AppVersion
metadata:
@@ -16,7 +17,7 @@ spec:
status:
currentVersion:
paused: false
upgradereq: 1
upgradereq: 1
upgradecomp: 0
`
)

49
pkg/asset/manifests/content/bootkube/machine-api-operator.go
View File

@@ -3,6 +3,7 @@ package bootkube
const (
// MachineAPIOperator is the constant to represent contents of Machine_Api_Operator.yaml file
MachineAPIOperator = `
---
apiVersion: apps/v1beta2
kind: Deployment
metadata:
@@ -23,22 +24,22 @@ spec:
tectonic-app-version-name: machine-api
spec:
containers:
- name: machine-api-operator
image: quay.io/coreos/machine-api-operator:b6a04c2
command:
- "/machine-api-operator"
resources:
limits:
cpu: 20m
memory: 50Mi
requests:
cpu: 20m
memory: 50Mi
volumeMounts:
- name: cluster-config
mountPath: /etc/mao-config
- name: machine-api-operator
image: quay.io/coreos/machine-api-operator:b6a04c2
command:
- "/machine-api-operator"
resources:
limits:
cpu: 20m
memory: 50Mi
requests:
cpu: 20m
memory: 50Mi
volumeMounts:
- name: cluster-config
mountPath: /etc/mao-config
imagePullSecrets:
- name: coreos-pull-secret
- name: coreos-pull-secret
nodeSelector:
node-role.kubernetes.io/master: ""
restartPolicy: Always
@@ -46,15 +47,15 @@ spec:
runAsNonRoot: true
runAsUser: 65534
tolerations:
- key: "node-role.kubernetes.io/master"
operator: "Exists"
effect: "NoSchedule"
- key: "node-role.kubernetes.io/master"
operator: "Exists"
effect: "NoSchedule"
volumes:
- name: cluster-config
configMap:
name: cluster-config-v1
items:
- key: mao-config
path: config
- name: cluster-config
configMap:
name: cluster-config-v1
items:
- key: mao-config
path: config
`
)

1
pkg/asset/manifests/content/bootkube/machine-config-operator-00-config-crd.go
View File

@@ -3,6 +3,7 @@ package bootkube
const (
// MachineConfigOperator00ConfigCrd is the constant to represent contents of Machine_ConfigOperator00ConfigCrd.yaml file
MachineConfigOperator00ConfigCrd = `
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:

8
pkg/asset/manifests/content/bootkube/machine-config-operator-01-images-configmap.go
View File

@@ -3,12 +3,18 @@ package bootkube
const (
// MachineConfigOperator01ImagesConfigmap is the constant to represent contents of Machine_ConfigOperator01ImagesConfigmap.yaml file
MachineConfigOperator01ImagesConfigmap = `
---
apiVersion: v1
kind: ConfigMap
metadata:
name: machine-config-operator-images
namespace: openshift-machine-config-operator
data:
images.json: '{"machineConfigController": "docker.io/openshift/origin-machine-config-controller:v4.0.0", "machineConfigDaemon": "docker.io/openshift/origin-machine-config-daemon:v4.0.0", "machineConfigServer": "docker.io/openshift/origin-machine-config-server:v4.0.0"}'
images.json: |
{
"machineConfigController": "docker.io/openshift/origin-machine-config-controller:v4.0.0",
"machineConfigDaemon": "docker.io/openshift/origin-machine-config-daemon:v4.0.0",
"machineConfigServer": "docker.io/openshift/origin-machine-config-server:v4.0.0"
}
`
)

6
pkg/asset/manifests/content/bootkube/machine-config-operator-02-rbac.go
View File

@@ -9,9 +9,9 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:
name: default-account-openshift-machine-config-operator
subjects:
- kind: ServiceAccount
name: default
namespace: openshift-machine-config-operator
- kind: ServiceAccount
name: default
namespace: openshift-machine-config-operator
roleRef:
kind: ClusterRole
name: cluster-admin

63
pkg/asset/manifests/content/bootkube/machine-config-operator-03-deployment.go
View File

@@ -7,6 +7,7 @@ import (
var (
// MachineConfigOperator03Deployment is the constant to represent contents of machine_configoperator03deployment.yaml file
MachineConfigOperator03Deployment = template.Must(template.New("machine-config-operator-03-deployment.yaml").Parse(`
---
apiVersion: apps/v1
kind: Deployment
metadata:
@@ -25,25 +26,25 @@ spec:
k8s-app: machine-config-operator
spec:
containers:
- name: machine-config-operator
image: {{.MachineConfigOperatorImage}}
args:
- "start"
- "--images-json=/etc/mco/images/images.json"
resources:
limits:
cpu: 20m
memory: 50Mi
requests:
cpu: 20m
memory: 50Mi
volumeMounts:
- name: root-ca
mountPath: /etc/ssl/kubernetes/ca.crt
- name: etcd-ca
mountPath: /etc/ssl/etcd/ca.crt
- name: images
mountPath: /etc/mco/images
- name: machine-config-operator
image: {{.MachineConfigOperatorImage}}
args:
- "start"
- "--images-json=/etc/mco/images/images.json"
resources:
limits:
cpu: 20m
memory: 50Mi
requests:
cpu: 20m
memory: 50Mi
volumeMounts:
- name: root-ca
mountPath: /etc/ssl/kubernetes/ca.crt
- name: etcd-ca
mountPath: /etc/ssl/etcd/ca.crt
- name: images
mountPath: /etc/mco/images
nodeSelector:
node-role.kubernetes.io/master: ""
restartPolicy: Always
@@ -51,18 +52,18 @@ spec:
runAsNonRoot: true
runAsUser: 65534
tolerations:
- key: "node-role.kubernetes.io/master"
operator: "Exists"
effect: "NoSchedule"
- key: "node-role.kubernetes.io/master"
operator: "Exists"
effect: "NoSchedule"
volumes:
- name: images
configMap:
name: machine-config-operator-images
- name: etcd-ca
hostPath:
path: /etc/ssl/etcd/ca.crt
- name: root-ca
hostPath:
path: /etc/kubernetes/ca.crt
- name: images
configMap:
name: machine-config-operator-images
- name: etcd-ca
hostPath:
path: /etc/ssl/etcd/ca.crt
- name: root-ca
hostPath:
path: /etc/kubernetes/ca.crt
`))
)

1
pkg/asset/manifests/content/bootkube/operatorstatus-crd.go
View File

@@ -3,6 +3,7 @@ package bootkube
const (
// OperatorstatusCrd is the constant to represent contents of Operatorstatus_Crd.yaml file
OperatorstatusCrd = `
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:

53
pkg/asset/manifests/content/bootkube/tectonic-network-operator.go
View File

@@ -7,6 +7,7 @@ import (
var (
// TectonicNetworkOperator represents the template variable for tectonic-network-operator.yaml file
TectonicNetworkOperator = template.Must(template.New("tectonic-network-operator.yaml").Parse(`
---
apiVersion: apps/v1beta2
kind: DaemonSet
metadata:
@@ -30,41 +31,41 @@ spec:
tectonic-app-version-name: tectonic-network
spec:
containers:
- name: tectonic-network-operator
image: {{.TectonicNetworkOperatorImage}}
resources:
limits:
cpu: 20m
memory: 50Mi
requests:
cpu: 20m
memory: 50Mi
volumeMounts:
- name: cluster-config
mountPath: /etc/cluster-config
- name: tectonic-network-operator
image: {{.TectonicNetworkOperatorImage}}
resources:
limits:
cpu: 20m
memory: 50Mi
requests:
cpu: 20m
memory: 50Mi
volumeMounts:
- name: cluster-config
mountPath: /etc/cluster-config
hostNetwork: true
restartPolicy: Always
imagePullSecrets:
- name: coreos-pull-secret
- name: coreos-pull-secret
securityContext:
runAsNonRoot: true
runAsUser: 65534
volumes:
- name: cluster-config
configMap:
name: cluster-config-v1
items:
- key: network-config
path: network-config
- name: cluster-config
configMap:
name: cluster-config-v1
items:
- key: network-config
path: network-config
nodeSelector:
node-role.kubernetes.io/master: ""
tolerations:
- key: "node-role.kubernetes.io/master"
operator: "Exists"
effect: "NoSchedule"
updateStrategy:
rollingUpdate:
maxUnavailable: 1
type: RollingUpdate
- key: "node-role.kubernetes.io/master"
operator: "Exists"
effect: "NoSchedule"
updateStrategy:
rollingUpdate:
maxUnavailable: 1
type: RollingUpdate
`))
)

1
pkg/asset/manifests/content/tectonic/rbac/binding-admin.go
View File

@@ -3,6 +3,7 @@ package rbac
const (
// BindingAdmin is the variable/constant representing the contents of the respective file
BindingAdmin = `
---
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:

9
pkg/asset/manifests/content/tectonic/rbac/binding-discovery.go
View File

@@ -3,6 +3,7 @@ package rbac
const (
// BindingDiscovery is the variable/constant representing the contents of the respective file
BindingDiscovery = `
---
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:
@@ -12,9 +13,9 @@ roleRef:
kind: ClusterRole
name: system:discovery
subjects:
- kind: Group
name: 'system:unauthenticated'
- kind: Group
name: 'system:authenticated'
- kind: Group
name: 'system:unauthenticated'
- kind: Group
name: 'system:authenticated'
`
)

1
pkg/asset/manifests/content/tectonic/rbac/role-admin.go
View File

@@ -3,6 +3,7 @@ package rbac
const (
// RoleAdmin is the variable/constant representing the contents of the respective file
RoleAdmin = `
---
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:

59
pkg/asset/manifests/content/tectonic/rbac/role-user.go
View File

@@ -3,6 +3,7 @@ package rbac
const (
// RoleUser is the variable/constant representing the contents of the respective file
RoleUser = `
---
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:
@@ -10,29 +11,29 @@ metadata:
rules:
- apiGroups: [""]
resources: [
"bindings", "configmaps", "events", "pods", "replicationcontrollers",
"secrets", "services", "serviceaccounts",
"pods/attach",
"pods/binding",
"pods/exec",
"pods/log",
"pods/portforward",
"pods/proxy",
"pods/status",
"replicationcontrollers/scale",
"replicationcontrollers/status",
"services/proxy",
"services/status"
"bindings", "configmaps", "events", "pods", "replicationcontrollers",
"secrets", "services", "serviceaccounts",
"pods/attach",
"pods/binding",
"pods/exec",
"pods/log",
"pods/portforward",
"pods/proxy",
"pods/status",
"replicationcontrollers/scale",
"replicationcontrollers/status",
"services/proxy",
"services/status"
]
verbs: ["*"]
nonResourceURLs: []
- apiGroups: [""]
resources: [
"componentstatuses", "endpoints", "limitranges", "nodes", "nodes/proxy", "nodes/status",
"namespaces", "namespaces/status", "namespaces/finalize",
"persistentvolumeclaims", "persistentvolumeclaims/status", "persistentvolumes", "resourcequotas",
"resourcequotas/status"
"componentstatuses", "endpoints", "limitranges", "nodes", "nodes/proxy", "nodes/status",
"namespaces", "namespaces/status", "namespaces/finalize",
"persistentvolumeclaims", "persistentvolumeclaims/status", "persistentvolumes", "resourcequotas",
"resourcequotas/status"
]
verbs: ["get", "list", "watch", "proxy", "redirect"]
nonResourceURLs: []
@@ -44,19 +45,19 @@ rules:
- apiGroups: ["extensions"]
resources: [
"daemonsets", "deployments", "horizontalpodautoscalers", "ingresses",
"jobs", "replicasets", "replicationcontrollers",
"daemonsets", "deployments", "horizontalpodautoscalers", "ingresses",
"jobs", "replicasets", "replicationcontrollers",
"daemonsets/status",
"deployments/rollback",
"deployments/scale",
"deployments/status",
"horizontalpodautoscalers/status",
"ingresses/status",
"jobs/status",
"replicasets/scale",
"replicasets/status",
"replicationcontrollers/scale"
"daemonsets/status",
"deployments/rollback",
"deployments/scale",
"deployments/status",
"horizontalpodautoscalers/status",
"ingresses/status",
"jobs/status",
"replicasets/scale",
"replicasets/status",
"replicationcontrollers/scale"
]
verbs: ["*"]
nonResourceURLs: []

11
pkg/asset/manifests/content/tectonic/security/priviledged-scc-tectonic.go
View File

@@ -3,6 +3,7 @@ package security
const (
// PriviledgedSccTectonic is the variable/constant representing the contents of the respective file
PriviledgedSccTectonic = `
---
apiVersion: security.openshift.io/v1
kind: SecurityContextConstraints
metadata:
@@ -16,23 +17,23 @@ allowHostPID: true
allowHostPorts: true
allowPrivilegedContainer: true
allowedCapabilities:
- "*"
- "*"
fsGroup:
type: RunAsAny
groups:
- system:serviceaccounts:tectonic-system
- system:serviceaccounts:openshift-ingress
- system:serviceaccounts:tectonic-system
- system:serviceaccounts:openshift-ingress
readOnlyRootFilesystem: false
runAsUser:
type: RunAsAny
seLinuxContext:
type: RunAsAny
seccompProfiles:
- "*"
- "*"
supplementalGroups:
type: RunAsAny
users: []
volumes:
- "*"
- "*"
`
)

1
pkg/asset/manifests/content/tectonic/updater/app-version-kind.go
View File

@@ -3,6 +3,7 @@ package updater
const (
// AppVersionKind is the variable/constant representing the contents of the respective file
AppVersionKind = `
---
apiVersion: "apiextensions.k8s.io/v1beta1"
kind: "CustomResourceDefinition"
metadata:

1
pkg/asset/manifests/content/tectonic/updater/appversions/app-version-kube-addon.go
View File

@@ -3,6 +3,7 @@ package appversions
const (
// AppVersionKubeAddon is the variable/constant representing the contents of the respective file
AppVersionKubeAddon = `
---
apiVersion: tco.coreos.com/v1
kind: AppVersion
metadata:

1
pkg/asset/manifests/content/tectonic/updater/appversions/app-version-kube-core.go
View File

@@ -3,6 +3,7 @@ package appversions
const (
// AppVersionKubeCore is the variable/constant representing the contents of the respective file
AppVersionKubeCore = `
---
apiVersion: tco.coreos.com/v1
kind: AppVersion
metadata:

1
pkg/asset/manifests/content/tectonic/updater/appversions/app-version-tectonic-ingress.go
View File

@@ -3,6 +3,7 @@ package appversions
const (
// AppVersionTectonicIngress is the variable/constant representing the contents of the respective file
AppVersionTectonicIngress = `
---
apiVersion: tco.coreos.com/v1
kind: AppVersion
metadata:

1
pkg/asset/manifests/content/tectonic/updater/migration-status-kind.go
View File

@@ -3,6 +3,7 @@ package updater
const (
// MigrationStatusKind is the variable/constant representing the contents of the respective file
MigrationStatusKind = `
---
apiVersion: "apiextensions.k8s.io/v1beta1"
kind: "CustomResourceDefinition"
metadata:

45
pkg/asset/manifests/content/tectonic/updater/operators/kube-addon-operator.go
View File

@@ -7,6 +7,7 @@ import (
var (
// KubeAddonOperator is the variable/constant representing the contents of the respective file
KubeAddonOperator = template.Must(template.New("kube-addon-operator.yaml").Parse(`
---
apiVersion: apps/v1beta2
kind: Deployment
metadata:
@@ -27,20 +28,20 @@ spec:
tectonic-app-version-name: kube-addon
spec:
containers:
- name: kube-addon-operator
image: {{.KubeAddonOperatorImage}}
resources:
limits:
cpu: 20m
memory: 50Mi
requests:
cpu: 20m
memory: 50Mi
volumeMounts:
- name: cluster-config
mountPath: /etc/cluster-config
- name: kube-addon-operator
image: {{.KubeAddonOperatorImage}}
resources:
limits:
cpu: 20m
memory: 50Mi
requests:
cpu: 20m
memory: 50Mi
volumeMounts:
- name: cluster-config
mountPath: /etc/cluster-config
imagePullSecrets:
- name: coreos-pull-secret
- name: coreos-pull-secret
nodeSelector:
node-role.kubernetes.io/master: ""
restartPolicy: Always
@@ -48,15 +49,15 @@ spec:
runAsNonRoot: true
runAsUser: 65534
tolerations:
- key: "node-role.kubernetes.io/master"
operator: "Exists"
effect: "NoSchedule"
- key: "node-role.kubernetes.io/master"
operator: "Exists"
effect: "NoSchedule"
volumes:
- name: cluster-config
configMap:
name: cluster-config-v1
items:
- key: addon-config
path: addon-config
- name: cluster-config
configMap:
name: cluster-config-v1
items:
- key: addon-config
path: addon-config
`))
)

51
pkg/asset/manifests/content/tectonic/updater/operators/kube-core-operator.go
View File

@@ -7,6 +7,7 @@ import (
var (
// KubeCoreOperator is the variable/constant representing the contents of the respective file
KubeCoreOperator = template.Must(template.New("kube-core-operator.yaml").Parse(`
---
apiVersion: apps/v1beta2
kind: Deployment
metadata:
@@ -27,23 +28,23 @@ spec:
tectonic-app-version-name: kube-core
spec:
containers:
- name: kube-core-operator
image: {{.KubeCoreOperatorImage}}
imagePullPolicy: Always
args:
- --config=/etc/cluster-config/kco-config.yaml
resources:
limits:
cpu: 20m
memory: 50Mi
requests:
cpu: 20m
memory: 50Mi
volumeMounts:
- name: cluster-config
mountPath: /etc/cluster-config
- name: kube-core-operator
image: {{.KubeCoreOperatorImage}}
imagePullPolicy: Always
args:
- --config=/etc/cluster-config/kco-config.yaml
resources:
limits:
cpu: 20m
memory: 50Mi
requests:
cpu: 20m
memory: 50Mi
volumeMounts:
- name: cluster-config
mountPath: /etc/cluster-config
imagePullSecrets:
- name: coreos-pull-secret
- name: coreos-pull-secret
nodeSelector:
node-role.kubernetes.io/master: ""
restartPolicy: Always
@@ -51,15 +52,15 @@ spec:
runAsNonRoot: true
runAsUser: 65534
tolerations:
- key: "node-role.kubernetes.io/master"
operator: "Exists"
effect: "NoSchedule"
- key: "node-role.kubernetes.io/master"
operator: "Exists"
effect: "NoSchedule"
volumes:
- name: cluster-config
configMap:
name: cluster-config-v1
items:
- key: kco-config
path: kco-config.yaml
- name: cluster-config
configMap:
name: cluster-config-v1
items:
- key: kco-config
path: kco-config.yaml
`))
)

45
pkg/asset/manifests/content/tectonic/updater/operators/tectonic-ingress-controller-operator.go
View File

@@ -7,6 +7,7 @@ import (
var (
// TectonicIngressControllerOperator is the variable/constant representing the contents of the respective file
TectonicIngressControllerOperator = template.Must(template.New("tectonic-ingress-controller-operator.yaml").Parse(`
---
apiVersion: apps/v1beta2
kind: Deployment
metadata:
@@ -27,20 +28,20 @@ spec:
tectonic-app-version-name: tectonic-ingress
spec:
containers:
- name: tectonic-ingress-controller-operator
image: {{.TectonicIngressControllerOperatorImage}}
resources:
limits:
cpu: 20m
memory: 50Mi
requests:
cpu: 20m
memory: 50Mi
volumeMounts:
- name: cluster-config
mountPath: /etc/cluster-config
- name: tectonic-ingress-controller-operator
image: {{.TectonicIngressControllerOperatorImage}}
resources:
limits:
cpu: 20m
memory: 50Mi
requests:
cpu: 20m
memory: 50Mi
volumeMounts:
- name: cluster-config
mountPath: /etc/cluster-config
imagePullSecrets:
- name: coreos-pull-secret
- name: coreos-pull-secret
nodeSelector:
node-role.kubernetes.io/master: ""
restartPolicy: Always
@@ -49,15 +50,15 @@ spec:
runAsUser: 65534
serviceAccount: tectonic-ingress-controller-operator
tolerations:
- key: "node-role.kubernetes.io/master"
operator: "Exists"
effect: "NoSchedule"
- key: "node-role.kubernetes.io/master"
operator: "Exists"
effect: "NoSchedule"
volumes:
- name: cluster-config
configMap:
name: cluster-config-v1
items:
- key: ingress-config
path: ingress-config
- name: cluster-config
configMap:
name: cluster-config-v1
items:
- key: ingress-config
path: ingress-config
`))
)

21
tests/smoke/glide.yaml
View File

@@ -1,12 +1,13 @@
---
package: "github.com/openshift/installer/tests/smoke"
import:
- package: k8s.io/client-go
version: v4.0.0-beta.0
- package: k8s.io/kubernetes
version: v1.7.0
- package: k8s.io/apimachinery
version: abe34e4f5b4413c282a83011892cbeea5b32223b
- package: github.com/coreos/ktestutil
version: 47edf51e9cdb1955e93e56e6c84ed944fdda4789
- package: k8s.io/apiserver
version: release-1.7
- package: k8s.io/client-go
version: v4.0.0-beta.0
- package: k8s.io/kubernetes
version: v1.7.0
- package: k8s.io/apimachinery
version: abe34e4f5b4413c282a83011892cbeea5b32223b
- package: github.com/coreos/ktestutil
version: 47edf51e9cdb1955e93e56e6c84ed944fdda4789
- package: k8s.io/apiserver
version: release-1.7