diff --git a/build/lib/release.sh b/build/lib/release.sh index 458260cccaf..d0a0464ab91 100644 --- a/build/lib/release.sh +++ b/build/lib/release.sh @@ -503,10 +503,9 @@ EOF mkdir -p "${release_stage}/third_party" cp -R "${KUBE_ROOT}/third_party/htpasswd" "${release_stage}/third_party/htpasswd" - # Include only federation/cluster, federation/manifests and federation/deploy + # Include only federation/cluster and federation/deploy mkdir "${release_stage}/federation" cp -R "${KUBE_ROOT}/federation/cluster" "${release_stage}/federation/" - cp -R "${KUBE_ROOT}/federation/manifests" "${release_stage}/federation/" cp -R "${KUBE_ROOT}/federation/deploy" "${release_stage}/federation/" # Include hack/lib as a dependency for the cluster/ scripts diff --git a/federation/manifests/federation-apiserver-cluster-service.yaml b/federation/manifests/federation-apiserver-cluster-service.yaml deleted file mode 100644 index d711394cb81..00000000000 --- a/federation/manifests/federation-apiserver-cluster-service.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{.FEDERATION_APISERVER_DEPLOYMENT_NAME}} - namespace: {{.FEDERATION_NAMESPACE}} - labels: - app: federated-cluster -spec: - type: ClusterIP - selector: - app: federated-cluster - module: federation-apiserver - ports: - - name: https - protocol: TCP - port: 443 - targetPort: 443 diff --git a/federation/manifests/federation-apiserver-deployment.yaml b/federation/manifests/federation-apiserver-deployment.yaml deleted file mode 100644 index a6e8adf84ba..00000000000 --- a/federation/manifests/federation-apiserver-deployment.yaml +++ /dev/null @@ -1,60 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: {{.FEDERATION_APISERVER_DEPLOYMENT_NAME}} - namespace: {{.FEDERATION_NAMESPACE}} - labels: - app: federated-cluster -spec: - template: - metadata: - name: federation-apiserver - labels: - app: federated-cluster - module: federation-apiserver - spec: - containers: - - name: apiserver - image: {{.FEDERATION_APISERVER_IMAGE_REPO}}:{{.FEDERATION_APISERVER_IMAGE_TAG}} - command: - - /hyperkube - - federation-apiserver - - --bind-address=0.0.0.0 - - --etcd-servers=http://localhost:2379 - - --secure-port=443 - {{if eq .IS_DNS_NAME "false"}} - - --advertise-address={{.FEDERATION_API_HOST}} - {{end}} - - --client-ca-file=/srv/kubernetes/ca.crt - - --basic-auth-file=/srv/kubernetes/basic-auth.csv - - --tls-cert-file=/srv/kubernetes/server.cert - - --tls-private-key-file=/srv/kubernetes/server.key - - --admission-control={{.FEDERATION_ADMISSION_CONTROL}} - - --token-auth-file=/srv/kubernetes/known-tokens.csv - - --anonymous-auth=false - - --storage-backend=etcd2 - ports: - - containerPort: 443 - name: https - - containerPort: 8080 - name: local - volumeMounts: - - name: federation-apiserver-secrets - mountPath: /srv/kubernetes/ - readOnly: true - - name: etcd - image: gcr.io/google_containers/etcd:3.0.17 - command: - - /usr/local/bin/etcd - - --data-dir - - /var/etcd/data - volumeMounts: - - mountPath: /var/etcd - name: varetcd - volumes: - - name: federation-apiserver-secrets - secret: - secretName: federation-apiserver-secrets - - name: varetcd - persistentVolumeClaim: - claimName: {{.FEDERATION_APISERVER_DEPLOYMENT_NAME}}-etcd-claim diff --git a/federation/manifests/federation-apiserver-lb-service.yaml b/federation/manifests/federation-apiserver-lb-service.yaml deleted file mode 100644 index 977df03ba76..00000000000 --- a/federation/manifests/federation-apiserver-lb-service.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{.FEDERATION_APISERVER_DEPLOYMENT_NAME}} - namespace: {{.FEDERATION_NAMESPACE}} - labels: - app: federated-cluster -spec: - type: LoadBalancer - selector: - app: federated-cluster - module: federation-apiserver - ports: - - name: https - protocol: TCP - port: 443 - targetPort: 443 diff --git a/federation/manifests/federation-apiserver-nodeport-service.yaml b/federation/manifests/federation-apiserver-nodeport-service.yaml deleted file mode 100644 index f28856a92f0..00000000000 --- a/federation/manifests/federation-apiserver-nodeport-service.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{.FEDERATION_APISERVER_DEPLOYMENT_NAME}} - namespace: {{.FEDERATION_NAMESPACE}} - labels: - app: federated-cluster -spec: - type: NodePort - selector: - app: federated-cluster - module: federation-apiserver - ports: - - name: https - protocol: TCP - nodePort: {{.FEDERATION_API_NODEPORT}} - port: 443 diff --git a/federation/manifests/federation-apiserver-secrets.yaml b/federation/manifests/federation-apiserver-secrets.yaml deleted file mode 100644 index 059701e2c77..00000000000 --- a/federation/manifests/federation-apiserver-secrets.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: federation-apiserver-secrets - labels: - app: federated-cluster -type: Opaque -data: - known-tokens.csv: {{.FEDERATION_API_KNOWN_TOKENS_BASE64}} - basic-auth.csv: {{.FEDERATION_API_BASIC_AUTH_BASE64}} - ca.crt: {{.FEDERATION_APISERVER_CA_CERT_BASE64}} - server.cert: {{.FEDERATION_APISERVER_CERT_BASE64}} - server.key: {{.FEDERATION_APISERVER_KEY_BASE64}} diff --git a/federation/manifests/federation-controller-manager-deployment.yaml b/federation/manifests/federation-controller-manager-deployment.yaml deleted file mode 100644 index 9b3263b0caa..00000000000 --- a/federation/manifests/federation-controller-manager-deployment.yaml +++ /dev/null @@ -1,51 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: {{.FEDERATION_CONTROLLER_MANAGER_DEPLOYMENT_NAME}} - namespace: {{.FEDERATION_NAMESPACE}} - labels: - app: federated-cluster -spec: - template: - metadata: - name: federation-controller-manager - labels: - app: federated-cluster - module: federation-controller-manager - spec: - volumes: - - name: ssl-certs - hostPath: - path: /etc/ssl/certs - - name: kubeconfig - secret: - secretName: federation-apiserver-kubeconfig - containers: - - name: controller-manager - volumeMounts: - - name: ssl-certs - readOnly: true - mountPath: /etc/ssl/certs - - name: kubeconfig - readOnly: true - mountPath: "/etc/federation/controller-manager" - image: {{.FEDERATION_CONTROLLER_MANAGER_IMAGE_REPO}}:{{.FEDERATION_CONTROLLER_MANAGER_IMAGE_TAG}} - command: - - /hyperkube - - federation-controller-manager - - --master=https://{{.FEDERATION_APISERVER_DEPLOYMENT_NAME}}:443 - - --kubeconfig=/etc/federation/controller-manager/kubeconfig - - --dns-provider={{.FEDERATION_DNS_PROVIDER}} - - --dns-provider-config={{.FEDERATION_DNS_PROVIDER_CONFIG}} - - --federation-name={{.FEDERATION_NAME}} - - --zone-name={{.DNS_ZONE_NAME}} - ports: - - containerPort: 443 - name: https - - containerPort: 8080 - name: local - env: - - name: POD_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace diff --git a/federation/manifests/federation-etcd-pvc.yaml b/federation/manifests/federation-etcd-pvc.yaml deleted file mode 100644 index c7a28225272..00000000000 --- a/federation/manifests/federation-etcd-pvc.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: {{.FEDERATION_APISERVER_DEPLOYMENT_NAME}}-etcd-claim - annotations: - volume.alpha.kubernetes.io/storage-class: "yes" - namespace: {{.FEDERATION_NAMESPACE}} - labels: - app: federated-cluster -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 10Gi diff --git a/federation/manifests/federation-ns.yaml b/federation/manifests/federation-ns.yaml deleted file mode 100644 index ae5a7349597..00000000000 --- a/federation/manifests/federation-ns.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: {{.FEDERATION_NAMESPACE}}